X-Git-Url: https://git.siccegge.de//index.cgi?a=blobdiff_plain;f=src%2Fdisassembler%2FDisassembler.hxx;h=669dd82076b5f3627fe8cd9a2a1394b51849b5ee;hb=be25639ecafa1ec2d37c8e2d6c8225c12ddb59ff;hp=5af2eac9d96f84bcbbbaebd16b2b84ce3ee0149a;hpb=1b95144814ee74e611fd8a3806e54f064b120460;p=frida%2Ffrida.git

diff --git a/src/disassembler/Disassembler.hxx b/src/disassembler/Disassembler.hxx
index 5af2eac..669dd82 100644
--- a/src/disassembler/Disassembler.hxx
+++ b/src/disassembler/Disassembler.hxx
@@ -3,28 +3,38 @@
 
 #include <string>
 #include <functional>
+#include <vector>
 
-#include "disassembler/BasicBlock.hxx"
-#include "disassembler/Function.hxx"
-#include "core/InformationManager.hxx"
+#include "qt.hxx"
+#include "Instruction.hxx"
 
-class Disassembler {
+class Function;
+class BasicBlock;
+class InformationManager;
+
+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;
-protected:
-	virtual bool isFunctionCall(uint64_t address) = 0;
-	virtual bool isJump(uint64_t address) = 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;
+
+	// TODO: Should use move semantics!
+	virtual std::vector<Instruction> getInstructions(const BasicBlock* block) = 0;
 };
 
 #endif