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

diff --git a/src/disassembler/Disassembler.hxx b/src/disassembler/Disassembler.hxx
index 9986ac8..a618ae5 100644
--- a/src/disassembler/Disassembler.hxx
+++ b/src/disassembler/Disassembler.hxx
@@ -4,7 +4,9 @@
 #include <string>
 #include <functional>
 
-class BasicBlock {};
+#include "disassembler/BasicBlock.hxx"
+#include "disassembler/Function.hxx"
+
 
 class Disassembler {
 public:
@@ -13,13 +15,11 @@ public:
 
 	void getSymbols();
 	uint64_t entryAddress();
+	virtual BasicBlock * getBasicBlock(uint64_t address) = 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);
-
+	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;