place BasicBlockWidgets on the canvas

We'll later layout things properly properly using force based
layouting. However we still want BasicBlocks loosely sorted by Address
and consistent behaviour for taken/not taken jumps

diff --git a/src/gui/Mainwindow.cxx b/src/gui/Mainwindow.cxx
index fb713fc57d3b4ca55c8ef9ab4dc286abfe3035a9..5e47b25871227bc791e9354021f49d2e5d0a7466 100644 (file)
--- a/src/gui/Mainwindow.cxx
+++ b/src/gui/Mainwindow.cxx
@@ -65,21 +65,39 @@ void Mainwindow::openBinary(const std::string& filename) {
                disassembler->forEachFunction([&](uint64_t address, Function* fun) {
                                populateSymbolInformation(fun);
                        });
-
-        // curBin = new Binary(fileName.toStdString());
-
-        // std::vector<std::string> symbols = curBin->getSymbols();
-        // if (0 == symbols.size())
-        //     populateSymbolInformation(".text");
-        // for (auto it = symbols.begin(); it != symbols.end(); ++it) {
-        //     populateSymbolInformation(*it);
-        // }
     }
 }
 
+namespace {
+       void local__add_basic_block(BasicBlock * block, Disassembler * dis, QGraphicsScene * scene,
+                                                               uint64_t starty, uint64_t startx) {
+               std::stringstream s;
+               s << "BLOCK_" << std::hex << block->getStartAddress();
+               BasicBlockWidget * widget = new BasicBlockWidget(s.str().c_str());
+               scene->addItem(widget);
+               widget->setFlag(QGraphicsItem::ItemIsMovable, true);
+               widget->moveBy(100*startx, 10*(block->getStartAddress() - starty));
+
+               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);
+       }
+}
+
 void Mainwindow::populateSymbolInformation(Function* fun) {
     QTabWidget * w = new QTabWidget();
 
+    // CFG
+    QGraphicsScene * scene = new QGraphicsScene;
+
+       BasicBlock * block = disassembler->getBasicBlock(fun->getStartAddress());
+
+       local__add_basic_block(block, disassembler.get(), scene, block->getStartAddress(), 100);
+
+    QGraphicsView * view = new QGraphicsView(scene);
+    w->addTab(view, "CFG");
+
     // Listing
     QTableWidget * t = new QTableWidget();
     t->setColumnCount(3);
@@ -98,32 +116,6 @@ void Mainwindow::populateSymbolInformation(Function* fun) {
     //     });
     w->addTab(t, "Listing");
 
-    // CFG
-    QGraphicsScene * scene = new QGraphicsScene;
-
-    BasicBlockWidget * s1 = new BasicBlockWidget;
-    scene->addItem(s1);
-    s1->setFlag(QGraphicsItem::ItemIsMovable, true);
-
-    BasicBlockWidget * s2 = new BasicBlockWidget;
-    scene->addItem(s2);
-    s2->setFlag(QGraphicsItem::ItemIsMovable, true);
-    s2->moveBy(-200, 350);
-
-    BasicBlockWidget * s3 = new BasicBlockWidget;
-    scene->addItem(s3);
-    s3->setFlag(QGraphicsItem::ItemIsMovable, true);
-    s3->moveBy(100, 350);
-
-    BasicBlockWidget * s4 = new BasicBlockWidget;
-    scene->addItem(s4);
-    s4->setFlag(QGraphicsItem::ItemIsMovable, true);
-    s4->moveBy(400, 350);
-
-
-    QGraphicsView * view = new QGraphicsView(scene);
-    w->addTab(view, "CFG");
-
     listWidget->addItem(fun->getName().c_str());
     stackedWidget->addWidget(w);
 }

diff --git a/src/gui/widgets/BasicBlockWidget.hxx b/src/gui/widgets/BasicBlockWidget.hxx
index 8c5ef1af415b5dc05761fdcaeee67db2993b0854..effb5880665a9c4eeaed5baa2105ed7c4a7e9c39 100644 (file)
--- a/src/gui/widgets/BasicBlockWidget.hxx
+++ b/src/gui/widgets/BasicBlockWidget.hxx
@@ -3,11 +3,10 @@
 class BasicBlockWidget : public QGraphicsItem
 {
 public:
-    BasicBlockWidget() {
-        x = -5;
-        y = -20;
-        dx = 250;
-        dy = 270;
+    BasicBlockWidget(const QString& name)
+               : x(-5), y(-20)
+               , dx(250), dy(270)
+               , name(name) {
         _widget.addItem("THIS");
         _widget.addItem("IS");
         _widget.addItem("A");
@@ -28,10 +27,11 @@ public:
         painter->fillRect(x, y, dx, dy, QColor(0xcc, 0xcc, 0xff, 0xff));
         painter->setPen(QColor(0x00, 0x00, 0xff, 0xff));
         painter->drawRect(x, y, dx, dy);
-        painter->drawText(0, -5, "BLOCK");
+        painter->drawText(0, -5, name);
         _widget.render(painter);
     }
 private:
     int x, y, dx, dy;
     QListWidget _widget;
+       QString name;
 };