Draw edges between BasicBlockWidgets while handling loops

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

diff --git a/src/gui/Mainwindow.cxx b/src/gui/Mainwindow.cxx
index 7d6b8d28b5b244ca965f3b435858f5596ef88a43..ace89f34523d629da3bf7c1e8963c0073df03b62 100644 (file)
--- a/src/gui/Mainwindow.cxx
+++ b/src/gui/Mainwindow.cxx
@@ -1,10 +1,10 @@
- #include "Mainwindow.hxx"
-#include "widgets/BasicBlockWidget.hxx"
+#include "Mainwindow.hxx"
 #include "qt.hxx"
 #include "disassembler/llvm/LLVMDisassembler.hxx"
 
 #include <iostream>
 #include <sstream>
+#include <map>
 
 #include <QtGui>
 
@@ -69,12 +69,22 @@ void Mainwindow::openBinary(const std::string& filename) {
 }
 
 namespace {
-       void local__add_basic_block(BasicBlock * block, Disassembler * dis, QGraphicsScene * scene,
-                                                               uint64_t starty, uint64_t startx) {
+       BasicBlockWidget *
+       local__add_basic_block(BasicBlock * block, Disassembler * dis,
+                                                  std::map<uint64_t, BasicBlockWidget*>& known_blocks,
+                                                  QGraphicsScene * 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());
+               BasicBlockWidget * widget = new BasicBlockWidget(s.str().c_str(), block);
+
+               known_blocks.insert(std::make_pair(block->getStartAddress(), widget));
+
                scene->addItem(widget);
                widget->setFlag(QGraphicsItem::ItemIsMovable, true);
                widget->moveBy(100*startx, 10*(block->getStartAddress() - starty));
@@ -84,10 +94,26 @@ namespace {
                                                                          widget->addItem(bytes, byte_count, line.c_str() + 1);
                                                                  });
 
-               if (block->getNextBlock(0) != 0)
-                       local__add_basic_block(dis->getBasicBlock(block->getNextBlock(0)), dis, scene, starty, startx+1);
-               if (block->getNextBlock(1) != 0)
-                       local__add_basic_block(dis->getBasicBlock(block->getNextBlock(1)), dis, scene, starty, startx-1);
+               BasicBlockWidget *tmp, *nextl(NULL), *nextr(NULL);
+               BasicBlock * tmpblock;
+               if (block->getNextBlock(0) != 0) {
+                       tmpblock = dis->getBasicBlock(block->getNextBlock(0));
+                       tmp = local__add_basic_block(tmpblock, dis,
+                                                                                known_blocks,
+                                                                                scene, starty, startx+1);
+                       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);
+                       nextr = tmp;
+                       tmp->addPrevious(widget);
+               }
+               widget->addNext(nextl, nextr);
+               return widget;
        }
 }
 
@@ -99,7 +125,7 @@ void Mainwindow::populateSymbolInformation(Function* fun) {
 
        BasicBlock * block = disassembler->getBasicBlock(fun->getStartAddress());
 
-       local__add_basic_block(block, disassembler.get(), scene, block->getStartAddress(), 100);
+       local__add_basic_block(block, disassembler.get(), blocks, scene, block->getStartAddress(), 100);
 
     QGraphicsView * view = new QGraphicsView(scene);
     w->addTab(view, "CFG");