Properly move Functionality into FunctionWidget

diff --git a/src/gui/Mainwindow.cxx b/src/gui/Mainwindow.cxx
index 9d8e45f66e5f69749e06223d96e620e6be761bec..47c78858e46314efbe448a1d185b1f7377e8e3d2 100644 (file)
--- a/src/gui/Mainwindow.cxx
+++ b/src/gui/Mainwindow.cxx
@@ -14,14 +14,6 @@
 
 #include <sstream>
 
-namespace {
-       BasicBlockWidget *
-       local__add_basic_block(BasicBlock * block, 
-                              Mainwindow * mainwindow, InformationManager * manager,
-                              std::map<uint64_t, BasicBlockWidget*>& 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<uint64_t>::max());
-       for (auto b : fun->blocks()) {
-               if (b.first < start_address)
-                       start_address = b.first;
-       }
-
-       std::map<uint64_t, BasicBlockWidget*> _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<uint64_t, BasicBlockWidget*>& 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 e4c1c0b5c2a2bbbd5f3a7da113f0af92c57955c1..20d586df6eff9aff69d1921fcd4334c8af937520 100644 (file)
--- 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<uint64_t, BasicBlockWidget*>& 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<uint64_t>::max());
+       for (auto b : function->blocks()) {
+               if (b.first < start_address)
+                       start_address = b.first;
+       }
+
+       std::map<uint64_t, BasicBlockWidget*> _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<uint64_t, BasicBlockWidget*>& 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 fbd363867b78a327890fbf5524a112400592d991..6a26f1a8cbbb62d583a1ae159c408d60a26e5e8d 100644 (file)
--- a/src/gui/widgets/FunctionWidget.hxx
+++ b/src/gui/widgets/FunctionWidget.hxx
@@ -3,14 +3,15 @@
 
 #include "gui/qt.hxx"
 
+#include <log4cxx/logger.h>
+
 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_ */