]> git.siccegge.de Git - frida/frida.git/commitdiff
Fixup magit madness
authorChristoph Egger <siccegge@cs.fau.de>
Tue, 27 May 2014 12:36:24 +0000 (14:36 +0200)
committerChristoph Egger <siccegge@cs.fau.de>
Tue, 27 May 2014 12:36:24 +0000 (14:36 +0200)
src/disassembler/llvm/LLVMDisassembler.cxx

index 7bce1cf6ab2107d4ff9d237149919769b8431a0f..287d6a06d05e3049d9ea3211ddf21b55e0457ae9 100644 (file)
@@ -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;
 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;
 
                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;
 
                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));
                                                                                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());
                     current_block->setEndAddress(current_address + base_address);
                     LOG4CXX_DEBUG(logger, "Finished Block at " << std::hex << 
                                                                  current_block->getEndAddress());
-                                                                       }
                     break;
                 }
                 current_address += inst_size;
                     break;
                 }
                 current_address += inst_size;