X-Git-Url: https://git.siccegge.de//index.cgi?p=frida%2Ffrida.git;a=blobdiff_plain;f=src%2Fgui%2FMainwindow.cxx;h=f98cd60a226888da2f780af6c3dc924cdde6a45b;hp=1c8ae0bb2225b49e2132b8cb9dcc188c2c2fcb25;hb=fae0fc8f1d90f5f36cfc336a92aa9d488471332d;hpb=f66c54319d23de4c4905ad11a8f552917d2dfba9

diff --git a/src/gui/Mainwindow.cxx b/src/gui/Mainwindow.cxx
index 1c8ae0b..f98cd60 100644
--- a/src/gui/Mainwindow.cxx
+++ b/src/gui/Mainwindow.cxx
@@ -1,10 +1,11 @@
- #include "Mainwindow.hxx"
-#include "widgets/BasicBlockWidget.hxx"
+#include "Mainwindow.hxx"
 #include "qt.hxx"
 #include "disassembler/llvm/LLVMDisassembler.hxx"
+#include "widgets/CFGScene.hxx"
 
 #include <iostream>
 #include <sstream>
+#include <map>
 
 #include <QtGui>
 
@@ -24,6 +25,10 @@ Mainwindow::Mainwindow(const std::string& filename)
     fileMenu->addSeparator();
     fileMenu->addAction(exitAction);
 
+    scripting = new ScriptingDock(tr("Scripting"), this);
+    scripting->setAllowedAreas(Qt::BottomDockWidgetArea);
+    addDockWidget(Qt::BottomDockWidgetArea, scripting);
+
     listWidget = new QListWidget();
     stackedWidget = new QStackedWidget();
     dockWidget = new QDockWidget(tr("Functions"), this);
@@ -69,24 +74,54 @@ 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,
+						   CFGScene * 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();
-		BasicBlockWidget * widget = new BasicBlockWidget(s.str().c_str());
+		s << "BLOCK_" << std::hex << block->getStartAddress()
+		  << "_" << block->getEndAddress();
+		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));
+		widget->moveBy(100*startx, block->getStartAddress() - starty);
 
 		dis->printEachInstruction(block->getStartAddress(), block->getEndAddress(),
-								  [&](const std::string& line) {
-									  widget->addItem(line.c_str());
+								  [&](uint8_t* bytes, size_t byte_count, const std::string& line) {
+									  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) {
+			int xshift = 0;
+			if (block->getNextBlock(1) != 0)
+				xshift = 1;
+			tmpblock = dis->getBasicBlock(block->getNextBlock(0));
+			tmp = local__add_basic_block(tmpblock, dis,
+										 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);
+			nextr = tmp;
+			tmp->addPrevious(widget);
+		}
+		widget->addNext(nextl, nextr);
+		return widget;
 	}
 }
 
@@ -94,11 +129,11 @@ void Mainwindow::populateSymbolInformation(Function* fun) {
     QTabWidget * w = new QTabWidget();
 
     // CFG
-    QGraphicsScene * scene = new QGraphicsScene;
+    CFGScene * scene = new CFGScene;
 
 	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");
@@ -107,18 +142,7 @@ void Mainwindow::populateSymbolInformation(Function* fun) {
     QTableWidget * t = new QTableWidget();
     t->setColumnCount(3);
     t->horizontalHeader()->setSectionResizeMode(QHeaderView::ResizeToContents);
-    // curBin->for_each_instruction(sym, [&t](long add, std::string bytes, std::string mnemonic) {
-    //         int row = t->rowCount();
-    //         std::stringstream s;
-    //         t->setRowCount(t->rowCount() + 1);
-    //         s << std::hex << add;
-    //         t->setItem(row,0,new QTableWidgetItem(s.str().c_str()));
-    //         s.str("");
-    //         s << std::hex;
-    //         for_each(bytes.begin(), bytes.end(), [&s](char c){s << (unsigned int)((unsigned char)c) << ' ';});
-    //         t->setItem(row,1,new QTableWidgetItem(s.str().c_str()));
-    //         t->setItem(row,2,new QTableWidgetItem(mnemonic.c_str() + 1));
-    //     });
+
     w->addTab(t, "Listing");
 
     listWidget->addItem(fun->getName().c_str());