X-Git-Url: https://git.siccegge.de//index.cgi?p=frida%2Ffrida.git;a=blobdiff_plain;f=src%2Fdisassembler%2Fllvm%2FLLVMDisassembler.cxx;h=b6f8dae75ae2d6cc33b2586bc2b45df68b899eec;hp=1d4f2dff725064ecb64dd6cfd7a8d6c0de68d766;hb=9fe5caf6408d1b7d5eb86dacdb211bd22335398a;hpb=d63f589a3fda3c6d69c730596be194c3485a5801

diff --git a/src/disassembler/llvm/LLVMDisassembler.cxx b/src/disassembler/llvm/LLVMDisassembler.cxx
index 1d4f2df..b6f8dae 100644
--- a/src/disassembler/llvm/LLVMDisassembler.cxx
+++ b/src/disassembler/llvm/LLVMDisassembler.cxx
@@ -192,9 +192,9 @@ Function* LLVMDisassembler<ELFT>::disassembleFunctionAt(uint64_t address, const
 	if (name == "") {
 		std::stringstream s;
 		s << "<Unnamed 0x" << std::hex << address << ">";
-		function = new Function(s.str(), address);
+		function = new Function(s.str(), address, manager);
 	} else {
-		function = new Function(name, address);
+		function = new Function(name, address, manager);
 	}
 	functions.insert(std::make_pair(address, function));
 
@@ -213,7 +213,7 @@ void LLVMDisassembler<ELFT>::disassembleFunction(Function* function) {
 
 	LOG4CXX_DEBUG(logger, "Handling function " << function->getName());
 
-	BasicBlock * block = new BasicBlock(function->getStartAddress(), this);
+	BasicBlock * block = new BasicBlock(function->getStartAddress(), this, manager);
 	remaining_blocks.push(block);
 	blocks.insert(std::make_pair(block->getStartAddress(), block));
 	function->addBasicBlock(block);
@@ -247,7 +247,7 @@ void LLVMDisassembler<ELFT>::disassembleFunction(Function* function) {
 						} else {
 							current_block->setNextBlock(0, jmptarget);
 							if (blocks.find(jmptarget) == blocks.end()) {
-								BasicBlock * block = new BasicBlock(jmptarget, this);
+								BasicBlock * block = new BasicBlock(jmptarget, this, manager);
 								blocks.insert(std::make_pair(block->getStartAddress(), block));
 								function->addBasicBlock(block);
 								remaining_blocks.push(block);
@@ -259,7 +259,7 @@ void LLVMDisassembler<ELFT>::disassembleFunction(Function* function) {
 								jmptarget = base_address + current_address + inst_size;
 								current_block->setNextBlock(1, jmptarget);
 								if (blocks.find(jmptarget) == blocks.end()) {
-									BasicBlock * block = new BasicBlock(jmptarget, this);
+									BasicBlock * block = new BasicBlock(jmptarget, this, manager);
 									blocks.insert(std::make_pair(block->getStartAddress(), block));
 									function->addBasicBlock(block);
 									remaining_blocks.push(block);
@@ -310,7 +310,7 @@ void LLVMDisassembler<ELFT>::disassemble() {
 			continue;
 
 		if (!x->second.getAddress(result)) {
-			Function * fun = new Function(x->first, result);
+			Function * fun = new Function(x->first, result, manager);
 			remaining_functions.push_back(fun);
 			functions.insert(std::make_pair(result, fun));
 			LOG4CXX_DEBUG(logger, "Disasembling " << x->first);