]> git.siccegge.de Git - frida/frida.git/blobdiff - src/gui/Mainwindow.cxx
Pass NewFunctionEvents as objects, not pointers
[frida/frida.git] / src / gui / Mainwindow.cxx
index a42d3f4e9ef67d588b4922b71ac110ce913da40c..1add669e55c6f32c3174f74e45123f71e746aa4c 100644 (file)
@@ -6,6 +6,10 @@
 #include "core/BasicBlock.hxx"
 #include "core/InformationManager.hxx"
 #include "core/events/RenameFunctionEvent.hxx"
+#include "core/events/NewFunctionEvent.hxx"
+
+#include "widgets/FridaDock.hxx"
+#include "widgets/LogDock.hxx"
 #include "widgets/ScriptingDock.hxx"
 #include "widgets/CFGScene.hxx"
 #include "widgets/FunctionWidget.hxx"
 
 #include <sstream>
 
-namespace {
-       BasicBlockWidget *
-       local__add_basic_block(BasicBlock * block, 
-                              Mainwindow * mainwindow, InformationManager * manager,
-                              std::map<uint64_t, BasicBlockWidget*>& known_blocks,
-                              CFGScene * scene, uint64_t starty, uint64_t startx);
-}
-
 Mainwindow::Mainwindow(InformationManager* mgr)
        : manager(mgr)
-       , logger(log4cxx::Logger::getLogger("Mainwindow")) {
+       , logger(log4cxx::Logger::getLogger("gui.Mainwindow")) {
        openAction = new QAction(tr("&Open"), this);
        loadAction = new QAction(tr("&Load"), this);
        saveAction = new QAction(tr("&Save"), this);
@@ -46,9 +42,28 @@ Mainwindow::Mainwindow(InformationManager* mgr)
        fileMenu->addSeparator();
        fileMenu->addAction(exitAction);
 
-       scripting = new ScriptingDock(new GuileInterpreter, tr("Scripting"), this);
-       scripting->setAllowedAreas(Qt::BottomDockWidgetArea);
-       addDockWidget(Qt::BottomDockWidgetArea, scripting);
+       QMenu* interpretermenu = menuBar()->addMenu(tr("&Interpreter"));
+
+       fdock = new FridaDock(tr("Frida Dock"), this);
+
+       fdock->addTab(new LogDock(fdock), "Log");
+
+       fdock->addTab(new ScriptingDock(manager->getInterpreter("GUILE"), fdock), "guile");
+       fdock->setAllowedAreas(Qt::BottomDockWidgetArea);
+       addDockWidget(Qt::BottomDockWidgetArea, fdock);
+       QAction* guileLoad = new QAction(tr("&GUILE"), this);
+       interpretermenu->addAction(guileLoad);
+       connect(guileLoad, &QAction::triggered,
+               [&]() {
+                       QString fileName = QFileDialog::getOpenFileName(this, tr("Open Script"), "",
+                                                                       tr("Scripts") + " (*." +
+                                                                       manager->getInterpreter("GUILE")->fileExtension().c_str() + ")");
+                       if(! fileName.isNull()) {
+                               std::stringstream a, b;
+                               std::string c;
+                               manager->getInterpreter("GUILE")->loadFile(fileName.toStdString(), a, b, c);
+                       }
+               });
 
        listWidget = new QTreeWidget();
        listWidget->setColumnCount(1);
@@ -72,20 +87,23 @@ Mainwindow::Mainwindow(InformationManager* mgr)
 
        setWindowTitle(tr("FRIDA"));
 
-       QTreeWidgetItem * external = new QTreeWidgetItem(listWidget, QStringList("External Functions"));
+       external = new QTreeWidgetItem(listWidget, QStringList("External Functions"));
        external->setChildIndicatorPolicy(QTreeWidgetItem::ShowIndicator);
        external->setBackground(0, QBrush(QColor(0xff, 0xdd, 0xdd)));
-       mgr->connect_new_function_signal([&] (Function* fun) {addFunction(fun);});
-       mgr->connect_new_dyn_symbol_signal([=] (const std::string& name) {
-                       auto item = new QTreeWidgetItem(external, QStringList(name.c_str()));
-                       item->setBackground(0, QBrush(QColor(0xff, 0xdd, 0xdd)));
-               });
-       mgr->connect_rename_function_signal([&](RenameFunctionEvent* event) {
-                       if (objects_list_by_address.find(event->address) == objects_list_by_address.end())
-                               return;
-                       auto item = objects_list_by_address[event->address];
-                       if (item) item->setText(0, event->new_name.c_str());
-               });
+       connect(mgr, &InformationManager::resetEvent,
+               [this,mgr]() {
+                       connect(this, SIGNAL(requestNewFunctionByAddress(uint64_t)),
+                               mgr->getDisassembler(), SLOT(disassembleFunctionAt(uint64_t)));
+               });
+       connect(mgr, &InformationManager::newFunctionEvent,
+               this, &Mainwindow::handleNewFunctionEvent);
+       connect(mgr, &InformationManager::renameFunctionEvent,
+               [&](RenameFunctionEvent* event) {
+                       if (objects_list_by_address.find(event->address) == objects_list_by_address.end())
+                               return;
+                       auto item = objects_list_by_address[event->address];
+                       if (item) item->setText(0, event->new_name.c_str());
+               });
        setGlobalHotkeys();
 }
 
@@ -100,6 +118,16 @@ void Mainwindow::setGlobalHotkeys() {
                });
 }
 
