Rework API for getting at instructions

[frida/frida.git] / src / gui / widgets / BasicBlockWidget.hxx

diff --git a/src/gui/widgets/BasicBlockWidget.hxx b/src/gui/widgets/BasicBlockWidget.hxx
index 2122bf208e6b55fa5323367fb4fd496a4c5dfeaf..22bc22021c43bd581a5bfa5af1b198451da24317 100644 (file)
--- a/src/gui/widgets/BasicBlockWidget.hxx
+++ b/src/gui/widgets/BasicBlockWidget.hxx
@@ -2,21 +2,30 @@
 #define INCLUDE__BasicBlockWidget_hxx
 
 #include "gui/qt.hxx"
-#include "disassembler/BasicBlock.hxx"
 #include <vector>
 #include <cassert>
 #include <tuple>
 #include <array>
+#include <memory>
+#include <log4cxx/logger.h>
+#include <list>
+
+#include "disassembler/Instruction.hxx"
 
 class Mainwindow;
+class CustomQGraphicsTextItem;
+
+class BasicBlock;
+
+class RenameFunctionEvent;
 
 class BasicBlockWidget : public QObject, public QGraphicsItem
 {
        Q_OBJECT
+       friend class CustomQGraphicsTextItem;
 public:
        BasicBlockWidget(const QString& name, BasicBlock * block, Mainwindow * mainwindow);
 
-       void addItem(uint8_t* bytes, size_t num_bytes, QString line, const QString& href);
        void paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
                   QWidget *widget);
        QRectF boundingRect() const;
@@ -40,14 +49,19 @@ public:
        QString getName() const
                { return name; }
 private:
+       void updateFunctionName(RenameFunctionEvent* event);
+       void populateWidget();
+
        uint32_t width, height;
        QString name;
-       QGraphicsTextItem _widget;
+       std::unique_ptr<QGraphicsTextItem> _widget;
        QTextTable* _table;
        BasicBlock* block;
+       std::list<Instruction> instructions;
        Mainwindow* mainwindow;
        std::vector<BasicBlockWidget*> previous;
        BasicBlockWidget* next[2];
+       log4cxx::LoggerPtr logger;
 };
 
 #endif