X-Git-Url: https://git.siccegge.de//index.cgi?p=frida%2Ffrida.git;a=blobdiff_plain;f=src%2Fdisassembler%2Fllvm%2FLLVMDisassembler.cxx;h=049f1fc90477b82d1a30427bbd7352a9d7a98cf3;hp=e673c371650027021455b63f64b94e422dcc7a5d;hb=5d65588185f3d19fc6fa311f642cc5fd78966087;hpb=1a19eafdb36507230a6f421defbc49162d5246e6 diff --git a/src/disassembler/llvm/LLVMDisassembler.cxx b/src/disassembler/llvm/LLVMDisassembler.cxx index e673c37..049f1fc 100644 --- a/src/disassembler/llvm/LLVMDisassembler.cxx +++ b/src/disassembler/llvm/LLVMDisassembler.cxx @@ -3,6 +3,7 @@ #include "core/InformationManager.hxx" #include "core/Function.hxx" #include "core/BasicBlock.hxx" +#include "core/Exception.hxx" #include #include @@ -47,26 +48,29 @@ Disassembler * createLLVMDisassembler(const std::string& filename, InformationMa foo.second.release(); #endif - // ELFType - if (ELF32LEObjectFile * object = dyn_cast(op)) { - return new LLVMDisassembler>(filename, manager, object); - } - if (ELF64LEObjectFile * object = dyn_cast(op)) { - return new LLVMDisassembler>(filename, manager, object); - } - if (ELF32BEObjectFile * object = dyn_cast(op)) { - return new LLVMDisassembler>(filename, manager, object); - } - if (ELF64BEObjectFile * object = dyn_cast(op)) { - return new LLVMDisassembler>(filename, manager, object); - } - if (COFFObjectFile * object = dyn_cast(op)) { - return new LLVMDisassembler(filename, manager, object); - } - if (MachOObjectFile * object = dyn_cast(op)) { - return new LLVMDisassembler(filename, manager, object); + try { + // ELFType + if (ELF32LEObjectFile * object = dyn_cast(op)) { + return new LLVMDisassembler>(filename, manager, object); + } + if (ELF64LEObjectFile * object = dyn_cast(op)) { + return new LLVMDisassembler>(filename, manager, object); + } + if (ELF32BEObjectFile * object = dyn_cast(op)) { + return new LLVMDisassembler>(filename, manager, object); + } + if (ELF64BEObjectFile * object = dyn_cast(op)) { + return new LLVMDisassembler>(filename, manager, object); + } + if (COFFObjectFile * object = dyn_cast(op)) { + return new LLVMDisassembler(filename, manager, object); + } + if (MachOObjectFile * object = dyn_cast(op)) { + return new LLVMDisassembler(filename, manager, object); + } + } catch (BinaryNotSupported& e) { + return NULL; } - return NULL; } @@ -122,7 +126,8 @@ LLVMDisassembler::LLVMDisassembler(const std::string& filename, target = TargetRegistry::lookupTarget("", triple, es); if (!target) { LOG4CXX_ERROR(logger, es); - return; + BinaryNotSupported e; + throw e; } LOG4CXX_INFO(logger, "Target " << target->getName()); @@ -130,26 +135,30 @@ LLVMDisassembler::LLVMDisassembler(const std::string& filename, MRI.reset(target->createMCRegInfo(tripleName)); if (!MRI) { LOG4CXX_ERROR(logger, "no register info for target " << tripleName); - return; + BinaryNotSupported e; + throw e; } // Set up disassembler. AsmInfo.reset(target->createMCAsmInfo(*MRI, tripleName)); if (!AsmInfo) { LOG4CXX_ERROR(logger, "no assembly info for target " << tripleName); - return; + BinaryNotSupported e; + throw e; } STI.reset(target->createMCSubtargetInfo(tripleName, "", "")); if (!STI) { LOG4CXX_ERROR(logger, "no subtarget info for target " << tripleName); - return; + BinaryNotSupported e; + throw e; } MII.reset(target->createMCInstrInfo()); if (!MII) { LOG4CXX_ERROR(logger, "no instruction info for target " << tripleName); - return; + BinaryNotSupported e; + throw e; } MOFI.reset(new MCObjectFileInfo); @@ -158,7 +167,8 @@ LLVMDisassembler::LLVMDisassembler(const std::string& filename, DisAsm.reset(target->createMCDisassembler(*STI, Ctx)); if (!DisAsm) { LOG4CXX_ERROR(logger, "no disassembler for target " << tripleName); - return; + BinaryNotSupported e; + throw e; } RelInfo.reset( target->createMCRelocationInfo(tripleName, Ctx)); @@ -174,14 +184,16 @@ LLVMDisassembler::LLVMDisassembler(const std::string& filename, MIA.reset(target->createMCInstrAnalysis(MII.get())); if (!MIA) { LOG4CXX_ERROR(logger, "no instruction analysis for target " << tripleName); - return; + BinaryNotSupported e; + throw e; } int AsmPrinterVariant = AsmInfo->getAssemblerDialect(); IP.reset(target->createMCInstPrinter(AsmPrinterVariant, *AsmInfo, *MII, *MRI, *STI)); if (!IP) { LOG4CXX_ERROR(logger, "no instruction printer for target " << tripleName); - return; + BinaryNotSupported e; + throw e; } IP->setPrintImmHex(llvm::HexStyle::C); @@ -249,31 +261,33 @@ void LLVMDisassembler::disassembleFunction(Function* function) { std::map 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 bytearray(reinterpret_cast(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()) { @@ -373,7 +387,7 @@ void LLVMDisassembler::disassemble() { #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; @@ -562,11 +576,13 @@ void LLVMDisassembler::readSymbols() { 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)); } } @@ -678,83 +694,6 @@ std::vector LLVMDisassembler::getInstructions(const BasicBloc return result; } -template -void LLVMDisassembler::printEachInstruction(uint64_t start, uint64_t end, - std::function 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 bytearray(reinterpret_cast(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 SectionRef LLVMDisassembler::getTextSection() { return sections[".text"];