- while (remaining_functions.size()) {
- LLVMFunction * current_function = remaining_functions.top();
- remaining_functions.pop();
-
- LOG4CXX_DEBUG(logger, "Handling function " << current_function->getName());
-
- LLVMBasicBlock * block = new LLVMBasicBlock(current_function->getStartAddress(), this);
- remaining_blocks.push(block);
- blocks.insert(std::make_pair(block->getStartAddress(), block));
-
- while (remaining_blocks.size()) {
- LLVMBasicBlock * current_block = remaining_blocks.top();
- remaining_blocks.pop();
-
- LOG4CXX_DEBUG(logger, "Handling Block starting at " << std::hex << 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;
- std::string buf;
- llvm::raw_string_ostream s(buf);
-
- if(llvm::MCDisassembler::Success ==
- DisAsm->getInstruction(inst, inst_size, ref, current_address, nulls(), nulls())) {
-
- uint64_t jmptarget;
- if (MIA->evaluateBranch(inst, current_address, inst_size, jmptarget)) {
- jmptarget += base_address;
- if (!MIA->isIndirectBranch(inst)) {
- if (MIA->isCall(inst)) {
- if (functions.find(jmptarget) == functions.end()) {
- std::stringstream s;
- s << "<Unnamed 0x" << std::hex << jmptarget << ">";
- LLVMFunction * fun = new LLVMFunction(s.str(), jmptarget);
- functions.insert(std::make_pair(jmptarget, fun));
- 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));
- 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));
- remaining_blocks.push(block);
- }
- }
- }
- }
+ // 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()) {
+ 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);