+void Mainwindow::handleNewFunctionEvent(NewFunctionEvent event) {
+       std::string name = event.function->getName();
+       if (event.function->isDynamic()) {
+               auto item = new QTreeWidgetItem(external, QStringList(name.c_str()));
+               item->setBackground(0, QBrush(QColor(0xff, 0xdd, 0xdd)));
+       } else {
+               addFunction(event.function);
+       }
+}
+
 void Mainwindow::quit()
 {
        QMessageBox messageBox;
@@ -112,15 +140,29 @@ void Mainwindow::quit()
 }
 
 void Mainwindow::open() {
-       QString fileName = QFileDialog::getOpenFileName(this, tr("Open File"), "",
-                                                       tr("Binaries (*)"));
-       manager->reset(fileName.toStdString());
+       QFileDialog dialog(this, tr("Open bianry"), "", tr("Binaries (*)"));
+
+       if (dialog.exec()) {
+               QStringList files = dialog.selectedFiles();
+               if(1 != files.size()) {
+                       LOG4CXX_ERROR(logger, "Needs exactly one file name")
+               } else {
+                       manager->reset(files[0].toStdString());
+               }
+       }
 }
 
 void Mainwindow::load() {
-       QString fileName = QFileDialog::getOpenFileName(this, tr("Open File"), "",
-                                                       tr("Frida Archives (*.frida)"));
-       manager->load(fileName.toStdString());
+       QFileDialog dialog(this, tr("Open saved FrIDa file"), "", tr("Frida Archives (*.frida)"));
+
+       if (dialog.exec()) {
+               QStringList files = dialog.selectedFiles();
+               if(1 != files.size()) {
+                       LOG4CXX_ERROR(logger, "Needs exactly one file name")
+               } else {
+                       manager->load(files[0].toStdString());
+               }
+       }
 }
 
 void Mainwindow::save() {
@@ -185,7 +227,7 @@ void Mainwindow::requestNewFunction() {
        NewFunctionDialog dialog;
        int result = dialog.exec();
        if (QDialog::Accepted == result) {
-               requestNewFunctionByAddress(dialog.result());
+               emit requestNewFunctionByAddress(dialog.result());
        } else {
                LOG4CXX_DEBUG(logger, "requestNewFunction aborted");
        }
@@ -203,12 +245,6 @@ void Mainwindow::requestNewGroup() {
        }
 }
 
-void Mainwindow::requestNewFunctionByAddress(uint64_t address) {
-       LOG4CXX_DEBUG(logger, "requesting Function at " << std::hex << address);
-       manager->getDisassembler()->disassembleFunctionAt(address);
-       switchMainPlaneToAddress(address);
-}
-
 void Mainwindow::renameFunction(Function* function) {
        SimpleStringDialog dialog("New name");
        int result = dialog.exec();
@@ -239,32 +275,7 @@ void Mainwindow::addFunction(Function* fun) {
 
        functions.insert(std::make_pair(fun->getStartAddress(), fun));
 
-       FunctionWidget * w = new FunctionWidget(fun);
-
-       // CFG
-       CFGScene * scene = new CFGScene;
-
-       BasicBlock * block = manager->getBasicBlock(fun->getStartAddress());
-
-       uint64_t start_address(std::numeric_limits<uint64_t>::max());
-       for (auto b : fun->blocks()) {
-               if (b.first < start_address)
-                       start_address = b.first;
-       }
-
-       std::map<uint64_t, BasicBlockWidget*> _blocks;
-       local__add_basic_block(block, this,
-                              manager, _blocks, scene, start_address, 100);
-
-       QGraphicsView * view = new QGraphicsView(scene);
-       w->addTab(view, "CFG");
-
-       // Listing
-       QTableWidget * t = new QTableWidget();
-       t->setColumnCount(3);
-       t->horizontalHeader()->setSectionResizeMode(QHeaderView::ResizeToContents);
-
-       w->addTab(t, "Listing");
+       FunctionWidget * w = new FunctionWidget(fun, this);
 
        QTreeWidgetItem * item = new QTreeWidgetItem(listWidget, QStringList(fun->getName().c_str()));
        stackedWidget->addWidget(w);
@@ -273,64 +284,3 @@ void Mainwindow::addFunction(Function* fun) {
                      << fun->getStartAddress());
        objects_list_by_address.insert(std::make_pair(fun->getStartAddress(), item));
 }
-
-namespace {
-       BasicBlockWidget *
-       local__add_basic_block(BasicBlock * block,
-                              Mainwindow * mainwindow, InformationManager * manager,
-                              std::map<uint64_t, BasicBlockWidget*>& known_blocks,
-                              CFGScene * scene, uint64_t starty, uint64_t startx) {
-
-               decltype(known_blocks.begin()) old;
-               if ((old = known_blocks.find(block->getStartAddress())) != known_blocks.end())
-                       return old->second;
-
-               std::stringstream s;
-               s << "BLOCK_" << std::hex << block->getStartAddress()
-                 << "_" << block->getEndAddress();
-               BasicBlockWidget * widget = new BasicBlockWidget(s.str().c_str(),
-                                                                block, mainwindow);
-
-               known_blocks.insert(std::make_pair(block->getStartAddress(), widget));
-
-               scene->addItem(widget);
-               widget->setFlag(QGraphicsItem::ItemIsMovable, true);
-               widget->moveBy(100*startx, block->getStartAddress() - starty);
-
-               manager->getDisassembler()
-                       ->printEachInstruction(block->getStartAddress(),
-                                              block->getEndAddress(),
-                                              [&](uint8_t* bytes,
-                                                  size_t byte_count,
-                                                  const std::string& line,
-                                                  const std::string& ref) {
-                                                      widget->addItem(bytes, byte_count,
-                                                                      line.c_str() + 1, // remove \t
-                                                                      ref.c_str());
-                                              });
-
-               BasicBlockWidget *tmp, *nextl(NULL), *nextr(NULL);
-               BasicBlock * tmpblock;
-               if (block->getNextBlock(0) != 0) {
-                       int xshift = 0;
-                       if (block->getNextBlock(1) != 0)
-                               xshift = 1;
-                       tmpblock = manager->getBasicBlock(block->getNextBlock(0));
-                       tmp = local__add_basic_block(tmpblock, mainwindow, manager,
-                                                    known_blocks,
-                                                    scene, starty, startx+xshift);
-                       nextl = tmp;
-                       tmp->addPrevious(widget);
-               }
-               if (block->getNextBlock(1) != 0) {
-                       tmpblock = manager->getBasicBlock(block->getNextBlock(1));
-                       tmp = local__add_basic_block(tmpblock, mainwindow, manager,
-                                                    known_blocks,
-                                                    scene, starty, startx-1);
-                       nextr = tmp;
-                       tmp->addPrevious(widget);
-               }
-               widget->addNext(nextl, nextr);
-               return widget;
-       }
-}