X-Git-Url: https://git.siccegge.de//index.cgi?p=frida%2Ffrida.git;a=blobdiff_plain;f=src%2Fgui%2FMainwindow.cxx;h=7d6b8d28b5b244ca965f3b435858f5596ef88a43;hp=91a933bdb390567cc1af9013f9c70898d09847a0;hb=8e4fd3f1e861dcebaa853e73b32a8a0603aef793;hpb=4705f969626fcac48f390ba94f60f9d9572aff4e

diff --git a/src/gui/Mainwindow.cxx b/src/gui/Mainwindow.cxx
index 91a933b..7d6b8d2 100644
--- a/src/gui/Mainwindow.cxx
+++ b/src/gui/Mainwindow.cxx
@@ -62,64 +62,55 @@ void Mainwindow::open() {
 void Mainwindow::openBinary(const std::string& filename) {
     if (filename != "") {
         disassembler.reset(new LLVMDisassembler(filename));
-        // 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);
-        // }
+		disassembler->forEachFunction([&](uint64_t address, Function* fun) {
+				populateSymbolInformation(fun);
+			});
     }
 }
 
-void Mainwindow::populateSymbolInformation(const std::string& sym) {
-    QTabWidget * w = new QTabWidget();
+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()
+		  << "_" << block->getEndAddress();
+		BasicBlockWidget * widget = new BasicBlockWidget(s.str().c_str());
+		scene->addItem(widget);
+		widget->setFlag(QGraphicsItem::ItemIsMovable, true);
+		widget->moveBy(100*startx, 10*(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);
+								  });
+
+		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);
+	}
+}
 
-    // Listing
-    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");
+void Mainwindow::populateSymbolInformation(Function* fun) {
+    QTabWidget * w = new QTabWidget();
 
     // 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);
+	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");
 
-    listWidget->addItem(sym.c_str());
+    // Listing
+    QTableWidget * t = new QTableWidget();
+    t->setColumnCount(3);
+    t->horizontalHeader()->setSectionResizeMode(QHeaderView::ResizeToContents);
+
+    w->addTab(t, "Listing");
+
+    listWidget->addItem(fun->getName().c_str());
     stackedWidget->addWidget(w);
 }