Add logging infrastructure for mainwindow

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

diff --git a/src/gui/Mainwindow.cxx b/src/gui/Mainwindow.cxx
index 7b207faf9504281dfa3e9b7ff2ef663ed4ddfbd6..9f1d353ab2a568c14609c051133ebf87143e62ce 100644 (file)
--- a/src/gui/Mainwindow.cxx
+++ b/src/gui/Mainwindow.cxx
@@ -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);
@@ -84,11 +87,16 @@ void Mainwindow::addFunction(Function* fun) {
        CFGScene * scene = new CFGScene;
 
        Disassembler * dis = manager->getDisassembler();
-       std::cerr << dis << std::endl;
-
        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");
@@ -125,10 +133,13 @@ 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) {
+                                                 widget->addItem(bytes, byte_count, line.c_str() + 1);
+                                         });
 
                BasicBlockWidget *tmp, *nextl(NULL), *nextr(NULL);
                BasicBlock * tmpblock;
@@ -138,16 +149,16 @@ namespace {
                                xshift = 1;
                        tmpblock = dis->getBasicBlock(block->getNextBlock(0));
                        tmp = local__add_basic_block(tmpblock, dis,
-                                                                                known_blocks,
-                                                                                scene, starty, startx+xshift);
+                                                    known_blocks,
+                                                    scene, starty, startx+xshift);
                        nextl = tmp;
                        tmp->addPrevious(widget);
                }
                if (block->getNextBlock(1) != 0) {
                        tmpblock = dis->getBasicBlock(block->getNextBlock(1));
                        tmp = local__add_basic_block(tmpblock, dis,
-                                                                                known_blocks,
-                                                                                scene, starty, startx-1);
+                                                    known_blocks,
+                                                    scene, starty, startx-1);
                        nextr = tmp;
                        tmp->addPrevious(widget);
                }