X-Git-Url: https://git.siccegge.de//index.cgi?p=frida%2Ffrida.git;a=blobdiff_plain;f=src%2Fdisassembler%2Fllvm%2FLLVMDisassembler.cxx;h=25a4ecc25303087bee7c3b3e5265c5aa3bc91257;hp=6e76c91bc27c8121f7088460401ae3c20d4faf47;hb=370dc79ad6da88b8548d9ebd52601271bf279213;hpb=f66c54319d23de4c4905ad11a8f552917d2dfba9

diff --git a/src/disassembler/llvm/LLVMDisassembler.cxx b/src/disassembler/llvm/LLVMDisassembler.cxx
index 6e76c91..25a4ecc 100644
--- a/src/disassembler/llvm/LLVMDisassembler.cxx
+++ b/src/disassembler/llvm/LLVMDisassembler.cxx
@@ -121,9 +121,6 @@ LLVMDisassembler::~LLVMDisassembler() {
                   });
 }
 
-/*
- * TODO: If we jump into some Basic Block we need to split it there into two
- */
 void LLVMDisassembler::disassemble() {
     std::stack<LLVMFunction*> remaining_functions;
     std::stack<LLVMBasicBlock*> remaining_blocks;
@@ -245,6 +242,39 @@ void LLVMDisassembler::disassemble() {
         }
         LOG4CXX_DEBUG(logger, "Finished function " << current_function->getName());
     }
+
+	// Split blocks where jumps are going inside the block
+	for (auto it = blocks.begin(); it != blocks.end(); ++it) {
+		LLVMBasicBlock * current_block = it->second;
+		uint64_t inst_size;
+		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) {
+			MCInst inst;
+			std::string buf;
+			llvm::raw_string_ostream s(buf);
+
+			if(llvm::MCDisassembler::Success ==
+			   DisAsm->getInstruction(inst, inst_size, ref, current_address, nulls(), nulls())) {
+				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);
+				}
+			} else {
+				inst_size = 1;
+			}
+			current_address += inst_size;
+		}
+	}
 }
 
 void LLVMDisassembler::readSymbols() {
@@ -283,7 +313,8 @@ void LLVMDisassembler::forEachFunction(std::function<void (uint64_t, Function*)>
                   });
 }
 
-void LLVMDisassembler::printEachInstruction(uint64_t start, uint64_t end, std::function<void (const std::string&)> fun) {
+void LLVMDisassembler::printEachInstruction(uint64_t start, uint64_t end,
+											std::function<void (uint8_t*, size_t, const std::string&)> fun) {
     SectionRef text_section = sections[".text"];
     uint64_t base_address;
     text_section.getAddress(base_address);
@@ -304,16 +335,11 @@ void LLVMDisassembler::printEachInstruction(uint64_t start, uint64_t end, std::f
 
             uint8_t bytes[inst_size+2];
             ref.readBytes(current_address, inst_size, bytes);
-            for(uint8_t* cur = bytes; cur < bytes + inst_size; ++cur) {
-                s.write_hex(*cur);
-                s << ' ';
-            }
-            s << '\t';
 
             IP->printInst(&inst, s, "");
-			fun(s.str());
+			fun(bytes, inst_size, s.str());
         } else {
-			fun("Invalid Byte");
+			fun(NULL, 0, "Invalid Byte");
 			inst_size = 1;
 		}