From: Christoph Egger <siccegge@cs.fau.de>
Date: Tue, 27 May 2014 12:36:24 +0000 (+0200)
Subject: Fixup magit madness
X-Git-Tag: v0.1~198
X-Git-Url: https://git.siccegge.de//index.cgi?a=commitdiff_plain;h=08210442ccd43d49a5799cada9997e04a352f38b;p=frida%2Ffrida.git

Fixup magit madness
---

diff --git a/src/disassembler/llvm/LLVMDisassembler.cxx b/src/disassembler/llvm/LLVMDisassembler.cxx
index 7bce1cf..287d6a0 100644
--- a/src/disassembler/llvm/LLVMDisassembler.cxx
+++ b/src/disassembler/llvm/LLVMDisassembler.cxx
@@ -121,6 +121,9 @@ 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;
@@ -131,9 +134,6 @@ void LLVMDisassembler::disassemble() {
 		bool contains;
 		SymbolRef::Type symbol_type;
 
-/*
- * TODO: If we jump into some Basic Block we need to split it there into two
- */
 
 		if (text_section.containsSymbol(x->second, contains) || !contains)
 			continue;
@@ -222,6 +222,7 @@ void LLVMDisassembler::disassemble() {
 										LLVMBasicBlock * block = new LLVMBasicBlock(jmptarget);
 										blocks.insert(std::make_pair(block->getStartAddress(), block));
 										remaining_blocks.push(new LLVMBasicBlock(jmptarget));
+									}
                                 }
                             }
                         }
@@ -235,7 +236,6 @@ void LLVMDisassembler::disassemble() {
                     current_block->setEndAddress(current_address + base_address);
                     LOG4CXX_DEBUG(logger, "Finished Block at " << std::hex << 
 								  current_block->getEndAddress());
-									}
                     break;
                 }
                 current_address += inst_size;