X-Git-Url: https://git.siccegge.de//index.cgi?p=frida%2Ffrida.git;a=blobdiff_plain;f=src%2Fdisassembler%2Fllvm%2FLLVMDisassembler.hxx;h=e0b26e19f7d70a430908c03c029c809ff1a44bf4;hp=2713ac6f32f561df00e252a53b0678c4fe6cc4d9;hb=099f1e8222109bf7397eff6da0c511a07906c9cd;hpb=bc36ee5d21eac1d9bd1ab1c2e7003101dbbec604

diff --git a/src/disassembler/llvm/LLVMDisassembler.hxx b/src/disassembler/llvm/LLVMDisassembler.hxx
index 2713ac6..e0b26e1 100644
--- a/src/disassembler/llvm/LLVMDisassembler.hxx
+++ b/src/disassembler/llvm/LLVMDisassembler.hxx
@@ -11,58 +11,45 @@
 
 class Function;
 class BasicBlock;
-class LLVMBasicBlock;
 
 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 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&,
 	                                              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:
-	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();
 	void readDynamicSymbols();
 
 	log4cxx::LoggerPtr logger;
-	std::map<uint64_t, LLVMBasicBlock*> blocks;
-	std::map<uint64_t, Function*> functions;
 
 	llvm::Triple triple;
 	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;