X-Git-Url: https://git.siccegge.de//index.cgi?p=frida%2Ffrida.git;a=blobdiff_plain;f=src%2Fdisassembler%2Fllvm%2FLLVMDisassembler.hxx;h=6ed3c8c86936b75c383097e3ff841fd0db8ad027;hp=4f58a0eb8450078758d5dd6486138cc8d500afda;hb=181d12ec9311d9bb216f18b7774ed1d621fdc4ed;hpb=d84d4109b1f5bd5f87732b7e49860639d963a553

diff --git a/src/disassembler/llvm/LLVMDisassembler.hxx b/src/disassembler/llvm/LLVMDisassembler.hxx
index 4f58a0e..6ed3c8c 100644
--- a/src/disassembler/llvm/LLVMDisassembler.hxx
+++ b/src/disassembler/llvm/LLVMDisassembler.hxx
@@ -8,37 +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 LLVMDisassembler
     : public Disassembler {
 public:
     LLVMDisassembler(const std::string& filename);
-    virtual ~LLVMDisassembler() {};
+    virtual ~LLVMDisassembler();
 
 	void getSymbols();
 	uint64_t entryAddress();
 
-    void forEachInstruction(const std::string& name,
-							std::function<void (long, std::string, std::string)> callback)
-		{}
+	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];
+	}
 
 protected:
     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 disassemble();
 
 	void readSymbols();
 	void readSections();
 
     log4cxx::LoggerPtr logger;
-	std::map<uint8_t, LLVMBasicBlock*> blocks;
+	std::map<uint64_t, LLVMBasicBlock*> blocks;
+	std::map<uint64_t, LLVMFunction*> functions;
 
     llvm::Triple triple;
     std::shared_ptr<llvm::object::Binary> binary;
@@ -57,8 +63,8 @@ private:
     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::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;