X-Git-Url: https://git.siccegge.de//index.cgi?a=blobdiff_plain;f=src%2Fdisassembler%2FDisassembler.hxx;h=ad35018e870bab74ae33da162d290be30e3a7832;hb=f9d8bd4a0312a92a1ec3493e83996c0a99d8d1bf;hp=4feeddf0e11e03ab97d5b84984daebcfde5af356;hpb=32e87746db981882b95aceddde79ef12034a3405;p=frida%2Ffrida.git

diff --git a/src/disassembler/Disassembler.hxx b/src/disassembler/Disassembler.hxx
index 4feeddf..ad35018 100644
--- a/src/disassembler/Disassembler.hxx
+++ b/src/disassembler/Disassembler.hxx
@@ -3,29 +3,35 @@
 
 #include <string>
 #include <functional>
+#include <vector>
+
+#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, 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&,
-	                                                      const std::string&)> fun) = 0;
-	virtual Function * disassembleFunctionAt(uint64_t address, const std::string& name = "") = 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