X-Git-Url: https://git.siccegge.de//index.cgi?p=frida%2Ffrida.git;a=blobdiff_plain;f=src%2Fdisassembler%2FDisassembler.hxx;h=78c67c6610ac5b75d709d2ac0b2e0d15a4058aba;hp=4636ed9a87aef445946d4e1d7be4610d509fc9cc;hb=4443ad3e38327c776dcc68538591456d37c9ed6f;hpb=9e283567ac56a6433e832d0fa38cf534a0cb8f9f

diff --git a/src/disassembler/Disassembler.hxx b/src/disassembler/Disassembler.hxx
index 4636ed9..78c67c6 100644
--- a/src/disassembler/Disassembler.hxx
+++ b/src/disassembler/Disassembler.hxx
@@ -3,27 +3,28 @@
 
 #include <string>
 #include <functional>
+#include <list>
 
-#include "disassembler/BasicBlock.hxx"
-#include "disassembler/Function.hxx"
-#include "core/InformationManager.hxx"
+#include "Instruction.hxx"
+
+class Function;
+class BasicBlock;
+class InformationManager;
 
 class Disassembler {
 public:
-	Disassembler(const std::string& filename, InformationManager* manager) {}
+	Disassembler() {}
 	virtual ~Disassembler() {}
 
 	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;
+	                                  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::list<Instruction> getInstructions(const BasicBlock* block) = 0;
 };
 
 #endif