X-Git-Url: https://git.siccegge.de//index.cgi?p=frida%2Ffrida.git;a=blobdiff_plain;f=src%2Fdisassembler%2FDisassembler.hxx;h=776796a8dc22e230201a2cc9f775a284d0cb756f;hp=14083262f5027ac7b22057c009d4dfb1feeb8ff0;hb=0daf9a157f3d41690cf4a0287db1adecc4ad0b71;hpb=d84d4109b1f5bd5f87732b7e49860639d963a553

diff --git a/src/disassembler/Disassembler.hxx b/src/disassembler/Disassembler.hxx
index 1408326..776796a 100644
--- a/src/disassembler/Disassembler.hxx
+++ b/src/disassembler/Disassembler.hxx
@@ -4,26 +4,26 @@
 #include <string>
 #include <functional>
 
-#include "disassembler/BasicBlock.hxx"
-
+class Function;
+class BasicBlock;
+class InformationManager;
 
 class Disassembler {
 public:
-	Disassembler(const std::string& filename) {}
-    virtual ~Disassembler() {}
-
-	void getSymbols();
-	uint64_t entryAddress();
-
-    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