X-Git-Url: https://git.siccegge.de//index.cgi?a=blobdiff_plain;f=src%2Fdisassembler%2FDisassembler.hxx;h=fe240a93c46eae6798d32e6817cea66ab051a09c;hb=f9ae4391568cfcbf4e6de0475bddcdd68e9b31d2;hp=9986ac8e3a0fd4f61f94c25b3da364b36d1a901b;hpb=0f91922e40640e00f1208aee5d8c968a698c5d31;p=frida%2Ffrida.git

diff --git a/src/disassembler/Disassembler.hxx b/src/disassembler/Disassembler.hxx
index 9986ac8..fe240a9 100644
--- a/src/disassembler/Disassembler.hxx
+++ b/src/disassembler/Disassembler.hxx
@@ -4,25 +4,23 @@
 #include <string>
 #include <functional>
 
-class BasicBlock {};
+class Function;
+class BasicBlock;
+class InformationManager;
 
 class Disassembler {
 public:
-	Disassembler(const std::string& filename) {}
-    virtual ~Disassembler() {}
+	Disassembler() {}
+	virtual ~Disassembler() {}
 
-	void getSymbols();
-	uint64_t entryAddress();
+	virtual void start() = 0;
+	virtual void getSymbols() = 0;
+	virtual uint64_t entryAddress() = 0;
 
-    virtual void forEachInstruction(const std::string& name, std::function<void (long, std::string, std::string)> callback) = 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;
+	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;
 };
 
 #endif