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=906318103bfd61aa87d67082c344f3ad13adad5b;hb=4443ad3e38327c776dcc68538591456d37c9ed6f;hpb=cb4e14fde0ee90cf5986f2a15b95acb98b04045c

diff --git a/src/disassembler/llvm/LLVMDisassembler.hxx b/src/disassembler/llvm/LLVMDisassembler.hxx
index 9063181..a64dc2c 100644
--- a/src/disassembler/llvm/LLVMDisassembler.hxx
+++ b/src/disassembler/llvm/LLVMDisassembler.hxx
@@ -8,51 +8,43 @@
 #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 ELFT>
+template <typename ObjectType>
 class LLVMDisassembler
 	: public Disassembler {
 public:
-	LLVMDisassembler(const std::string& filename, InformationManager* manager);
+	LLVMDisassembler(const std::string& filename, InformationManager* manager,
+	                 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&)> fun);
-
-	BasicBlock * getBasicBlock(uint64_t address) {
-		return blocks[address];
-	}
+	                          std::function<void (uint8_t*, size_t, const std::string&,
+	                                              const std::string&)> fun);
 
 	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::list<Instruction> getInstructions(const BasicBlock* block);
 
 private:
 	// 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;