X-Git-Url: https://git.siccegge.de//index.cgi?p=frida%2Ffrida.git;a=blobdiff_plain;f=src%2Fdisassembler%2Fllvm%2FLLVMDisassembler.cxx;h=76b313de3bf996d0d355bc69e9b004c47d476efb;hp=e96f0baae1cc32c271b344cc822e53612d177dba;hb=9244195b13b1673757b4bc77d6306e7b2f21244a;hpb=771f6918224d136619d3c5d526e339f3f38bbbef

diff --git a/src/disassembler/llvm/LLVMDisassembler.cxx b/src/disassembler/llvm/LLVMDisassembler.cxx
index e96f0ba..76b313d 100644
--- a/src/disassembler/llvm/LLVMDisassembler.cxx
+++ b/src/disassembler/llvm/LLVMDisassembler.cxx
@@ -193,18 +193,18 @@ void LLVMDisassembler::disassemble() {
                                     remaining_functions.push(fun);
                                 }
                             } else {
+								current_block->setNextBlock(0, jmptarget);
                                 if (blocks.find(jmptarget) == blocks.end()) {
                                     LLVMBasicBlock * block = new LLVMBasicBlock(jmptarget, this);
                                     blocks.insert(std::make_pair(block->getStartAddress(), block));
-                                    current_block->setNextBlock(0, block->getStartAddress());
                                     remaining_blocks.push(block);
                                 }
                                 if (MIA->isConditionalBranch(inst)) {
                                     jmptarget = base_address + current_address + inst_size;
+									current_block->setNextBlock(1, jmptarget);
                                     if (blocks.find(jmptarget) == blocks.end()) {
                                         LLVMBasicBlock * block = new LLVMBasicBlock(jmptarget, this);
                                         blocks.insert(std::make_pair(block->getStartAddress(), block));
-                                        current_block->setNextBlock(1, block->getStartAddress());
                                         remaining_blocks.push(block);
                                     }
                                 }
@@ -235,7 +235,7 @@ void LLVMDisassembler::disassemble() {
 		uint64_t base_address;
 		text_section.getAddress(base_address);
 		uint64_t current_address = current_block->getStartAddress() - base_address;
-		while(current_block->getEndAddress() - base_address != current_address) {
+		while(current_block->getEndAddress() - base_address > current_address) {
 			MCInst inst;
 			std::string buf;
 			llvm::raw_string_ostream s(buf);
@@ -245,14 +245,17 @@ void LLVMDisassembler::disassemble() {
 				auto other = blocks.find(current_address + inst_size + base_address);
 
 				if (other != blocks.end()) {
-					LOG4CXX_DEBUG(logger, "Shortening block starting at "
-								  << std::hex
-								  << current_block->getStartAddress()
-								  << " now ending at "
-								  << other->first);
-					current_block->setEndAddress(current_address + inst_size + base_address);
-					current_block->setNextBlock(0, other->first);
-					current_block->setNextBlock(1, 0);
+					uint64_t endaddress = current_address + inst_size + base_address;
+					if (endaddress != current_block->getEndAddress()) {
+						LOG4CXX_DEBUG(logger, "Shortening block starting at "
+									  << std::hex
+									  << current_block->getStartAddress()
+									  << " now ending at "
+									  << other->first);
+						current_block->setEndAddress(endaddress);
+						current_block->setNextBlock(0, other->first);
+						current_block->setNextBlock(1, 0);
+					}
 				}
 			} else {
 				inst_size = 1;
@@ -321,7 +324,14 @@ void LLVMDisassembler::printEachInstruction(uint64_t start, uint64_t end,
             uint8_t bytes[inst_size+2];
             ref.readBytes(current_address, inst_size, bytes);
 
-            IP->printInst(&inst, s, "");
+			uint64_t jmptarget;
+			if (MIA->evaluateBranch(inst, current_address, inst_size, jmptarget)) {
+				std::stringstream stream;
+				stream << std::hex << (base_address + jmptarget);
+				IP->printInst(&inst, s, stream.str());
+			} else
+				IP->printInst(&inst, s, "");
+
 			fun(bytes, inst_size, s.str());
         } else {
 			LOG4CXX_WARN(logger, "Invalid byte at" << std::hex << current_address + base_address);