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);
}
}
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);
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;
IP->printInst(&inst, s, "");
fun(bytes, inst_size, s.str());
} else {
+ LOG4CXX_WARN(logger, "Invalid byte at" << std::hex << current_address + base_address);
fun(NULL, 0, "Invalid Byte");
inst_size = 1;
}