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 8cf709c9f2f821449ac689c6af147ada50db34e8..22bc22021c43bd581a5bfa5af1b198451da24317 100644 (file)
--- a/src/gui/widgets/BasicBlockWidget.hxx
+++ b/src/gui/widgets/BasicBlockWidget.hxx
@@ -8,6 +8,9 @@
 #include <array>
 #include <memory>
 #include <log4cxx/logger.h>
 #include <array>
 #include <memory>
 #include <log4cxx/logger.h>

+#include <list>
+
+#include "disassembler/Instruction.hxx"

 
 class Mainwindow;
 class CustomQGraphicsTextItem;
 
 class Mainwindow;
 class CustomQGraphicsTextItem;


@@ -23,7 +26,6 @@ class BasicBlockWidget : public QObject, public QGraphicsItem
 public:
        BasicBlockWidget(const QString& name, BasicBlock * block, Mainwindow * mainwindow);
 
 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;
        void paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
                   QWidget *widget);
        QRectF boundingRect() const;


@@ -48,12 +50,14 @@ public:
                { return name; }
 private:
        void updateFunctionName(RenameFunctionEvent* event);
                { return name; }
 private:
        void updateFunctionName(RenameFunctionEvent* event);

+       void populateWidget();

 
        uint32_t width, height;
        QString name;
        std::unique_ptr<QGraphicsTextItem> _widget;
        QTextTable* _table;
        BasicBlock* block;
 
        uint32_t width, height;
        QString name;
        std::unique_ptr<QGraphicsTextItem> _widget;
        QTextTable* _table;
        BasicBlock* block;

+       std::list<Instruction> instructions;

        Mainwindow* mainwindow;
        std::vector<BasicBlockWidget*> previous;
        BasicBlockWidget* next[2];
        Mainwindow* mainwindow;
        std::vector<BasicBlockWidget*> previous;
        BasicBlockWidget* next[2];