- #include "Mainwindow.hxx"
-#include "widgets/BasicBlockWidget.hxx"
+#include "Mainwindow.hxx"
#include "qt.hxx"
#include "disassembler/llvm/LLVMDisassembler.hxx"
#include <iostream>
#include <sstream>
+#include <map>
#include <QtGui>
fileMenu->addSeparator();
fileMenu->addAction(exitAction);
+ scripting = new ScriptingDock(tr("Scripting"), this);
+ scripting->setAllowedAreas(Qt::BottomDockWidgetArea);
+ addDockWidget(Qt::BottomDockWidgetArea, scripting);
+
listWidget = new QListWidget();
stackedWidget = new QStackedWidget();
dockWidget = new QDockWidget(tr("Functions"), this);
}
namespace {
- void local__add_basic_block(BasicBlock * block, Disassembler * dis, QGraphicsScene * scene,
- uint64_t starty, uint64_t startx) {
+ BasicBlockWidget *
+ local__add_basic_block(BasicBlock * block, Disassembler * dis,
+ std::map<uint64_t, BasicBlockWidget*>& known_blocks,
+ QGraphicsScene * scene, uint64_t starty, uint64_t startx) {
+
+ decltype(known_blocks.begin()) old;
+ if ((old = known_blocks.find(block->getStartAddress())) != known_blocks.end())
+ return old->second;
+
std::stringstream s;
- s << "BLOCK_" << std::hex << block->getStartAddress();
- BasicBlockWidget * widget = new BasicBlockWidget(s.str().c_str());
+ s << "BLOCK_" << std::hex << block->getStartAddress()
+ << "_" << block->getEndAddress();
+ BasicBlockWidget * widget = new BasicBlockWidget(s.str().c_str(), block);
+
+ known_blocks.insert(std::make_pair(block->getStartAddress(), widget));
+
scene->addItem(widget);
widget->setFlag(QGraphicsItem::ItemIsMovable, true);
widget->moveBy(100*startx, 10*(block->getStartAddress() - starty));
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);
+ BasicBlockWidget *tmp, *nextl(NULL), *nextr(NULL);
+ BasicBlock * tmpblock;
+ if (block->getNextBlock(0) != 0) {
+ tmpblock = dis->getBasicBlock(block->getNextBlock(0));
+ tmp = local__add_basic_block(tmpblock, dis,
+ known_blocks,
+ scene, starty, startx+1);
+ nextl = tmp;
+ tmp->addPrevious(widget);
+ }
+ if (block->getNextBlock(1) != 0) {
+ tmpblock = dis->getBasicBlock(block->getNextBlock(1));
+ tmp = local__add_basic_block(tmpblock, dis,
+ known_blocks,
+ scene, starty, startx-1);
+ nextr = tmp;
+ tmp->addPrevious(widget);
+ }
+ widget->addNext(nextl, nextr);
+ return widget;
}
}
BasicBlock * block = disassembler->getBasicBlock(fun->getStartAddress());
- local__add_basic_block(block, disassembler.get(), scene, block->getStartAddress(), 100);
+ local__add_basic_block(block, disassembler.get(), blocks, scene, block->getStartAddress(), 100);
QGraphicsView * view = new QGraphicsView(scene);
w->addTab(view, "CFG");
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());