Allow addition of new functions

[frida/frida.git] / src / gui / Mainwindow.cxx

diff --git a/src/gui/Mainwindow.cxx b/src/gui/Mainwindow.cxx
index 34dcfb1496dd05dfa29095b34971c9383d5d94f8..764eb0376d1ca4acb12f56fb0faa7b37c27c98d1 100644 (file)
--- a/src/gui/Mainwindow.cxx
+++ b/src/gui/Mainwindow.cxx
@@ -3,7 +3,7 @@
 #include "disassembler/llvm/LLVMDisassembler.hxx"
 
 #include "widgets/CFGScene.hxx"
-
+#include "dialogs/NewFunctionDialog.hxx"
 #include <iostream>
 #include <sstream>
 #include <map>
@@ -18,14 +18,17 @@ namespace {
 }
 
 Mainwindow::Mainwindow(InformationManager* mgr)
-       : manager(mgr) {
+       : manager(mgr)
+       , logger(log4cxx::Logger::getLogger("Mainwindow")) {
        openAction = new QAction(tr("&Open"), this);
        // saveAction = new QAction(tr("&Save"), this);
        exitAction = new QAction(tr("E&xit"), this);
 
-       connect(openAction, SIGNAL(triggered()), this, SLOT(open()));
+       connect(openAction, SIGNAL(triggered()),
+               this, SLOT(open()));
        // connect(saveAction, SIGNAL(triggered()), this, SLOT(save()));
-       connect(exitAction, SIGNAL(triggered()), qApp, SLOT(quit()));
+       connect(exitAction, SIGNAL(triggered()),
+               qApp, SLOT(quit()));
 
        fileMenu = menuBar()->addMenu(tr("&File"));
        fileMenu->addAction(openAction);
@@ -38,6 +41,10 @@ Mainwindow::Mainwindow(InformationManager* mgr)
        addDockWidget(Qt::BottomDockWidgetArea, scripting);
 
        listWidget = new QListWidget();
+       listWidget->setContextMenuPolicy(Qt::CustomContextMenu);
+       connect(listWidget, SIGNAL(customContextMenuRequested(const QPoint&)),
+               this, SLOT(showListContextMenu(const QPoint&)));
+
        stackedWidget = new QStackedWidget();
        dockWidget = new QDockWidget(tr("Functions"), this);
        dockWidget->setAllowedAreas(Qt::LeftDockWidgetArea |
@@ -52,12 +59,16 @@ Mainwindow::Mainwindow(InformationManager* mgr)
        setWindowTitle(tr("FRIDA"));
 
        mgr->connect_new_function_signal([&] (Function* fun) {addFunction(fun);});
+       mgr->connect_new_dyn_symbol_signal([&] (const std::string& name) {
+                       auto item = new QListWidgetItem(name.c_str(), listWidget);
+                       item->setBackground(QBrush(QColor(0xff, 0xdd, 0xdd)));
+               });
 }
 
 void Mainwindow::quit()
 {
        QMessageBox messageBox;
-       messageBox.setWindowTitle(tr("Notepad"));
+       messageBox.setWindowTitle(tr("Frida"));
        messageBox.setText(tr("Do you really want to quit?"));
        messageBox.setStandardButtons(QMessageBox::Yes | QMessageBox::No);
        messageBox.setDefaultButton(QMessageBox::No);
@@ -72,6 +83,30 @@ void Mainwindow::open() {
        manager->reset(fileName.toStdString());
 }
 
+void Mainwindow::showListContextMenu(const QPoint& point) {
+       QListWidgetItem * item = listWidget->itemAt(point);
+       if (item) {
+               LOG4CXX_DEBUG(logger, "WOHO " << item->text().toStdString());
+       } else {
+               QMenu menu(this);
+               QAction * act = menu.addAction("AddFunction");
+               connect(act, SIGNAL(triggered()), this, SLOT(requestNewFunction()));
+
+               menu.exec(listWidget->mapToGlobal(point));
+       }
+}
+
+void Mainwindow::requestNewFunction() {
+       NewFunctionDialog dialog;
+       int result = dialog.exec();
+       if (QDialog::Accepted == result) {
+               LOG4CXX_DEBUG(logger, "requesting Function at " << std::hex << dialog.result());
+               manager->getDisassembler()->disassembleFunctionAt(dialog.result());
+       } else {
+               LOG4CXX_DEBUG(logger, "requestNewFunction aborted");
+       }
+}
+
 void Mainwindow::addFunction(Function* fun) {
        if (functions.find(fun) != functions.end())
                return;
@@ -86,7 +121,14 @@ void Mainwindow::addFunction(Function* fun) {
        Disassembler * dis = manager->getDisassembler();
        BasicBlock * block = dis->getBasicBlock(fun->getStartAddress());
 
-       local__add_basic_block(block, manager->getDisassembler(), blocks, scene, block->getStartAddress(), 100);
+       uint64_t start_address(std::numeric_limits<uint64_t>::max());
+       for (auto b : fun->blocks()) {
+               if (b.first < start_address)
+                       start_address = b.first;
+       }
+
+       local__add_basic_block(block, manager->getDisassembler(), blocks, scene,
+                              start_address, 100);
 
        QGraphicsView * view = new QGraphicsView(scene);
        w->addTab(view, "CFG");
@@ -123,9 +165,15 @@ namespace {
                widget->setFlag(QGraphicsItem::ItemIsMovable, true);
                widget->moveBy(100*startx, block->getStartAddress() - starty);
 
-               dis->printEachInstruction(block->getStartAddress(), block->getEndAddress(),
-                                         [&](uint8_t* bytes, size_t byte_count, const std::string& line) {
-                                                 widget->addItem(bytes, byte_count, line.c_str() + 1);
+               dis->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);