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

diff --git a/src/disassembler/llvm/LLVMDisassembler.hxx b/src/disassembler/llvm/LLVMDisassembler.hxx
index 4f58a0e..848b20e 100644
--- a/src/disassembler/llvm/LLVMDisassembler.hxx
+++ b/src/disassembler/llvm/LLVMDisassembler.hxx
@@ -8,37 +8,40 @@
 #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)
-		{}
-
-	BasicBlock * generateControlFlowGraph(const std::string& name);
-	BasicBlock * generateControlFlowGraph(uint64_t address);
+	void forEachFunction(std::function<void (uint64_t, Function*)> callback);
+	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;