Split disassemble()

[frida/frida.git] / src / disassembler / llvm / LLVMDisassembler.hxx

diff --git a/src/disassembler/llvm/LLVMDisassembler.hxx b/src/disassembler/llvm/LLVMDisassembler.hxx
index 8c93a450610d4f0f2b8925be02fd976b04ceff14..f2baecb33a2e44904322f298d429ef05852a2654 100644 (file)
--- a/src/disassembler/llvm/LLVMDisassembler.hxx
+++ b/src/disassembler/llvm/LLVMDisassembler.hxx
@@ -24,19 +24,24 @@ public:
        uint64_t entryAddress();
 
        void forEachFunction(std::function<void (uint64_t, Function*)> callback);
-       void printEachInstruction(uint64_t start, uint64_t end, std::function<void (const std::string&)> fun);
+       void printEachInstruction(uint64_t start, uint64_t end,
+                                                         std::function<void (uint8_t*, size_t, const std::string&)> fun);
 
        BasicBlock * getBasicBlock(uint64_t address) {
                return blocks[address];
        }
 
+    Function * disassembleFunctionAt(uint64_t address, const std::string& name = "");
+
 protected:
     bool isFunctionCall(uint64_t address) {return false;}
     bool isJump(uint64_t address) {return false;}
 
 private:
     // http://llvm.org/docs/doxygen/html/MCObjectDisassembler_8cpp_source.html +197
-       void disassemble();
+    void disassembleFunction(LLVMFunction* function);
+    void splitBlocks();
+    void disassemble();
 
        void readSymbols();
        void readSections();
@@ -62,8 +67,8 @@ private:
     std::unique_ptr<const llvm::MCInstrAnalysis> MIA;
     std::unique_ptr<const llvm::MCSubtargetInfo> STI;
     std::unique_ptr<const llvm::MCInstrInfo> MII;
-       llvm::OwningPtr<llvm::MCRelocationInfo> RelInfo;
-       llvm::OwningPtr<llvm::MCSymbolizer> Symzer;
+    std::unique_ptr<llvm::MCRelocationInfo> RelInfo;
+    std::unique_ptr<llvm::MCSymbolizer> Symzer;
 
     std::map<std::string, llvm::object::SectionRef> sections;
     std::map<std::string, llvm::object::SymbolRef> symbols;