Fix layout if functions include blocks before entry

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

diff --git a/src/gui/Mainwindow.cxx b/src/gui/Mainwindow.cxx
index 5fd57aa74a404157b2603b2d09ba7ba72e3a320c..196db38a18b838923a3cc3403b2b6b7d6c8768d0 100644 (file)
--- a/src/gui/Mainwindow.cxx
+++ b/src/gui/Mainwindow.cxx
@@ -23,9 +23,11 @@ Mainwindow::Mainwindow(InformationManager* mgr)
        // 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 +86,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,8 +132,11 @@ 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) {
+               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);
                                          });