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 14083262f5027ac7b22057c009d4dfb1feeb8ff0..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 "qt.hxx"
+#include "Instruction.hxx"
 
+class Function;
+class BasicBlock;
+class InformationManager;
 
-class Disassembler {
+class Disassembler : public QObject {
+#ifndef SWIG
+       Q_OBJECT
+#endif
 public:
-       Disassembler(const std::string& filename) {}
-    virtual ~Disassembler() {}
-
-       void getSymbols();
-       uint64_t entryAddress();
+       Disassembler() {}
+       virtual ~Disassembler() {}
 
-    virtual void forEachInstruction(const std::string& name, std::function<void (long, std::string, std::string)> callback) = 0;
+       virtual void getSymbols() = 0;
+       virtual uint64_t entryAddress() = 0;
 
-    // http://llvm.org/docs/doxygen/html/MCObjectDisassembler_8cpp_source.html +197
-       BasicBlock * generateControlFlowGraph(const std::string& name);
-       BasicBlock * generateControlFlowGraph(uint64_t address);
-
-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