X-Git-Url: https://git.siccegge.de//index.cgi?p=frida%2Ffrida.git;a=blobdiff_plain;f=src%2Fdisassembler%2Fllvm%2FLLVMDisassembler.hxx;h=a64dc2c66e451131f9187ab82ca5a70342a9e1ab;hp=848b20e4a7cff206c66c7ba4e78ef5f16e1be39f;hb=4443ad3e38327c776dcc68538591456d37c9ed6f;hpb=1d66010fc38eab99ec29d25606e3d44a3297e6e6

diff --git a/src/disassembler/llvm/LLVMDisassembler.hxx b/src/disassembler/llvm/LLVMDisassembler.hxx
index 848b20e..a64dc2c 100644
--- a/src/disassembler/llvm/LLVMDisassembler.hxx
+++ b/src/disassembler/llvm/LLVMDisassembler.hxx
@@ -8,63 +8,67 @@
 #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 ObjectType>
 class LLVMDisassembler
-    : public Disassembler {
+	: public Disassembler {
 public:
-    LLVMDisassembler(const std::string& filename);
-    virtual ~LLVMDisassembler();
+	LLVMDisassembler(const std::string& filename, InformationManager* manager,
+	                 llvm::object::ObjectFile* file = NULL);
+	virtual ~LLVMDisassembler();
 
-	void getSymbols();
+	void start();
+	void getSymbols() {}
 	uint64_t entryAddress();
 
-	void forEachFunction(std::function<void (uint64_t, Function*)> callback);
-	BasicBlock * getBasicBlock(uint64_t address) {
-		return blocks[address];
-	}
+	void printEachInstruction(uint64_t start, uint64_t end,
+	                          std::function<void (uint8_t*, size_t, const std::string&,
+	                                              const std::string&)> fun);
 
-protected:
-    bool isFunctionCall(uint64_t address) {return false;}
-    bool isJump(uint64_t address) {return false;}
+	Function * disassembleFunctionAt(uint64_t address, const std::string& name = "");
+	std::list<Instruction> getInstructions(const BasicBlock* block);
 
 private:
-    // http://llvm.org/docs/doxygen/html/MCObjectDisassembler_8cpp_source.html +197
+	// 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();
-
-    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;
-
-    std::unique_ptr<const llvm::MCRegisterInfo> MRI;
-    std::unique_ptr<const llvm::MCAsmInfo> AsmInfo;
-    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;
-    std::unique_ptr<llvm::MCContext> Ctx;
-    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::map<std::string, llvm::object::SectionRef> sections;
-    std::map<std::string, llvm::object::SymbolRef> symbols;
+	void readDynamicSymbols();
+
+	log4cxx::LoggerPtr logger;
+
+	llvm::Triple triple;
+	std::shared_ptr<llvm::object::Binary> binary;
+
+	const llvm::Target * target;
+	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::MCInstPrinter> IP;
+	std::unique_ptr<llvm::MCDisassembler> DisAsm;
+	std::unique_ptr<const llvm::MCObjectFileInfo> MOFI;
+	std::unique_ptr<llvm::MCContext> Ctx;
+	std::unique_ptr<const llvm::MCInstrAnalysis> MIA;
+	std::unique_ptr<const llvm::MCSubtargetInfo> STI;
+	std::unique_ptr<const llvm::MCInstrInfo> MII;
+	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;
+	InformationManager * manager;
+	uint64_t _entryAddress;
 };
 
 #endif