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

diff --git a/src/disassembler/Disassembler.hxx b/src/disassembler/Disassembler.hxx
index a618ae5..ad35018 100644
--- a/src/disassembler/Disassembler.hxx
+++ b/src/disassembler/Disassembler.hxx
@@ -3,26 +3,35 @@
 
 #include <string>
 #include <functional>
+#include <vector>
 
-#include "disassembler/BasicBlock.hxx"
-#include "disassembler/Function.hxx"
+#include "qt.hxx"
+#include "Instruction.hxx"
 
+class Function;
+class BasicBlock;
+class InformationManager;
 
-class Disassembler {
+class Disassembler : public QObject {
+#ifndef SWIG
+	Q_OBJECT
+#endif
 public:
-	Disassembler(const std::string& filename) {}
-    virtual ~Disassembler() {}
+	Disassembler() {}
+	virtual ~Disassembler() {}
 
-	void getSymbols();
-	uint64_t entryAddress();
-	virtual BasicBlock * getBasicBlock(uint64_t address) = 0;
+	virtual void start() = 0;
+	virtual void getSymbols() = 0;
+	virtual uint64_t entryAddress() = 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;
+#ifndef SWIG
+public slots:
+#endif
+	virtual Function * disassembleFunctionAt(uint64_t address) {
+		return disassembleFunctionAt(address, "");
+	}
+	virtual Function * disassembleFunctionAt(uint64_t address, const std::string& name) = 0;
+	virtual std::vector<Instruction> getInstructions(const BasicBlock* block) = 0;
 };
 
 #endif