X-Git-Url: https://git.siccegge.de//index.cgi?p=frida%2Ffrida.git;a=blobdiff_plain;f=src%2Fdisassembler%2FDisassembler.hxx;h=ffcc889caee40f8118494cf9bd3583ac130ac466;hp=b2576f70d3c5939f132374a7d5fbdff498162604;hb=1ef802ee9a14e6274b3e60db873965b794f49abe;hpb=c55f9e2b5f5ff83817ab5187eb0122600a4c5cea

diff --git a/src/disassembler/Disassembler.hxx b/src/disassembler/Disassembler.hxx
index b2576f7..ffcc889 100644
--- a/src/disassembler/Disassembler.hxx
+++ b/src/disassembler/Disassembler.hxx
@@ -3,29 +3,28 @@
 
 #include <string>
 #include <functional>
+#include <vector>
 
-#include "disassembler/BasicBlock.hxx"
-#include "disassembler/Function.hxx"
+#include "Instruction.hxx"
 
+class Function;
+class BasicBlock;
+class InformationManager;
 
 class Disassembler {
 public:
-	Disassembler(const std::string& filename) {}
-    virtual ~Disassembler() {}
-
-	void getSymbols();
-	uint64_t entryAddress();
-
-	virtual void forEachFunction(std::function<void (uint64_t, Function*)> callback) = 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;
+	Disassembler() {}
+	virtual ~Disassembler() {}
+
+	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;
+	virtual std::vector<Instruction> getInstructions(const BasicBlock* block) = 0;
 };
 
 #endif