Reoganize Function/BasicBlock creation

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

diff --git a/src/disassembler/llvm/LLVMDisassembler.hxx b/src/disassembler/llvm/LLVMDisassembler.hxx
index d26bb126f8dee24fc592afc058a5cfd6410c7c62..d00381b7ed962862c8be6e26008cdf94d06f9da8 100644 (file)
--- a/src/disassembler/llvm/LLVMDisassembler.hxx
+++ b/src/disassembler/llvm/LLVMDisassembler.hxx
@@ -8,29 +8,27 @@
 #include "include_llvm.hxx"
 
 #include "disassembler/Disassembler.hxx"
-#include "disassembler/BasicBlock.hxx"
-#include "disassembler/Function.hxx"
-#include "disassembler/llvm/LLVMBasicBlock.hxx"
-#include "disassembler/llvm/LLVMFunction.hxx"
 
+class Function;
+class BasicBlock;
 
+Disassembler * createLLVMDisassembler(const std::string& filename, InformationManager* manager);
+
+template <typename ELFT>
 class LLVMDisassembler
        : public Disassembler {
 public:
-       LLVMDisassembler(const std::string& filename, InformationManager* manager);
+       LLVMDisassembler(const std::string& filename, InformationManager* manager,
+                        llvm::object::ELFObjectFile<ELFT>* file = NULL);
        virtual ~LLVMDisassembler();
 
        void start();
        void getSymbols() {}
-       uint64_t entryAddress() {}
+       uint64_t entryAddress() {return _entryAddress;}
 
-       void forEachFunction(std::function<void (uint64_t, Function*)> callback);
        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];
-       }
+                                 std::function<void (uint8_t*, size_t, const std::string&,
+                                                     const std::string&)> fun);
 
        Function * disassembleFunctionAt(uint64_t address, const std::string& name = "");
 
@@ -39,23 +37,24 @@ protected:
        bool isJump(uint64_t address) {return false;}
 
 private:
+       typedef llvm::object::ELFFile<ELFT> ELFO;
+
        // http://llvm.org/docs/doxygen/html/MCObjectDisassembler_8cpp_source.html +197
-       void disassembleFunction(LLVMFunction* function);
-       void splitBlocks();
+       void disassembleFunction(Function* function);
+       void splitBlocks(Function* fun);
        void disassemble();
 
        void readSymbols();
        void readSections();
+       void readDynamicSymbols();
 
        log4cxx::LoggerPtr logger;
-       std::map<uint64_t, LLVMBasicBlock*> blocks;
-       std::map<uint64_t, LLVMFunction*> functions;
 
        llvm::Triple triple;
        std::shared_ptr<llvm::object::Binary> binary;
 
        const llvm::Target * target;
-       llvm::object::ObjectFile * o;
+       llvm::object::ELFObjectFile<ELFT> * o;
 
        std::unique_ptr<const llvm::MCRegisterInfo> MRI;
        std::unique_ptr<const llvm::MCAsmInfo> AsmInfo;
@@ -73,6 +72,7 @@ private:
        std::map<std::string, llvm::object::SectionRef> sections;
        std::map<std::string, llvm::object::SymbolRef> symbols;
        InformationManager * manager;
+       uint64_t _entryAddress;
 };
 
 #endif