HG_REPOSITORIES/LPP/INSTRUMENTATION/SocExplorerPlugins Commit - r60:dbbb04783771

dsu3plugin:...

jeandet -

r60:dbbb04783771 default

parent child

Context file:

r60:dbbb04783771

dsu3plugin/dsu3plugin.cpp +20 -22

             {
                 this->UI = new dsu3pluginui();
                 this->setWidget((QWidget*)this->UI);
-                this->elfparserInst = new elfparser();
+                this->elfFile = new ElfFile();
-            //    this->pyObject = new dsu3pluginPywrapper(this);
-            //    QObject::connect(((dsu3pluginPywrapper*)this->pyObject),SIGNAL(openFile(QString)),this,SLOT(openFile(QString)));
-            //    QObject::connect(((dsu3pluginPywrapper*)this->pyObject),SIGNAL(loadFile()),this,SLOT(flashTarget()));
-            //    QObject::connect(((dsu3pluginPywrapper*)this->pyObject),SIGNAL(run()),this,SLOT(run()));
-            //    QObject::connect(((dsu3pluginPywrapper*)this->pyObject),SIGNAL(stop()),this,SLOT(stop()));
-            //    QObject::connect(((dsu3pluginPywrapper*)this->pyObject),SIGNAL(cacheEnable()),this,SLOT(cacheEnable()));
-            //    QObject::connect(((dsu3pluginPywrapper*)this->pyObject),SIGNAL(cacheDisable()),this,SLOT(cacheDisable()));
-            //    QObject::connect(((dsu3pluginPywrapper*)this->pyObject),SIGNAL(setCacheEnable(bool)),this,SLOT(setCacheEnable(bool)));
                 connect(this->UI,SIGNAL(openFile()),this,SLOT(openFile()));
                 connect(this->UI,SIGNAL(flashTarget()),this,SLOT(flashTarget()));
                 connect(this->UI,SIGNAL(run()),this,SLOT(toggleRun()));
-                connect(this,SIGNAL(updateInfo(elfparser*)),this->UI,SIGNAL(updateInfo(elfparser*)));
+                connect(this,SIGNAL(updateInfo(ElfFile*)),this->UI,SLOT(updateInfo(ElfFile*)));
                 this->running = false;
             }
             void dsu3plugin::openFile(QString fileName)
             {
-                this->elfparserInst->setFilename(fileName);
+                this->elfFile->openFile(fileName);
-                emit this->updateInfo(this->elfparserInst);
+                emit this->updateInfo(this->elfFile);
             }
             bool dsu3plugin::configureTarget()
                     this->run();
             }
+            bool dsu3plugin::dumpSymbol(const QString &symbolName, QString file, const QString &format)
+            {
+                if(this->elfFile->isopened())
+                {
+                    int symbolIndex=this->elfFile->getSymbolIndex(symbolName);
+                    if(symbolIndex!=-1)
+                        return this->dumpMemory(this->elfFile->getSymbolAddress(symbolIndex),this->elfFile->getSymbolSize(symbolIndex)/4,file,format);
+                }
+                return false;
+            }
             void dsu3plugin::WriteRegs(uIntlist Values, unsigned int address)
             {
                 unsigned int* buff;
             {
                 char* buffch=NULL;
                 unsigned int* buff;
-                int size = this->elfparserInst->getSectionDatasz(index);
+                int size = this->elfFile->getSectionDatasz(index);
                 int sizeInt = size/4;
                 if(parent==NULL)
                     return;
-                this->elfparserInst->getSectionData(index,&buffch);
+                this->elfFile->getSectionData(index,&buffch);
                 buff = (unsigned int*)malloc(((size/4)+1)*sizeof(unsigned int));
                 for(int i=0;i<sizeInt;i++)
                 {
                     }
                     sizeInt++;
                 }
-                parent->Write(buff,(unsigned int)sizeInt,(unsigned int)this->elfparserInst->getSectionPaddr(index));
+                parent->Write(buff,(unsigned int)sizeInt,(unsigned int)this->elfFile->getSectionPaddr(index));
                 free(buff);
             }
             void dsu3plugin::writeSection(const QString &name)
             {
-                for(int i=0;i<this->elfparserInst->getSectioncount();i++)
+                if(elfFile->isopened())
                 {
-                    if(!this->elfparserInst->getSectionName(i).compare(name))
+                    writeSection(this->elfFile->getSectionIndex(name));
-                        printf("about to write section %s @ 0x%x size = %d\n",elfparserInst->getSectionName(i).toStdString().c_str(),elfparserInst->getSectionPaddr(i),elfparserInst->getSectionMemsz(i));
-                        writeSection(i);
                 }
             }

