X-Git-Url: https://git.siccegge.de//index.cgi?p=frida%2Ffrida.git;a=blobdiff_plain;f=src%2Fdisassembler%2Fllvm%2FLLVMDisassembler.cxx;h=96418d86bbdded11fd4c530aef48f571c4300cd6;hp=1f1cdff1d17670d6b87b900523ef33b7f85bbc6a;hb=3e7900dab2b4618d0c4fbe48d312cb74666af842;hpb=f9ae4391568cfcbf4e6de0475bddcdd68e9b31d2

diff --git a/src/disassembler/llvm/LLVMDisassembler.cxx b/src/disassembler/llvm/LLVMDisassembler.cxx
index 1f1cdff..96418d8 100644
--- a/src/disassembler/llvm/LLVMDisassembler.cxx
+++ b/src/disassembler/llvm/LLVMDisassembler.cxx
@@ -58,7 +58,7 @@ LLVMDisassembler<ELFT>::LLVMDisassembler(const std::string& filename,
                                          InformationManager* manager,
                                          ObjectFile* file)
 	: Disassembler()
-	, logger(log4cxx::Logger::getLogger("LLVMDisassembler"))
+	, logger(log4cxx::Logger::getLogger("disassembler.LLVMDisassembler"))
 	, triple("unknown-unknown-unknown")
 	, manager(manager)
 {
@@ -225,6 +225,11 @@ void LLVMDisassembler<ELFT>::disassembleFunction(Function* function) {
 	new_blocks.insert(std::make_pair(block->getStartAddress(), block));
 	function->addBasicBlock(block);
 
+	uint64_t base_address, size;
+	text_section.getAddress(base_address);
+	text_section.getSize(size);
+	LOG4CXX_DEBUG(logger, "Text section at " << std::hex << base_address << " with size " << size);
+
 	while (remaining_blocks.size()) {
 		BasicBlock * current_block = remaining_blocks.top();
 		remaining_blocks.pop();
@@ -233,8 +238,6 @@ void LLVMDisassembler<ELFT>::disassembleFunction(Function* function) {
 		              << current_block->getStartAddress());
 
 		uint64_t inst_size;
-		uint64_t base_address;
-		text_section.getAddress(base_address);
 		uint64_t current_address = current_block->getStartAddress() - base_address;
 		while(true) {
 			MCInst inst;
@@ -383,11 +386,16 @@ void LLVMDisassembler<ELFT>::splitBlocks(Function* function) {
 	text_section.getContents(bytes);
 	StringRefMemoryObject ref(bytes);
 
+	LOG4CXX_DEBUG(logger, "Splitting Blocks in Function " << function->getName());
 	// Split blocks where jumps are going inside the block
 	for (auto it = function->blocks().begin();
 	     it != function->blocks().end();
 	     ++it) {
 		BasicBlock * current_block = it->second;
+		if (current_block->getEndAddress() == 0) {
+			LOG4CXX_ERROR(logger, "UNFINISHED BLOCK " << std::hex << current_block->getStartAddress());
+			break;
+		}
 		uint64_t inst_size;
 		uint64_t base_address;
 		text_section.getAddress(base_address);