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

diff --git a/src/gui/Mainwindow.cxx b/src/gui/Mainwindow.cxx
index 790c1a3..fd0c245 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);
@@ -49,6 +37,8 @@ Mainwindow::Mainwindow()
             stackedWidget, SLOT(setCurrentIndex(int)));
 
     setWindowTitle(tr("Notepad"));
+
+	openBinary(filename);
 }
 
 void Mainwindow::quit()
@@ -66,17 +56,20 @@ 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));
+        // 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);
+        // }
     }
 }
 
@@ -87,24 +80,43 @@ void Mainwindow::populateSymbolInformation(const std::string& sym) {
     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));
-        });
+    // 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);
+
+    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");