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

diff --git a/src/gui/Mainwindow.cxx b/src/gui/Mainwindow.cxx
index 5e47b25..7d6b8d2 100644
--- a/src/gui/Mainwindow.cxx
+++ b/src/gui/Mainwindow.cxx
@@ -72,12 +72,18 @@ 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();
+		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)
@@ -102,18 +108,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());