using namespace llvm;
using namespace llvm::object;
+using std::error_code;
/*
* TODO: fallback code falls die Datei kein ELF/PE/COFF/MacO/.. binary
return;
}
- DisAsm.reset(target->createMCDisassembler(*STI));
+ MOFI.reset(new MCObjectFileInfo);
+ MCContext Ctx(AsmInfo.get(), MRI.get(), MOFI.get());
+
+ DisAsm.reset(target->createMCDisassembler(*STI, Ctx));
if (!DisAsm) {
LOG4CXX_ERROR(logger, "no disassembler for target " << tripleName);
return;
}
-
- MOFI.reset(new MCObjectFileInfo);
- Ctx.reset(new MCContext(AsmInfo.get(), MRI.get(), MOFI.get()));
RelInfo.reset(
- target->createMCRelocationInfo(tripleName, *Ctx.get()));
+ target->createMCRelocationInfo(tripleName, Ctx));
if (RelInfo) {
Symzer.reset(
- MCObjectSymbolizer::createObjectSymbolizer(*Ctx.get(), RelInfo, o));
+ MCObjectSymbolizer::createObjectSymbolizer(Ctx, std::move(RelInfo), o));
if (Symzer)
- DisAsm->setSymbolizer(Symzer);
+ DisAsm->setSymbolizer(std::move(Symzer));
}
+ RelInfo.release();
+ Symzer.release();
+
MIA.reset(target->createMCInstrAnalysis(MII.get()));
IP->setPrintImmHex(llvm::HexStyle::C);
IP->setPrintImmHex(true);
- OwningPtr<MCObjectDisassembler> OD(
+ std::unique_ptr<MCObjectDisassembler> OD(
new MCObjectDisassembler(*o, *DisAsm, *MIA));
Mod.reset(OD->buildModule(false));
});
}
-/*
- * 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;
SectionRef text_section = sections[".text"];
+ // Assume all function symbols actually start a real function
for (auto x = symbols.begin(); x != symbols.end(); ++x) {
uint64_t result;
bool contains;
LOG4CXX_DEBUG(logger, "Handling function " << current_function->getName());
- // if ("_start" != current_function->getName())
- // continue;
-
LLVMBasicBlock * block = new LLVMBasicBlock(current_function->getStartAddress(), this);
remaining_blocks.push(block);
blocks.insert(std::make_pair(block->getStartAddress(), block));
if(llvm::MCDisassembler::Success ==
DisAsm->getInstruction(inst, inst_size, ref, current_address, nulls(), nulls())) {
- uint8_t bytes[inst_size+2];
- ref.readBytes(current_address, inst_size, bytes);
- s << '\t';
- for(uint8_t* cur = bytes; cur < bytes + inst_size; ++cur) {
- s.write_hex(*cur);
- s << ' ';
- }
- s << '\t';
-
- IP->printInst(&inst, s, "");
-
- LOG4CXX_DEBUG(logger, std::hex << current_address + base_address << s.str());
-
uint64_t jmptarget;
if (MIA->evaluateBranch(inst, current_address, inst_size, jmptarget)) {
jmptarget += base_address;
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);
}
}
}
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()) {
+ 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;
+ }
+ current_address += inst_size;
+ }
+ }
}
void LLVMDisassembler::readSymbols() {
uint8_t bytes[inst_size+2];
ref.readBytes(current_address, inst_size, bytes);
- IP->printInst(&inst, s, "");
+ uint64_t jmptarget;
+ if (MIA->evaluateBranch(inst, current_address, inst_size, jmptarget)) {
+ std::stringstream stream;
+ stream << std::hex << (base_address + jmptarget);
+ IP->printInst(&inst, s, stream.str());
+ } else
+ 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;
}