X-Git-Url: https://git.siccegge.de//index.cgi?p=frida%2Ffrida.git;a=blobdiff_plain;f=src%2Fdisassembler%2Fllvm%2FLLVMDisassembler.hxx;h=42024ee7c4998839f796c7d55ea43ea45ccd8a2b;hp=ff81be55385890a7ca642d9fa7d50a469ea001ac;hb=f5b948bf38d8757f4e9a0d7af4edaa4a6fffec27;hpb=0f91922e40640e00f1208aee5d8c968a698c5d31

diff --git a/src/disassembler/llvm/LLVMDisassembler.hxx b/src/disassembler/llvm/LLVMDisassembler.hxx
index ff81be5..42024ee 100644
--- a/src/disassembler/llvm/LLVMDisassembler.hxx
+++ b/src/disassembler/llvm/LLVMDisassembler.hxx
@@ -2,23 +2,28 @@
 #define INCLUDE__LLVMDisassembler_hxx
 
 #include <memory>
+#include <map>
 #include <log4cxx/logger.h>
 
 #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);
 
 	BasicBlock * generateControlFlowGraph(const std::string& name);
 	BasicBlock * generateControlFlowGraph(uint64_t address);
@@ -28,7 +33,14 @@ protected:
     bool isJump(uint64_t address) {return false;}
 
 private:
+	void disassemble();
+
+	void readSymbols();
+	void readSections();
+
     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;