X-Git-Url: https://git.siccegge.de//index.cgi?a=blobdiff_plain;f=src%2Fdisassembler%2Fllvm%2FLLVMDisassembler.hxx;h=d4b13a20e92ce2a12fb0127d5a4de7518743d861;hb=f9ae4391568cfcbf4e6de0475bddcdd68e9b31d2;hp=2291e205d4ccadede3acff7bb173579df9de9b91;hpb=32e87746db981882b95aceddde79ef12034a3405;p=frida%2Ffrida.git

diff --git a/src/disassembler/llvm/LLVMDisassembler.hxx b/src/disassembler/llvm/LLVMDisassembler.hxx
index 2291e20..d4b13a2 100644
--- a/src/disassembler/llvm/LLVMDisassembler.hxx
+++ b/src/disassembler/llvm/LLVMDisassembler.hxx
@@ -11,44 +11,31 @@
 
 class Function;
 class BasicBlock;
-class LLVMFunction;
-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(LLVMFunction* function);
-	void splitBlocks(LLVMFunction* fun);
+	void disassembleFunction(Function* function);
+	void splitBlocks(Function* fun);
 	void disassemble();
 
 	void readSymbols();
@@ -56,14 +43,12 @@ private:
 	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::ELFObjectFile<ELFT> * o;
+	llvm::object::ObjectFile * o;
 
 	std::unique_ptr<const llvm::MCRegisterInfo> MRI;
 	std::unique_ptr<const llvm::MCAsmInfo> AsmInfo;