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

diff --git a/src/disassembler/Disassembler.hxx b/src/disassembler/Disassembler.hxx
index 9986ac8..c88bfd5 100644
--- a/src/disassembler/Disassembler.hxx
+++ b/src/disassembler/Disassembler.hxx
@@ -1,25 +1,26 @@
-#ifndef INCLUDE__Disassembler_hxx
+  #ifndef INCLUDE__Disassembler_hxx
 #define INCLUDE__Disassembler_hxx
 
 #include <string>
 #include <functional>
 
-class BasicBlock {};
+#include "disassembler/BasicBlock.hxx"
+#include "disassembler/Function.hxx"
+#include "core/InformationManager.hxx"
 
 class Disassembler {
 public:
-	Disassembler(const std::string& filename) {}
+	Disassembler(const std::string& filename, InformationManager* manager) {}
     virtual ~Disassembler() {}
 
-	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 start() = 0;
+	virtual void getSymbols() = 0;
+	virtual uint64_t entryAddress() = 0;
+	virtual BasicBlock * getBasicBlock(uint64_t address) = 0;
 
+	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;