dsu3plugin/dsu3plugin.h +5 -2

             #include <QMainWindow>
             #include <QList>
             #include "elfparser.h"
+            #include <elffile.h>
             #include <socexplorerplugin.h>
             #include <socexplorerengine.h>
                 void toggleRun();
                 //added for python backward compatibility
                 void loadFile(){this->flashTarget();}
+                bool dumpSymbol(const QString& symbolName,QString file,const QString& format);
             signals:
-                void updateInfo(elfparser* parser);
+                void updateInfo(ElfFile* elfFile);
             private:
                 void WriteRegs(uIntlist Values, unsigned int address);
                 unsigned int ReadReg(unsigned int address);
                 void writeSection(int index);
                 void writeSection(const QString& name);
                 dsu3pluginui* UI;
-                elfparser* elfparserInst;
+                ElfFile* elfFile;
                 bool running;
             };

dsu3plugin/dsu3pluginui.cpp +7 -3

                 this->flashTargetQpb = new QPushButton(tr("Flash Target"));
                 this->runQpb = new QPushButton(tr("Run"));
                 this->mainLayout = new QGridLayout();
-                this->elfInfoWdgtInst = new elfInfoWdgt;
+                this->elfFileWidgetInst = new elfFileWidget();
                 this->mainLayout->addWidget(this->openFileQpb,0,0,1,1);
                 this->mainLayout->addWidget(this->flashTargetQpb,0,1,1,1);
                 this->mainLayout->addWidget(this->runQpb,0,2,1,1);
-                this->mainLayout->addWidget(this->elfInfoWdgtInst,1,0,1,-1);
+                this->mainLayout->addWidget(this->elfFileWidgetInst,1,0,1,-1);
                 this->setLayout(this->mainLayout);
                 connect(this->openFileQpb,SIGNAL(clicked()),this,SIGNAL(openFile()));
                 connect(this->flashTargetQpb,SIGNAL(clicked()),this,SIGNAL(flashTarget()));
                 connect(this->runQpb,SIGNAL(clicked()),this,SIGNAL(run()));
-                connect(this,SIGNAL(updateInfo(elfparser*)),this->elfInfoWdgtInst,SLOT(updateInfo(elfparser*)));
             }
                     this->runQpb->setText("Run");
             }
+            void dsu3pluginui::updateInfo(ElfFile *file)
+            {
+                this->elfFileWidgetInst->setFile(file);
+            }

dsu3plugin/dsu3pluginui.h +4 -2

             #include <QVBoxLayout>
             #include <QGridLayout>
             #include "elfinfowdgt.h"
+            #include <elffile.h>
+            #include <elffilewidget.h>
             class dsu3pluginui : public QWidget
             {
             public slots:
                 void setRunning(bool running);
+                void updateInfo(ElfFile* file);
             signals:
                 void openFile();
-                void updateInfo(elfparser* parser);
                 bool flashTarget();
                 void run();
             private:
                 QPushButton* openFileQpb;
                 QPushButton* flashTargetQpb;
                 QPushButton* runQpb;
-                elfInfoWdgt* elfInfoWdgtInst;
+                elfFileWidget* elfFileWidgetInst;
             };
             #endif // DSU3PLUGINUI_H

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages