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

diff --git a/src/disassembler/Disassembler.hxx b/src/disassembler/Disassembler.hxx
index 9986ac8..285c673 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:
@@ -14,11 +16,7 @@ public:
 	void getSymbols();
 	uint64_t entryAddress();
 
-    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;
 
 protected:
     virtual bool isFunctionCall(uint64_t address) = 0;