Preliminary LLVM-3.6 support

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

diff --git a/src/disassembler/llvm/LLVMDisassembler.hxx b/src/disassembler/llvm/LLVMDisassembler.hxx
index 6c55b44d5d855e2ee8ea19ace28940c9da7a4629..d8d4056734f458b416ae005b753c8a667ed1a35d 100644 (file)
--- a/src/disassembler/llvm/LLVMDisassembler.hxx
+++ b/src/disassembler/llvm/LLVMDisassembler.hxx
@@ -14,31 +14,31 @@ class BasicBlock;
 
 Disassembler * createLLVMDisassembler(const std::string& filename, InformationManager* manager);
 
-template <typename ELFT>
+template <typename ObjectType>
 class LLVMDisassembler
        : public Disassembler {
 public:
        LLVMDisassembler(const std::string& filename, InformationManager* manager,
-                        llvm::object::ELFObjectFile<ELFT>* file = NULL);
+                        llvm::object::ObjectFile* file = NULL);
        virtual ~LLVMDisassembler();
 
        void start();
        void getSymbols() {}
-       uint64_t entryAddress() {return _entryAddress;}
+       uint64_t entryAddress();
 
        void printEachInstruction(uint64_t start, uint64_t end,
                                  std::function<void (uint8_t*, size_t, const std::string&,
                                                      const std::string&)> fun);
 
        Function * disassembleFunctionAt(uint64_t address, const std::string& name = "");
+       std::vector<Instruction> getInstructions(const BasicBlock* block);
 
 private:
-       typedef llvm::object::ELFFile<ELFT> ELFO;
-
        // http://llvm.org/docs/doxygen/html/MCObjectDisassembler_8cpp_source.html +197
        void disassembleFunction(Function* function);
        void splitBlocks(Function* fun);
        void disassemble();
+       llvm::object::SectionRef getTextSection();
 
        void readSymbols();
        void readSections();
@@ -50,11 +50,11 @@ private:
        std::shared_ptr<llvm::object::Binary> binary;
 
        const llvm::Target * target;
-       llvm::object::ELFObjectFile<ELFT> * o;
+       llvm::object::ObjectFile * o;
 
        std::unique_ptr<const llvm::MCRegisterInfo> MRI;
        std::unique_ptr<const llvm::MCAsmInfo> AsmInfo;
-       std::unique_ptr<llvm::MCModule> Mod;
+//     std::unique_ptr<llvm::MCModule> Mod;
        std::unique_ptr<llvm::MCInstPrinter> IP;
        std::unique_ptr<llvm::MCDisassembler> DisAsm;
        std::unique_ptr<const llvm::MCObjectFileInfo> MOFI;