Run the disassembler in it's own thread

[frida/frida.git] / src / disassembler / Disassembler.hxx

diff --git a/src/disassembler/Disassembler.hxx b/src/disassembler/Disassembler.hxx
index 4636ed9a87aef445946d4e1d7be4610d509fc9cc..6971177b63e27487029d643392d48b0f765be962 100644 (file)
--- a/src/disassembler/Disassembler.hxx
+++ b/src/disassembler/Disassembler.hxx
@@ -3,27 +3,35 @@
 
 #include <string>
 #include <functional>
+#include <vector>
 
-#include "disassembler/BasicBlock.hxx"
-#include "disassembler/Function.hxx"
-#include "core/InformationManager.hxx"
+#include "qt.hxx"
+#include "Instruction.hxx"
 
-class Disassembler {
+class Function;
+class BasicBlock;
+class InformationManager;
+
+class Disassembler : public QObject {
+#ifndef SWIG
+       Q_OBJECT
+#endif
 public:
-       Disassembler(const std::string& filename, InformationManager* manager) {}
+       Disassembler() {}
        virtual ~Disassembler() {}
 
-       virtual void start() = 0;
        virtual void getSymbols() = 0;
        virtual uint64_t entryAddress() = 0;
-       virtual BasicBlock * getBasicBlock(uint64_t address) = 0;
 
-       virtual void forEachFunction(std::function<void (uint64_t, Function*)> callback) = 0;
-       virtual void printEachInstruction(uint64_t start, uint64_t end,
-                                         std::function<void (uint8_t*, size_t, const std::string&)> fun) = 0;
-protected:
-       virtual bool isFunctionCall(uint64_t address) = 0;
-       virtual bool isJump(uint64_t address) = 0;
+#ifndef SWIG
+public slots:
+#endif
+       virtual void start() = 0;
+       virtual Function * disassembleFunctionAt(uint64_t address) {
+               return disassembleFunctionAt(address, "");
+       }
+       virtual Function * disassembleFunctionAt(uint64_t address, const std::string& name) = 0;
+       virtual std::vector<Instruction> getInstructions(const BasicBlock* block) = 0;
 };
 
 #endif