X-Git-Url: https://git.siccegge.de//index.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Fdisassembler%2Fllvm%2FLLVMDisassembler.hxx;h=d26bb126f8dee24fc592afc058a5cfd6410c7c62;hb=231dae075375e7d57982f5107b86294fbe726b33;hp=87dbefa2c9ed355349dcf892aac5a3a936614dae;hpb=c55f9e2b5f5ff83817ab5187eb0122600a4c5cea;p=frida%2Ffrida.git

diff --git a/src/disassembler/llvm/LLVMDisassembler.hxx b/src/disassembler/llvm/LLVMDisassembler.hxx
index 87dbefa..d26bb12 100644
--- a/src/disassembler/llvm/LLVMDisassembler.hxx
+++ b/src/disassembler/llvm/LLVMDisassembler.hxx
@@ -11,58 +11,68 @@
 #include "disassembler/BasicBlock.hxx"
 #include "disassembler/Function.hxx"
 #include "disassembler/llvm/LLVMBasicBlock.hxx"
+#include "disassembler/llvm/LLVMFunction.hxx"
 
 
 class LLVMDisassembler
-    : public Disassembler {
+	: public Disassembler {
 public:
-    LLVMDisassembler(const std::string& filename);
-    virtual ~LLVMDisassembler() {};
+	LLVMDisassembler(const std::string& filename, InformationManager* manager);
+	virtual ~LLVMDisassembler();
 
-	void getSymbols();
-	uint64_t entryAddress();
+	void start();
+	void getSymbols() {}
+	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 * generateControlFlowGraph(const std::string& name);
-	BasicBlock * generateControlFlowGraph(uint64_t address);
+	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;}
+	bool isFunctionCall(uint64_t address) {return false;}
+	bool isJump(uint64_t address) {return false;}
 
 private:
+	// http://llvm.org/docs/doxygen/html/MCObjectDisassembler_8cpp_source.html +197
+	void disassembleFunction(LLVMFunction* function);
+	void splitBlocks();
 	void disassemble();
 
 	void readSymbols();
 	void readSections();
 
-    log4cxx::LoggerPtr logger;
+	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::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::MCInstPrinter> IP;
-    std::unique_ptr<llvm::MCDisassembler> DisAsm;
-    std::unique_ptr<const llvm::MCObjectFileInfo> MOFI;
-    std::unique_ptr<llvm::MCContext> Ctx;
-    std::unique_ptr<const llvm::MCInstrAnalysis> MIA;
-    std::unique_ptr<const llvm::MCSubtargetInfo> STI;
-    std::unique_ptr<const llvm::MCInstrInfo> MII;
-	llvm::OwningPtr<llvm::MCRelocationInfo> RelInfo;
-	llvm::OwningPtr<llvm::MCSymbolizer> Symzer;
-
-    std::map<std::string, llvm::object::SectionRef> sections;
-    std::map<std::string, llvm::object::SymbolRef> symbols;
+	llvm::Triple triple;
+	std::shared_ptr<llvm::object::Binary> binary;
+
+	const llvm::Target * target;
+	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::MCInstPrinter> IP;
+	std::unique_ptr<llvm::MCDisassembler> DisAsm;
+	std::unique_ptr<const llvm::MCObjectFileInfo> MOFI;
+	std::unique_ptr<llvm::MCContext> Ctx;
+	std::unique_ptr<const llvm::MCInstrAnalysis> MIA;
+	std::unique_ptr<const llvm::MCSubtargetInfo> STI;
+	std::unique_ptr<const llvm::MCInstrInfo> MII;
+	std::unique_ptr<llvm::MCRelocationInfo> RelInfo;
+	std::unique_ptr<llvm::MCSymbolizer> Symzer;
+
+	std::map<std::string, llvm::object::SectionRef> sections;
+	std::map<std::string, llvm::object::SymbolRef> symbols;
+	InformationManager * manager;
 };
 
 #endif