From ae7b9847b80153121fbc1f87e4fdc1dd0e94f4cc Mon Sep 17 00:00:00 2001 From: Christoph Egger Date: Wed, 11 Mar 2015 14:30:24 +0100 Subject: [PATCH 1/1] Properly move Functionality into FunctionWidget --- src/gui/Mainwindow.cxx | 96 +----------------------- src/gui/widgets/FunctionWidget.cxx | 115 +++++++++++++++++++++++++++++ src/gui/widgets/FunctionWidget.hxx | 10 ++- 3 files changed, 123 insertions(+), 98 deletions(-) diff --git a/src/gui/Mainwindow.cxx b/src/gui/Mainwindow.cxx index 9d8e45f..47c7885 100644 --- a/src/gui/Mainwindow.cxx +++ b/src/gui/Mainwindow.cxx @@ -14,14 +14,6 @@ #include -namespace { - BasicBlockWidget * - local__add_basic_block(BasicBlock * block, - Mainwindow * mainwindow, InformationManager * manager, - std::map& known_blocks, - CFGScene * scene, uint64_t starty, uint64_t startx); -} - Mainwindow::Mainwindow(InformationManager* mgr) : manager(mgr) , logger(log4cxx::Logger::getLogger("Mainwindow")) { @@ -253,32 +245,7 @@ void Mainwindow::addFunction(Function* fun) { functions.insert(std::make_pair(fun->getStartAddress(), fun)); - FunctionWidget * w = new FunctionWidget(fun); - - // CFG - CFGScene * scene = new CFGScene; - - BasicBlock * block = manager->getBasicBlock(fun->getStartAddress()); - - uint64_t start_address(std::numeric_limits::max()); - for (auto b : fun->blocks()) { - if (b.first < start_address) - start_address = b.first; - } - - std::map _blocks; - local__add_basic_block(block, this, - manager, _blocks, scene, start_address, 100); - - QGraphicsView * view = new QGraphicsView(scene); - w->addTab(view, "CFG"); - - // Listing - QTableWidget * t = new QTableWidget(); - t->setColumnCount(3); - t->horizontalHeader()->setSectionResizeMode(QHeaderView::ResizeToContents); - - w->addTab(t, "Listing"); + FunctionWidget * w = new FunctionWidget(fun, this); QTreeWidgetItem * item = new QTreeWidgetItem(listWidget, QStringList(fun->getName().c_str())); stackedWidget->addWidget(w); @@ -287,64 +254,3 @@ void Mainwindow::addFunction(Function* fun) { << fun->getStartAddress()); objects_list_by_address.insert(std::make_pair(fun->getStartAddress(), item)); } - -namespace { - BasicBlockWidget * - local__add_basic_block(BasicBlock * block, - Mainwindow * mainwindow, InformationManager * manager, - std::map& known_blocks, - CFGScene * 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() - << "_" << block->getEndAddress(); - BasicBlockWidget * widget = new BasicBlockWidget(s.str().c_str(), - block, mainwindow); - - known_blocks.insert(std::make_pair(block->getStartAddress(), widget)); - - scene->addItem(widget); - widget->setFlag(QGraphicsItem::ItemIsMovable, true); - widget->moveBy(100*startx, block->getStartAddress() - starty); - - manager->getDisassembler() - ->printEachInstruction(block->getStartAddress(), - block->getEndAddress(), - [&](uint8_t* bytes, - size_t byte_count, - const std::string& line, - const std::string& ref) { - widget->addItem(bytes, byte_count, - line.c_str() + 1, // remove \t - ref.c_str()); - }); - - BasicBlockWidget *tmp, *nextl(NULL), *nextr(NULL); - BasicBlock * tmpblock; - if (block->getNextBlock(0) != 0) { - int xshift = 0; - if (block->getNextBlock(1) != 0) - xshift = 1; - tmpblock = manager->getBasicBlock(block->getNextBlock(0)); - tmp = local__add_basic_block(tmpblock, mainwindow, manager, - known_blocks, - scene, starty, startx+xshift); - nextl = tmp; - tmp->addPrevious(widget); - } - if (block->getNextBlock(1) != 0) { - tmpblock = manager->getBasicBlock(block->getNextBlock(1)); - tmp = local__add_basic_block(tmpblock, mainwindow, manager, - known_blocks, - scene, starty, startx-1); - nextr = tmp; - tmp->addPrevious(widget); - } - widget->addNext(nextl, nextr); - return widget; - } -} diff --git a/src/gui/widgets/FunctionWidget.cxx b/src/gui/widgets/FunctionWidget.cxx index e4c1c0b..20d586d 100644 --- a/src/gui/widgets/FunctionWidget.cxx +++ b/src/gui/widgets/FunctionWidget.cxx @@ -1 +1,116 @@ #include "FunctionWidget.hxx" + +#include "core/Function.hxx" +#include "core/BasicBlock.hxx" +#include "core/InformationManager.hxx" + +#include "gui/widgets/CFGScene.hxx" +#include "gui/Mainwindow.hxx" + +namespace { + BasicBlockWidget * + local__add_basic_block(BasicBlock * block, + Mainwindow * mainwindow, InformationManager * manager, + std::map& known_blocks, + CFGScene * scene, uint64_t starty, uint64_t startx); +} + +FunctionWidget::FunctionWidget(Function* function, Mainwindow* mainwindow) + : function(function) + , mainwindow(mainwindow) + , logger(log4cxx::Logger::getLogger("Mainwindow")) { + + // CFG + CFGScene * scene = new CFGScene; + InformationManager* manager = function->getManager(); + + BasicBlock * block = manager->getBasicBlock(function->getStartAddress()); + LOG4CXX_DEBUG(logger, "Building widget for functionction " << function->getName()); + for (auto i : function->blocks()) { + LOG4CXX_DEBUG(logger, "Functionction contains Block " << i.second->getName()); + } + + uint64_t start_address(std::numeric_limits::max()); + for (auto b : function->blocks()) { + if (b.first < start_address) + start_address = b.first; + } + + std::map _blocks; + local__add_basic_block(block, mainwindow, + manager, _blocks, scene, start_address, 100); + + QGraphicsView * view = new QGraphicsView(scene); + addTab(view, "CFG"); + + // Listing + QTableWidget * t = new QTableWidget(); + t->setColumnCount(3); + t->horizontalHeader()->setSectionResizeMode(QHeaderView::ResizeToContents); + + addTab(t, "Listing"); +} + + + + +namespace { + BasicBlockWidget * + local__add_basic_block(BasicBlock * block, + Mainwindow * mainwindow, InformationManager * manager, + std::map& known_blocks, + CFGScene * 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() + << "_" << block->getEndAddress(); + BasicBlockWidget * widget = new BasicBlockWidget(s.str().c_str(), + block, mainwindow); + + known_blocks.insert(std::make_pair(block->getStartAddress(), widget)); + + scene->addItem(widget); + widget->setFlag(QGraphicsItem::ItemIsMovable, true); + widget->moveBy(100*startx, block->getStartAddress() - starty); + + manager->getDisassembler() + ->printEachInstruction(block->getStartAddress(), + block->getEndAddress(), + [&](uint8_t* bytes, + size_t byte_count, + const std::string& line, + const std::string& ref) { + widget->addItem(bytes, byte_count, + line.c_str() + 1, // remove \t + ref.c_str()); + }); + + BasicBlockWidget *tmp, *nextl(NULL), *nextr(NULL); + BasicBlock * tmpblock; + if (block->getNextBlock(0) != 0) { + int xshift = 0; + if (block->getNextBlock(1) != 0) + xshift = 1; + tmpblock = manager->getBasicBlock(block->getNextBlock(0)); + tmp = local__add_basic_block(tmpblock, mainwindow, manager, + known_blocks, + scene, starty, startx+xshift); + nextl = tmp; + tmp->addPrevious(widget); + } + if (block->getNextBlock(1) != 0) { + tmpblock = manager->getBasicBlock(block->getNextBlock(1)); + tmp = local__add_basic_block(tmpblock, mainwindow, manager, + known_blocks, + scene, starty, startx-1); + nextr = tmp; + tmp->addPrevious(widget); + } + widget->addNext(nextl, nextr); + return widget; + } +} diff --git a/src/gui/widgets/FunctionWidget.hxx b/src/gui/widgets/FunctionWidget.hxx index fbd3638..6a26f1a 100644 --- a/src/gui/widgets/FunctionWidget.hxx +++ b/src/gui/widgets/FunctionWidget.hxx @@ -3,14 +3,15 @@ #include "gui/qt.hxx" +#include + class Function; +class Mainwindow; class FunctionWidget : public QTabWidget { Q_OBJECT public: - FunctionWidget(Function* function) - : function(function) {} - + FunctionWidget(Function* function, Mainwindow* mainwindow); virtual ~FunctionWidget() {} Function* getFunction() const @@ -18,6 +19,9 @@ public: private: Function * function; + Mainwindow* mainwindow; + + log4cxx::LoggerPtr logger; }; #endif /* INCLUDE__FunctionWidget_hxx_ */ -- 2.39.2