X-Git-Url: https://git.siccegge.de//index.cgi?p=frida%2Ffrida.git;a=blobdiff_plain;f=src%2Fdisassembler%2FDisassembler.hxx;h=6971177b63e27487029d643392d48b0f765be962;hp=fe240a93c46eae6798d32e6817cea66ab051a09c;hb=568fd6801188fb8c092c7820102824a572ec656e;hpb=ccde95277ce5e3929d09aef387c2f5956592d066

diff --git a/src/disassembler/Disassembler.hxx b/src/disassembler/Disassembler.hxx
index fe240a9..6971177 100644
--- a/src/disassembler/Disassembler.hxx
+++ b/src/disassembler/Disassembler.hxx
@@ -3,24 +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() {}
 	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;
+#ifndef SWIG
+public slots:
+#endif
+	virtual void start() = 0;
+	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