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(),
- [&](const std::string& line) {
- widget->addItem(line.c_str());
+ [&](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)
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());