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

diff --git a/src/disassembler/Disassembler.hxx b/src/disassembler/Disassembler.hxx
index c88bfd5..ad35018 100644
--- a/src/disassembler/Disassembler.hxx
+++ b/src/disassembler/Disassembler.hxx
@@ -1,29 +1,37 @@
-  #ifndef INCLUDE__Disassembler_hxx
+#ifndef INCLUDE__Disassembler_hxx
 #define INCLUDE__Disassembler_hxx
 
 #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) {}
-    virtual ~Disassembler() {}
+	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;
+#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