Reoganize Function/BasicBlock creation

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

diff --git a/src/disassembler/Disassembler.hxx b/src/disassembler/Disassembler.hxx
index b2576f70d3c5939f132374a7d5fbdff498162604..776796a8dc22e230201a2cc9f775a284d0cb756f 100644 (file)
--- a/src/disassembler/Disassembler.hxx
+++ b/src/disassembler/Disassembler.hxx
@@ -4,28 +4,26 @@
 #include <string>
 #include <functional>
 
-#include "disassembler/BasicBlock.hxx"
-#include "disassembler/Function.hxx"
-
+class Function;
+class BasicBlock;
+class InformationManager;
 
 class Disassembler {
 public:
-       Disassembler(const std::string& filename) {}
-    virtual ~Disassembler() {}
-
-       void getSymbols();
-       uint64_t entryAddress();
-
-       virtual void forEachFunction(std::function<void (uint64_t, Function*)> callback) = 0;
-    // virtual void forEachInstruction(const std::string& name, std::function<void (long, std::string, std::string)> callback) = 0;
+       Disassembler(const std::string& filename, InformationManager* manager) {}
+       virtual ~Disassembler() {}
 
-    // http://llvm.org/docs/doxygen/html/MCObjectDisassembler_8cpp_source.html +197
-       BasicBlock * generateControlFlowGraph(const std::string& name);
-       BasicBlock * generateControlFlowGraph(uint64_t address);
+       virtual void start() = 0;
+       virtual void getSymbols() = 0;
+       virtual uint64_t entryAddress() = 0;
 
+       virtual void printEachInstruction(uint64_t start, uint64_t end,
+                                         std::function<void (uint8_t*, size_t, const std::string&,
+                                                             const std::string&)> fun) = 0;
+       virtual Function * disassembleFunctionAt(uint64_t address, const std::string& name = "") = 0;
 protected:
-    virtual bool isFunctionCall(uint64_t address) = 0;
-    virtual bool isJump(uint64_t address) = 0;
+       virtual bool isFunctionCall(uint64_t address) = 0;
+       virtual bool isJump(uint64_t address) = 0;
 };
 
 #endif