Rework API for getting at instructions

[frida/frida.git] / src / disassembler / Disassembler.hxx

diff --git a/src/disassembler/Disassembler.hxx b/src/disassembler/Disassembler.hxx
index c88bfd5f1408933e3d1ccc9bbd055b5a097b2532..78c67c6610ac5b75d709d2ac0b2e0d15a4058aba 100644 (file)
--- a/src/disassembler/Disassembler.hxx
+++ b/src/disassembler/Disassembler.hxx
@@ -1,29 +1,30 @@
-  #ifndef INCLUDE__Disassembler_hxx
+#ifndef INCLUDE__Disassembler_hxx
 #define INCLUDE__Disassembler_hxx
 
 #include <string>
 #include <functional>
+#include <list>
 
-#include "disassembler/BasicBlock.hxx"
-#include "disassembler/Function.hxx"
-#include "core/InformationManager.hxx"
+#include "Instruction.hxx"
+
+class Function;
+class BasicBlock;
+class InformationManager;
 
 class Disassembler {
 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;
+                                         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;
+       virtual std::list<Instruction> getInstructions(const BasicBlock* block) = 0;
 };
 
 #endif