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

diff --git a/src/gui/Mainwindow.cxx b/src/gui/Mainwindow.cxx
index 790c1a3..7d6b8d2 100644
--- a/src/gui/Mainwindow.cxx
+++ b/src/gui/Mainwindow.cxx
@@ -1,26 +1,14 @@
-#include "Mainwindow.hxx"
+ #include "Mainwindow.hxx"
+#include "widgets/BasicBlockWidget.hxx"
+#include "qt.hxx"
+#include "disassembler/llvm/LLVMDisassembler.hxx"
 
 #include <iostream>
 #include <sstream>
 
 #include <QtGui>
-#include <QAction>
-#include <QMenuBar>
-#include <QMenu>
-#include <QDockWidget>
-#include <QMessageBox>
-#include <QFileDialog>
-#include <QTableWidget>
-#include <QHeaderView>
-#include <QGraphicsScene>
-#include <QGraphicsItem>
-#include <QGraphicsView>
 
-namespace {
-
-}
-
-Mainwindow::Mainwindow()
+Mainwindow::Mainwindow(const std::string& filename)
 {
     openAction = new QAction(tr("&Open"), this);
     // saveAction = new QAction(tr("&Save"), this);
@@ -48,7 +36,9 @@ Mainwindow::Mainwindow()
     connect(listWidget, SIGNAL(currentRowChanged(int)),
             stackedWidget, SLOT(setCurrentIndex(int)));
 
-    setWindowTitle(tr("Notepad"));
+    setWindowTitle(tr("FRIDA"));
+
+	openBinary(filename);
 }
 
 void Mainwindow::quit()
@@ -66,48 +56,61 @@ void Mainwindow::open() {
     QString fileName = QFileDialog::getOpenFileName(this, tr("Open File"), "",
                                                     tr("Binaries (*)"));
 
-    if (fileName != "") {
-        curBin = new qtlldb::Binary(fileName.toStdString());
-
-        std::vector<std::string> symbols = curBin->getSymbols();
-        if (0 == symbols.size())
-            populateSymbolInformation(".text");
-        for (std::vector<std::string>::iterator it = symbols.begin();
-             it != symbols.end();
-             ++it) {
-            populateSymbolInformation(*it);
-        }
+	openBinary(fileName.toStdString());
+}
+
+void Mainwindow::openBinary(const std::string& filename) {
+    if (filename != "") {
+        disassembler.reset(new LLVMDisassembler(filename));
+		disassembler->forEachFunction([&](uint64_t address, Function* fun) {
+				populateSymbolInformation(fun);
+			});
     }
 }
 
-void Mainwindow::populateSymbolInformation(const std::string& sym) {
+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);
+	}
+}
+
+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);
     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");
 
-    // CFG
-    QGraphicsScene * scene = new QGraphicsScene;
-    QGraphicsRectItem *rect = scene->addRect(QRectF(0, 0, 100, 100));
-    rect->setFlag(QGraphicsItem::ItemIsMovable);
-    QGraphicsView * view = new QGraphicsView(scene);
-    w->addTab(view, "CFG");
+    w->addTab(t, "Listing");
 
-    listWidget->addItem(sym.c_str());
+    listWidget->addItem(fun->getName().c_str());
     stackedWidget->addWidget(w);
 }