Factor out llvm disassembler

[frida/frida.git] / src / gui / Mainwindow.cxx

diff --git a/src/gui/Mainwindow.cxx b/src/gui/Mainwindow.cxx
index be86cac4477c13db986082e9b78081207e7f23dc..061734a5bc946dde58082641543aed5ec24d6c0c 100644 (file)
--- a/src/gui/Mainwindow.cxx
+++ b/src/gui/Mainwindow.cxx
@@ -1,6 +1,7 @@
-#include "Mainwindow.hxx"
+ #include "Mainwindow.hxx"

 #include "widgets/BasicBlockWidget.hxx"
 #include "qt.hxx"
 #include "widgets/BasicBlockWidget.hxx"
 #include "qt.hxx"

+#include "disassembler/llvm/LLVMDisassembler.hxx"

 
 #include <iostream>
 #include <sstream>
 
 #include <iostream>
 #include <sstream>


@@ -54,14 +55,15 @@ void Mainwindow::open() {
                                                     tr("Binaries (*)"));
 
     if (fileName != "") {
                                                     tr("Binaries (*)"));
 
     if (fileName != "") {

-        curBin = new qtlldb::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.reset(new LLVMDisassembler(fileName.toStdString()));
+        // 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);
+        // }

     }
 }
 
     }
 }
 


@@ -72,18 +74,18 @@ void Mainwindow::populateSymbolInformation(const std::string& sym) {
     QTableWidget * t = new QTableWidget();
     t->setColumnCount(3);
     t->horizontalHeader()->setSectionResizeMode(QHeaderView::ResizeToContents);
     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
     w->addTab(t, "Listing");
 
     // CFG