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

diff --git a/src/disassembler/llvm/LLVMDisassembler.hxx b/src/disassembler/llvm/LLVMDisassembler.hxx
index 2291e20..b9fc453 100644
--- a/src/disassembler/llvm/LLVMDisassembler.hxx
+++ b/src/disassembler/llvm/LLVMDisassembler.hxx
@@ -11,63 +11,46 @@
 
 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;}
-
-	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];
-	}
+	uint64_t entryAddress();
 
 	Function * disassembleFunctionAt(uint64_t address, const std::string& name = "");
-
-protected:
-	bool isFunctionCall(uint64_t address) {return false;}
-	bool isJump(uint64_t address) {return false;}
+	std::vector<Instruction> getInstructions(const BasicBlock* block);
 
 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();
+	llvm::object::SectionRef getTextSection();
 
 	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::ELFObjectFile<ELFT> * o;
+	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::MCModule> Mod;
 	std::unique_ptr<llvm::MCInstPrinter> IP;
 	std::unique_ptr<llvm::MCDisassembler> DisAsm;
 	std::unique_ptr<const llvm::MCObjectFileInfo> MOFI;