std::map<uint64_t, BasicBlock*> new_blocks;
SectionRef text_section = getTextSection();
StringRef bytes;
+ uint64_t base_address, size;
text_section.getContents(bytes);
#if defined(LLVM_35)
StringRefMemoryObject ref(bytes);
+ text_section.getAddress(base_address);
+ text_section.getSize(size);
#elif defined(LLVM_36)
ArrayRef<uint8_t> bytearray(reinterpret_cast<const uint8_t *>(bytes.data()),
bytes.size());
+ base_address = text_section.getAddress();
+ size = text_section.getSize();
#else
#error LLVM != 3.5 | 3.6 not supported
#endif
LOG4CXX_DEBUG(logger, "Handling function " << function->getName());
+ if(function->getStartAddress() < base_address || function->getStartAddress() > base_address + size) {
+ LOG4CXX_INFO(logger, "Trying to disassemble function " << function->getName() << " but start address " << std::hex << function->getStartAddress() << " is located outside the text segment");
+ return;
+ }
+
BasicBlock * block = manager->newBasicBlock(function->getStartAddress());
remaining_blocks.push(block);
new_blocks.insert(std::make_pair(block->getStartAddress(), block));
function->addBasicBlock(block);
- uint64_t base_address, size;
-#if defined(LLVM_35)
- text_section.getAddress(base_address);
- text_section.getSize(size);
-#elif defined(LLVM_36)
- base_address = text_section.getAddress();
- size = text_section.getSize();
-#endif
LOG4CXX_DEBUG(logger, "Text section at " << std::hex << base_address << " with size " << size);
while (remaining_blocks.size()) {
#if defined(LLVM_35)
if (text_section.containsSymbol(x->second, contains) || !contains)
#elif defined(LLVM_36)
- if (text_section.containsSymbol(x->second))
+ if (!text_section.containsSymbol(x->second))
#endif
continue;
symbol_iterator si(o->symbol_begin()), se(o->symbol_end());
for (; si != se; ++si) {
StringRef name;
+ uint64_t address;
+ si->getAddress(address);
if ((ec = si->getName(name))) {
LOG4CXX_ERROR(logger, ec.message());
break;
}
- LOG4CXX_DEBUG(logger, "Added symbol " << name.str());
+ LOG4CXX_DEBUG(logger, "Added symbol " << name.str() << " at address " << std::hex << address);
symbols.insert(make_pair(name.str(), *si));
}
}
return result;
}
-template <typename ELFT>
-void LLVMDisassembler<ELFT>::printEachInstruction(uint64_t start, uint64_t end,
- std::function<void (uint8_t*, size_t,
- const std::string&,
- const std::string&)> fun) {
- SectionRef text_section = getTextSection();
- uint64_t base_address;
-#if defined(LLVM_35)
- text_section.getAddress(base_address);
-#elif defined(LLVM_36)
- base_address = text_section.getAddress();
-#endif
-
- uint64_t current_address = start - base_address;
-
- StringRef bytes;
- text_section.getContents(bytes);
-#if defined(LLVM_35)
- StringRefMemoryObject ref(bytes);
-#elif defined(LLVM_36)
- ArrayRef<uint8_t> bytearray(reinterpret_cast<const uint8_t *>(bytes.data()),
- bytes.size());
-#endif
-
-
- while (current_address < end - base_address) {
- uint64_t inst_size;
- MCInst inst;
- std::string buf;
- llvm::raw_string_ostream s(buf);
-
- if(llvm::MCDisassembler::Success ==
-#if defined(LLVM_35)
- DisAsm->getInstruction(inst, inst_size, ref, current_address, nulls(), nulls())) {
-#elif defined(LLVM_36)
- DisAsm->getInstruction(inst, inst_size,
- bytearray.slice(current_address),
- base_address + current_address,
- nulls(), nulls())) {
-#endif
-
- uint8_t bytes[inst_size+2];
-#if defined(LLVM_35)
- ref.readBytes(current_address, inst_size, bytes);
-#elif defined(LLVM_36)
- size_t bytesindex(0);
- for (uint8_t byte : bytearray.slice(current_address, inst_size)) {
- bytes[bytesindex++] = byte;
- }
-#endif
-
- uint64_t jmptarget;
- std::string ref("");
- IP->printInst(&inst, s, "");
- if (MIA->evaluateBranch(inst, current_address, inst_size, jmptarget)) {
- std::stringstream stream;
- if (MIA->isCall(inst))
- stream << "function:";
- else
- stream << "block:";
-
- stream << std::hex << (base_address + jmptarget);
- ref = stream.str();
- }
-
-
- fun(bytes, inst_size, s.str(), ref);
- } else {
- LOG4CXX_WARN(logger, "Invalid byte at" << std::hex << current_address + base_address);
- fun(NULL, 0, "Invalid Byte", "");
- inst_size = 1;
- }
-
- current_address += inst_size;
- }
-}
-
template <typename ELFT>
SectionRef LLVMDisassembler<ELFT>::getTextSection() {
return sections[".text"];