X-Git-Url: https://git.siccegge.de//index.cgi?p=frida%2Ffrida.git;a=blobdiff_plain;f=src%2Fdisassembler%2Fllvm%2FLLVMDisassembler.hxx;h=6c8767aa1a2bc7b55cb116408446504c109ef513;hp=107767d646428ed11a8ee036a0472ad86b118ed4;hb=879c174dd56331b6c7b3254edd115e46a0b5e78c;hpb=9e283567ac56a6433e832d0fa38cf534a0cb8f9f

diff --git a/src/disassembler/llvm/LLVMDisassembler.hxx b/src/disassembler/llvm/LLVMDisassembler.hxx
index 107767d..6c8767a 100644
--- a/src/disassembler/llvm/LLVMDisassembler.hxx
+++ b/src/disassembler/llvm/LLVMDisassembler.hxx
@@ -14,19 +14,24 @@
 #include "disassembler/llvm/LLVMFunction.hxx"
 
 
+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);
+	                          std::function<void (uint8_t*, size_t, const std::string&,
+	                                              const std::string&)> fun);
 
 	BasicBlock * getBasicBlock(uint64_t address) {
 		return blocks[address];
@@ -41,7 +46,7 @@ protected:
 private:
 	// http://llvm.org/docs/doxygen/html/MCObjectDisassembler_8cpp_source.html +197
 	void disassembleFunction(LLVMFunction* function);
-	void splitBlocks();
+	void splitBlocks(LLVMFunction* fun);
 	void disassemble();
 
 	void readSymbols();
@@ -55,7 +60,7 @@ private:
 	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 +78,7 @@ private:
 	std::map<std::string, llvm::object::SectionRef> sections;
 	std::map<std::string, llvm::object::SymbolRef> symbols;
 	InformationManager * manager;
+	uint64_t _entryAddress;
 };
 
 #endif