Remove deprecated printEachInstruction function

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

diff --git a/src/disassembler/Disassembler.hxx b/src/disassembler/Disassembler.hxx
index 4feeddf0e11e03ab97d5b84984daebcfde5af356..7e1e3e1a2eb3574235dd1402b125858a3d14a50d 100644 (file)
--- a/src/disassembler/Disassembler.hxx
+++ b/src/disassembler/Disassembler.hxx
@@ -3,6 +3,9 @@
 
 #include <string>
 #include <functional>
+#include <vector>
+
+#include "Instruction.hxx"
 
 class Function;
 class BasicBlock;
@@ -10,22 +13,15 @@ class InformationManager;
 
 class Disassembler {
 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;
+       virtual std::vector<Instruction> getInstructions(const BasicBlock* block) = 0;
 };
 
 #endif