diff options
Diffstat (limited to 'contrib/llvm/lib/Object/COFFObjectFile.cpp')
| -rw-r--r-- | contrib/llvm/lib/Object/COFFObjectFile.cpp | 1039 |
1 files changed, 612 insertions, 427 deletions
diff --git a/contrib/llvm/lib/Object/COFFObjectFile.cpp b/contrib/llvm/lib/Object/COFFObjectFile.cpp index 42066c3..46ef87d 100644 --- a/contrib/llvm/lib/Object/COFFObjectFile.cpp +++ b/contrib/llvm/lib/Object/COFFObjectFile.cpp @@ -16,25 +16,25 @@ #include "llvm/ADT/SmallString.h" #include "llvm/ADT/StringSwitch.h" #include "llvm/ADT/Triple.h" +#include "llvm/Support/COFF.h" #include "llvm/Support/Debug.h" #include "llvm/Support/raw_ostream.h" #include <cctype> +#include <limits> using namespace llvm; using namespace object; -namespace { using support::ulittle8_t; using support::ulittle16_t; using support::ulittle32_t; using support::little16_t; -} -namespace { // Returns false if size is greater than the buffer size. And sets ec. -bool checkSize(const MemoryBuffer *m, error_code &ec, uint64_t size) { - if (m->getBufferSize() < size) { - ec = object_error::unexpected_eof; +static bool checkSize(const MemoryBuffer &M, std::error_code &EC, + uint64_t Size) { + if (M.getBufferSize() < Size) { + EC = object_error::unexpected_eof; return false; } return true; @@ -42,332 +42,364 @@ bool checkSize(const MemoryBuffer *m, error_code &ec, uint64_t size) { // Sets Obj unless any bytes in [addr, addr + size) fall outsize of m. // Returns unexpected_eof if error. -template<typename T> -error_code getObject(const T *&Obj, const MemoryBuffer *M, const uint8_t *Ptr, - const size_t Size = sizeof(T)) { +template <typename T> +static std::error_code getObject(const T *&Obj, const MemoryBuffer &M, + const uint8_t *Ptr, + const size_t Size = sizeof(T)) { uintptr_t Addr = uintptr_t(Ptr); - if (Addr + Size < Addr || - Addr + Size < Size || - Addr + Size > uintptr_t(M->getBufferEnd())) { + if (Addr + Size < Addr || Addr + Size < Size || + Addr + Size > uintptr_t(M.getBufferEnd())) { return object_error::unexpected_eof; } Obj = reinterpret_cast<const T *>(Addr); return object_error::success; } + +// Decode a string table entry in base 64 (//AAAAAA). Expects \arg Str without +// prefixed slashes. +static bool decodeBase64StringEntry(StringRef Str, uint32_t &Result) { + assert(Str.size() <= 6 && "String too long, possible overflow."); + if (Str.size() > 6) + return true; + + uint64_t Value = 0; + while (!Str.empty()) { + unsigned CharVal; + if (Str[0] >= 'A' && Str[0] <= 'Z') // 0..25 + CharVal = Str[0] - 'A'; + else if (Str[0] >= 'a' && Str[0] <= 'z') // 26..51 + CharVal = Str[0] - 'a' + 26; + else if (Str[0] >= '0' && Str[0] <= '9') // 52..61 + CharVal = Str[0] - '0' + 52; + else if (Str[0] == '+') // 62 + CharVal = 62; + else if (Str[0] == '/') // 63 + CharVal = 63; + else + return true; + + Value = (Value * 64) + CharVal; + Str = Str.substr(1); + } + + if (Value > std::numeric_limits<uint32_t>::max()) + return true; + + Result = static_cast<uint32_t>(Value); + return false; } -const coff_symbol *COFFObjectFile::toSymb(DataRefImpl Symb) const { - const coff_symbol *addr = reinterpret_cast<const coff_symbol*>(Symb.p); +const coff_symbol *COFFObjectFile::toSymb(DataRefImpl Ref) const { + const coff_symbol *Addr = reinterpret_cast<const coff_symbol*>(Ref.p); # ifndef NDEBUG // Verify that the symbol points to a valid entry in the symbol table. - uintptr_t offset = uintptr_t(addr) - uintptr_t(base()); - if (offset < COFFHeader->PointerToSymbolTable - || offset >= COFFHeader->PointerToSymbolTable + uintptr_t Offset = uintptr_t(Addr) - uintptr_t(base()); + if (Offset < COFFHeader->PointerToSymbolTable + || Offset >= COFFHeader->PointerToSymbolTable + (COFFHeader->NumberOfSymbols * sizeof(coff_symbol))) report_fatal_error("Symbol was outside of symbol table."); - assert((offset - COFFHeader->PointerToSymbolTable) % sizeof(coff_symbol) + assert((Offset - COFFHeader->PointerToSymbolTable) % sizeof(coff_symbol) == 0 && "Symbol did not point to the beginning of a symbol"); # endif - return addr; + return Addr; } -const coff_section *COFFObjectFile::toSec(DataRefImpl Sec) const { - const coff_section *addr = reinterpret_cast<const coff_section*>(Sec.p); +const coff_section *COFFObjectFile::toSec(DataRefImpl Ref) const { + const coff_section *Addr = reinterpret_cast<const coff_section*>(Ref.p); # ifndef NDEBUG // Verify that the section points to a valid entry in the section table. - if (addr < SectionTable - || addr >= (SectionTable + COFFHeader->NumberOfSections)) + if (Addr < SectionTable + || Addr >= (SectionTable + COFFHeader->NumberOfSections)) report_fatal_error("Section was outside of section table."); - uintptr_t offset = uintptr_t(addr) - uintptr_t(SectionTable); - assert(offset % sizeof(coff_section) == 0 && + uintptr_t Offset = uintptr_t(Addr) - uintptr_t(SectionTable); + assert(Offset % sizeof(coff_section) == 0 && "Section did not point to the beginning of a section"); # endif - return addr; + return Addr; } -error_code COFFObjectFile::getSymbolNext(DataRefImpl Symb, - SymbolRef &Result) const { - const coff_symbol *symb = toSymb(Symb); - symb += 1 + symb->NumberOfAuxSymbols; - Symb.p = reinterpret_cast<uintptr_t>(symb); - Result = SymbolRef(Symb, this); - return object_error::success; +void COFFObjectFile::moveSymbolNext(DataRefImpl &Ref) const { + const coff_symbol *Symb = toSymb(Ref); + Symb += 1 + Symb->NumberOfAuxSymbols; + Ref.p = reinterpret_cast<uintptr_t>(Symb); } - error_code COFFObjectFile::getSymbolName(DataRefImpl Symb, - StringRef &Result) const { - const coff_symbol *symb = toSymb(Symb); - return getSymbolName(symb, Result); -} - -error_code COFFObjectFile::getSymbolFileOffset(DataRefImpl Symb, - uint64_t &Result) const { - const coff_symbol *symb = toSymb(Symb); - const coff_section *Section = NULL; - if (error_code ec = getSection(symb->SectionNumber, Section)) - return ec; - - if (symb->SectionNumber == COFF::IMAGE_SYM_UNDEFINED) - Result = UnknownAddressOrSize; - else if (Section) - Result = Section->PointerToRawData + symb->Value; - else - Result = symb->Value; - return object_error::success; +std::error_code COFFObjectFile::getSymbolName(DataRefImpl Ref, + StringRef &Result) const { + const coff_symbol *Symb = toSymb(Ref); + return getSymbolName(Symb, Result); } -error_code COFFObjectFile::getSymbolAddress(DataRefImpl Symb, - uint64_t &Result) const { - const coff_symbol *symb = toSymb(Symb); - const coff_section *Section = NULL; - if (error_code ec = getSection(symb->SectionNumber, Section)) - return ec; +std::error_code COFFObjectFile::getSymbolAddress(DataRefImpl Ref, + uint64_t &Result) const { + const coff_symbol *Symb = toSymb(Ref); + const coff_section *Section = nullptr; + if (std::error_code EC = getSection(Symb->SectionNumber, Section)) + return EC; - if (symb->SectionNumber == COFF::IMAGE_SYM_UNDEFINED) + if (Symb->SectionNumber == COFF::IMAGE_SYM_UNDEFINED) Result = UnknownAddressOrSize; else if (Section) - Result = Section->VirtualAddress + symb->Value; + Result = Section->VirtualAddress + Symb->Value; else - Result = symb->Value; + Result = Symb->Value; return object_error::success; } -error_code COFFObjectFile::getSymbolType(DataRefImpl Symb, - SymbolRef::Type &Result) const { - const coff_symbol *symb = toSymb(Symb); +std::error_code COFFObjectFile::getSymbolType(DataRefImpl Ref, + SymbolRef::Type &Result) const { + const coff_symbol *Symb = toSymb(Ref); Result = SymbolRef::ST_Other; - if (symb->StorageClass == COFF::IMAGE_SYM_CLASS_EXTERNAL && - symb->SectionNumber == COFF::IMAGE_SYM_UNDEFINED) { + if (Symb->StorageClass == COFF::IMAGE_SYM_CLASS_EXTERNAL && + Symb->SectionNumber == COFF::IMAGE_SYM_UNDEFINED) { Result = SymbolRef::ST_Unknown; + } else if (Symb->isFunctionDefinition()) { + Result = SymbolRef::ST_Function; } else { - if (symb->getComplexType() == COFF::IMAGE_SYM_DTYPE_FUNCTION) { - Result = SymbolRef::ST_Function; - } else { - uint32_t Characteristics = 0; - if (symb->SectionNumber > 0) { - const coff_section *Section = NULL; - if (error_code ec = getSection(symb->SectionNumber, Section)) - return ec; - Characteristics = Section->Characteristics; - } - if (Characteristics & COFF::IMAGE_SCN_MEM_READ && - ~Characteristics & COFF::IMAGE_SCN_MEM_WRITE) // Read only. - Result = SymbolRef::ST_Data; + uint32_t Characteristics = 0; + if (!COFF::isReservedSectionNumber(Symb->SectionNumber)) { + const coff_section *Section = nullptr; + if (std::error_code EC = getSection(Symb->SectionNumber, Section)) + return EC; + Characteristics = Section->Characteristics; } + if (Characteristics & COFF::IMAGE_SCN_MEM_READ && + ~Characteristics & COFF::IMAGE_SCN_MEM_WRITE) // Read only. + Result = SymbolRef::ST_Data; } return object_error::success; } -error_code COFFObjectFile::getSymbolFlags(DataRefImpl Symb, - uint32_t &Result) const { - const coff_symbol *symb = toSymb(Symb); - Result = SymbolRef::SF_None; +uint32_t COFFObjectFile::getSymbolFlags(DataRefImpl Ref) const { + const coff_symbol *Symb = toSymb(Ref); + uint32_t Result = SymbolRef::SF_None; + + // TODO: Correctly set SF_FormatSpecific, SF_Common - // TODO: Correctly set SF_FormatSpecific, SF_ThreadLocal, SF_Common + if (Symb->SectionNumber == COFF::IMAGE_SYM_UNDEFINED) { + if (Symb->Value == 0) + Result |= SymbolRef::SF_Undefined; + else + Result |= SymbolRef::SF_Common; + } - if (symb->StorageClass == COFF::IMAGE_SYM_CLASS_EXTERNAL && - symb->SectionNumber == COFF::IMAGE_SYM_UNDEFINED) - Result |= SymbolRef::SF_Undefined; // TODO: This are certainly too restrictive. - if (symb->StorageClass == COFF::IMAGE_SYM_CLASS_EXTERNAL) + if (Symb->StorageClass == COFF::IMAGE_SYM_CLASS_EXTERNAL) Result |= SymbolRef::SF_Global; - if (symb->StorageClass == COFF::IMAGE_SYM_CLASS_WEAK_EXTERNAL) + if (Symb->StorageClass == COFF::IMAGE_SYM_CLASS_WEAK_EXTERNAL) Result |= SymbolRef::SF_Weak; - if (symb->SectionNumber == COFF::IMAGE_SYM_ABSOLUTE) + if (Symb->SectionNumber == COFF::IMAGE_SYM_ABSOLUTE) Result |= SymbolRef::SF_Absolute; - return object_error::success; + return Result; } -error_code COFFObjectFile::getSymbolSize(DataRefImpl Symb, - uint64_t &Result) const { +std::error_code COFFObjectFile::getSymbolSize(DataRefImpl Ref, + uint64_t &Result) const { // FIXME: Return the correct size. This requires looking at all the symbols // in the same section as this symbol, and looking for either the next // symbol, or the end of the section. - const coff_symbol *symb = toSymb(Symb); - const coff_section *Section = NULL; - if (error_code ec = getSection(symb->SectionNumber, Section)) - return ec; + const coff_symbol *Symb = toSymb(Ref); + const coff_section *Section = nullptr; + if (std::error_code EC = getSection(Symb->SectionNumber, Section)) + return EC; - if (symb->SectionNumber == COFF::IMAGE_SYM_UNDEFINED) + if (Symb->SectionNumber == COFF::IMAGE_SYM_UNDEFINED) Result = UnknownAddressOrSize; else if (Section) - Result = Section->SizeOfRawData - symb->Value; + Result = Section->SizeOfRawData - Symb->Value; else Result = 0; return object_error::success; } -error_code COFFObjectFile::getSymbolSection(DataRefImpl Symb, - section_iterator &Result) const { - const coff_symbol *symb = toSymb(Symb); - if (symb->SectionNumber <= COFF::IMAGE_SYM_UNDEFINED) - Result = end_sections(); - else { - const coff_section *sec = 0; - if (error_code ec = getSection(symb->SectionNumber, sec)) return ec; - DataRefImpl Sec; - Sec.p = reinterpret_cast<uintptr_t>(sec); - Result = section_iterator(SectionRef(Sec, this)); +std::error_code +COFFObjectFile::getSymbolSection(DataRefImpl Ref, + section_iterator &Result) const { + const coff_symbol *Symb = toSymb(Ref); + if (COFF::isReservedSectionNumber(Symb->SectionNumber)) { + Result = section_end(); + } else { + const coff_section *Sec = nullptr; + if (std::error_code EC = getSection(Symb->SectionNumber, Sec)) + return EC; + DataRefImpl Ref; + Ref.p = reinterpret_cast<uintptr_t>(Sec); + Result = section_iterator(SectionRef(Ref, this)); } return object_error::success; } -error_code COFFObjectFile::getSymbolValue(DataRefImpl Symb, - uint64_t &Val) const { - report_fatal_error("getSymbolValue unimplemented in COFFObjectFile"); +void COFFObjectFile::moveSectionNext(DataRefImpl &Ref) const { + const coff_section *Sec = toSec(Ref); + Sec += 1; + Ref.p = reinterpret_cast<uintptr_t>(Sec); } -error_code COFFObjectFile::getSectionNext(DataRefImpl Sec, - SectionRef &Result) const { - const coff_section *sec = toSec(Sec); - sec += 1; - Sec.p = reinterpret_cast<uintptr_t>(sec); - Result = SectionRef(Sec, this); - return object_error::success; +std::error_code COFFObjectFile::getSectionName(DataRefImpl Ref, + StringRef &Result) const { + const coff_section *Sec = toSec(Ref); + return getSectionName(Sec, Result); } -error_code COFFObjectFile::getSectionName(DataRefImpl Sec, - StringRef &Result) const { - const coff_section *sec = toSec(Sec); - return getSectionName(sec, Result); -} - -error_code COFFObjectFile::getSectionAddress(DataRefImpl Sec, - uint64_t &Result) const { - const coff_section *sec = toSec(Sec); - Result = sec->VirtualAddress; +std::error_code COFFObjectFile::getSectionAddress(DataRefImpl Ref, + uint64_t &Result) const { + const coff_section *Sec = toSec(Ref); + Result = Sec->VirtualAddress; return object_error::success; } -error_code COFFObjectFile::getSectionSize(DataRefImpl Sec, - uint64_t &Result) const { - const coff_section *sec = toSec(Sec); - Result = sec->SizeOfRawData; +std::error_code COFFObjectFile::getSectionSize(DataRefImpl Ref, + uint64_t &Result) const { + const coff_section *Sec = toSec(Ref); + Result = Sec->SizeOfRawData; return object_error::success; } -error_code COFFObjectFile::getSectionContents(DataRefImpl Sec, - StringRef &Result) const { - const coff_section *sec = toSec(Sec); +std::error_code COFFObjectFile::getSectionContents(DataRefImpl Ref, + StringRef &Result) const { + const coff_section *Sec = toSec(Ref); ArrayRef<uint8_t> Res; - error_code EC = getSectionContents(sec, Res); + std::error_code EC = getSectionContents(Sec, Res); Result = StringRef(reinterpret_cast<const char*>(Res.data()), Res.size()); return EC; } -error_code COFFObjectFile::getSectionAlignment(DataRefImpl Sec, - uint64_t &Res) const { - const coff_section *sec = toSec(Sec); - if (!sec) +std::error_code COFFObjectFile::getSectionAlignment(DataRefImpl Ref, + uint64_t &Res) const { + const coff_section *Sec = toSec(Ref); + if (!Sec) return object_error::parse_failed; - Res = uint64_t(1) << (((sec->Characteristics & 0x00F00000) >> 20) - 1); + Res = uint64_t(1) << (((Sec->Characteristics & 0x00F00000) >> 20) - 1); return object_error::success; } -error_code COFFObjectFile::isSectionText(DataRefImpl Sec, - bool &Result) const { - const coff_section *sec = toSec(Sec); - Result = sec->Characteristics & COFF::IMAGE_SCN_CNT_CODE; +std::error_code COFFObjectFile::isSectionText(DataRefImpl Ref, + bool &Result) const { + const coff_section *Sec = toSec(Ref); + Result = Sec->Characteristics & COFF::IMAGE_SCN_CNT_CODE; return object_error::success; } -error_code COFFObjectFile::isSectionData(DataRefImpl Sec, - bool &Result) const { - const coff_section *sec = toSec(Sec); - Result = sec->Characteristics & COFF::IMAGE_SCN_CNT_INITIALIZED_DATA; +std::error_code COFFObjectFile::isSectionData(DataRefImpl Ref, + bool &Result) const { + const coff_section *Sec = toSec(Ref); + Result = Sec->Characteristics & COFF::IMAGE_SCN_CNT_INITIALIZED_DATA; return object_error::success; } -error_code COFFObjectFile::isSectionBSS(DataRefImpl Sec, - bool &Result) const { - const coff_section *sec = toSec(Sec); - Result = sec->Characteristics & COFF::IMAGE_SCN_CNT_UNINITIALIZED_DATA; +std::error_code COFFObjectFile::isSectionBSS(DataRefImpl Ref, + bool &Result) const { + const coff_section *Sec = toSec(Ref); + Result = Sec->Characteristics & COFF::IMAGE_SCN_CNT_UNINITIALIZED_DATA; return object_error::success; } -error_code COFFObjectFile::isSectionRequiredForExecution(DataRefImpl Sec, - bool &Result) const { +std::error_code +COFFObjectFile::isSectionRequiredForExecution(DataRefImpl Ref, + bool &Result) const { // FIXME: Unimplemented Result = true; return object_error::success; } -error_code COFFObjectFile::isSectionVirtual(DataRefImpl Sec, - bool &Result) const { - const coff_section *sec = toSec(Sec); - Result = sec->Characteristics & COFF::IMAGE_SCN_CNT_UNINITIALIZED_DATA; +std::error_code COFFObjectFile::isSectionVirtual(DataRefImpl Ref, + bool &Result) const { + const coff_section *Sec = toSec(Ref); + Result = Sec->Characteristics & COFF::IMAGE_SCN_CNT_UNINITIALIZED_DATA; return object_error::success; } -error_code COFFObjectFile::isSectionZeroInit(DataRefImpl Sec, - bool &Result) const { +std::error_code COFFObjectFile::isSectionZeroInit(DataRefImpl Ref, + bool &Result) const { // FIXME: Unimplemented. Result = false; return object_error::success; } -error_code COFFObjectFile::isSectionReadOnlyData(DataRefImpl Sec, - bool &Result) const { +std::error_code COFFObjectFile::isSectionReadOnlyData(DataRefImpl Ref, + bool &Result) const { // FIXME: Unimplemented. Result = false; return object_error::success; } -error_code COFFObjectFile::sectionContainsSymbol(DataRefImpl Sec, - DataRefImpl Symb, - bool &Result) const { - const coff_section *sec = toSec(Sec); - const coff_symbol *symb = toSymb(Symb); - const coff_section *symb_sec = 0; - if (error_code ec = getSection(symb->SectionNumber, symb_sec)) return ec; - if (symb_sec == sec) +std::error_code COFFObjectFile::sectionContainsSymbol(DataRefImpl SecRef, + DataRefImpl SymbRef, + bool &Result) const { + const coff_section *Sec = toSec(SecRef); + const coff_symbol *Symb = toSymb(SymbRef); + const coff_section *SymbSec = nullptr; + if (std::error_code EC = getSection(Symb->SectionNumber, SymbSec)) + return EC; + if (SymbSec == Sec) Result = true; else Result = false; return object_error::success; } -relocation_iterator COFFObjectFile::section_rel_begin(DataRefImpl Sec) const { - const coff_section *sec = toSec(Sec); - DataRefImpl ret; - if (sec->NumberOfRelocations == 0) - ret.p = 0; - else - ret.p = reinterpret_cast<uintptr_t>(base() + sec->PointerToRelocations); - - return relocation_iterator(RelocationRef(ret, this)); +relocation_iterator COFFObjectFile::section_rel_begin(DataRefImpl Ref) const { + const coff_section *Sec = toSec(Ref); + DataRefImpl Ret; + if (Sec->NumberOfRelocations == 0) { + Ret.p = 0; + } else { + auto begin = reinterpret_cast<const coff_relocation*>( + base() + Sec->PointerToRelocations); + if (Sec->hasExtendedRelocations()) { + // Skip the first relocation entry repurposed to store the number of + // relocations. + begin++; + } + Ret.p = reinterpret_cast<uintptr_t>(begin); + } + return relocation_iterator(RelocationRef(Ret, this)); +} + +static uint32_t getNumberOfRelocations(const coff_section *Sec, + const uint8_t *base) { + // The field for the number of relocations in COFF section table is only + // 16-bit wide. If a section has more than 65535 relocations, 0xFFFF is set to + // NumberOfRelocations field, and the actual relocation count is stored in the + // VirtualAddress field in the first relocation entry. + if (Sec->hasExtendedRelocations()) { + auto *FirstReloc = reinterpret_cast<const coff_relocation*>( + base + Sec->PointerToRelocations); + return FirstReloc->VirtualAddress; + } + return Sec->NumberOfRelocations; } -relocation_iterator COFFObjectFile::section_rel_end(DataRefImpl Sec) const { - const coff_section *sec = toSec(Sec); - DataRefImpl ret; - if (sec->NumberOfRelocations == 0) - ret.p = 0; - else - ret.p = reinterpret_cast<uintptr_t>( - reinterpret_cast<const coff_relocation*>( - base() + sec->PointerToRelocations) - + sec->NumberOfRelocations); - - return relocation_iterator(RelocationRef(ret, this)); +relocation_iterator COFFObjectFile::section_rel_end(DataRefImpl Ref) const { + const coff_section *Sec = toSec(Ref); + DataRefImpl Ret; + if (Sec->NumberOfRelocations == 0) { + Ret.p = 0; + } else { + auto begin = reinterpret_cast<const coff_relocation*>( + base() + Sec->PointerToRelocations); + uint32_t NumReloc = getNumberOfRelocations(Sec, base()); + Ret.p = reinterpret_cast<uintptr_t>(begin + NumReloc); + } + return relocation_iterator(RelocationRef(Ret, this)); } // Initialize the pointer to the symbol table. -error_code COFFObjectFile::initSymbolTablePtr() { - if (error_code ec = getObject( - SymbolTable, Data, base() + COFFHeader->PointerToSymbolTable, +std::error_code COFFObjectFile::initSymbolTablePtr() { + if (std::error_code EC = getObject( + SymbolTable, *Data, base() + COFFHeader->PointerToSymbolTable, COFFHeader->NumberOfSymbols * sizeof(coff_symbol))) - return ec; + return EC; // Find string table. The first four byte of the string table contains the // total size of the string table, including the size field itself. If the @@ -376,32 +408,42 @@ error_code COFFObjectFile::initSymbolTablePtr() { base() + COFFHeader->PointerToSymbolTable + COFFHeader->NumberOfSymbols * sizeof(coff_symbol); const ulittle32_t *StringTableSizePtr; - if (error_code ec = getObject(StringTableSizePtr, Data, StringTableAddr)) - return ec; + if (std::error_code EC = + getObject(StringTableSizePtr, *Data, StringTableAddr)) + return EC; StringTableSize = *StringTableSizePtr; - if (error_code ec = - getObject(StringTable, Data, StringTableAddr, StringTableSize)) - return ec; + if (std::error_code EC = + getObject(StringTable, *Data, StringTableAddr, StringTableSize)) + return EC; + + // Treat table sizes < 4 as empty because contrary to the PECOFF spec, some + // tools like cvtres write a size of 0 for an empty table instead of 4. + if (StringTableSize < 4) + StringTableSize = 4; // Check that the string table is null terminated if has any in it. - if (StringTableSize < 4 || - (StringTableSize > 4 && StringTable[StringTableSize - 1] != 0)) + if (StringTableSize > 4 && StringTable[StringTableSize - 1] != 0) return object_error::parse_failed; return object_error::success; } +// Returns the file offset for the given VA. +std::error_code COFFObjectFile::getVaPtr(uint64_t Addr, uintptr_t &Res) const { + uint64_t ImageBase = PE32Header ? (uint64_t)PE32Header->ImageBase + : (uint64_t)PE32PlusHeader->ImageBase; + uint64_t Rva = Addr - ImageBase; + assert(Rva <= UINT32_MAX); + return getRvaPtr((uint32_t)Rva, Res); +} + // Returns the file offset for the given RVA. -error_code COFFObjectFile::getRvaPtr(uint32_t Rva, uintptr_t &Res) const { - error_code ec; - for (section_iterator i = begin_sections(), e = end_sections(); i != e; - i.increment(ec)) { - if (ec) - return ec; - const coff_section *Section = getCOFFSection(i); +std::error_code COFFObjectFile::getRvaPtr(uint32_t Addr, uintptr_t &Res) const { + for (const SectionRef &S : sections()) { + const coff_section *Section = getCOFFSection(S); uint32_t SectionStart = Section->VirtualAddress; uint32_t SectionEnd = Section->VirtualAddress + Section->VirtualSize; - if (SectionStart <= Rva && Rva < SectionEnd) { - uint32_t Offset = Rva - SectionStart; + if (SectionStart <= Addr && Addr < SectionEnd) { + uint32_t Offset = Addr - SectionStart; Res = uintptr_t(base()) + Section->PointerToRawData + Offset; return object_error::success; } @@ -411,11 +453,11 @@ error_code COFFObjectFile::getRvaPtr(uint32_t Rva, uintptr_t &Res) const { // Returns hint and name fields, assuming \p Rva is pointing to a Hint/Name // table entry. -error_code COFFObjectFile:: -getHintName(uint32_t Rva, uint16_t &Hint, StringRef &Name) const { +std::error_code COFFObjectFile::getHintName(uint32_t Rva, uint16_t &Hint, + StringRef &Name) const { uintptr_t IntPtr = 0; - if (error_code ec = getRvaPtr(Rva, IntPtr)) - return ec; + if (std::error_code EC = getRvaPtr(Rva, IntPtr)) + return EC; const uint8_t *Ptr = reinterpret_cast<const uint8_t *>(IntPtr); Hint = *reinterpret_cast<const ulittle16_t *>(Ptr); Name = StringRef(reinterpret_cast<const char *>(Ptr + 2)); @@ -423,7 +465,7 @@ getHintName(uint32_t Rva, uint16_t &Hint, StringRef &Name) const { } // Find the import table. -error_code COFFObjectFile::initImportTablePtr() { +std::error_code COFFObjectFile::initImportTablePtr() { // First, we get the RVA of the import table. If the file lacks a pointer to // the import table, do nothing. const data_directory *DataEntry; @@ -441,118 +483,139 @@ error_code COFFObjectFile::initImportTablePtr() { // Find the section that contains the RVA. This is needed because the RVA is // the import table's memory address which is different from its file offset. uintptr_t IntPtr = 0; - if (error_code ec = getRvaPtr(ImportTableRva, IntPtr)) - return ec; + if (std::error_code EC = getRvaPtr(ImportTableRva, IntPtr)) + return EC; ImportDirectory = reinterpret_cast< const import_directory_table_entry *>(IntPtr); + return object_error::success; +} - // It's an error if there's no section containing the Import Table RVA. - return object_error::parse_failed; +// Find the export table. +std::error_code COFFObjectFile::initExportTablePtr() { + // First, we get the RVA of the export table. If the file lacks a pointer to + // the export table, do nothing. + const data_directory *DataEntry; + if (getDataDirectory(COFF::EXPORT_TABLE, DataEntry)) + return object_error::success; + + // Do nothing if the pointer to export table is NULL. + if (DataEntry->RelativeVirtualAddress == 0) + return object_error::success; + + uint32_t ExportTableRva = DataEntry->RelativeVirtualAddress; + uintptr_t IntPtr = 0; + if (std::error_code EC = getRvaPtr(ExportTableRva, IntPtr)) + return EC; + ExportDirectory = + reinterpret_cast<const export_directory_table_entry *>(IntPtr); + return object_error::success; } -COFFObjectFile::COFFObjectFile(MemoryBuffer *Object, error_code &ec) - : ObjectFile(Binary::ID_COFF, Object) - , COFFHeader(0) - , PE32Header(0) - , DataDirectory(0) - , SectionTable(0) - , SymbolTable(0) - , StringTable(0) - , StringTableSize(0) - , ImportDirectory(0) - , NumberOfImportDirectory(0) { +COFFObjectFile::COFFObjectFile(std::unique_ptr<MemoryBuffer> Object, + std::error_code &EC) + : ObjectFile(Binary::ID_COFF, std::move(Object)), COFFHeader(nullptr), + PE32Header(nullptr), PE32PlusHeader(nullptr), DataDirectory(nullptr), + SectionTable(nullptr), SymbolTable(nullptr), StringTable(nullptr), + StringTableSize(0), ImportDirectory(nullptr), NumberOfImportDirectory(0), + ExportDirectory(nullptr) { // Check that we at least have enough room for a header. - if (!checkSize(Data, ec, sizeof(coff_file_header))) return; + if (!checkSize(*Data, EC, sizeof(coff_file_header))) + return; // The current location in the file where we are looking at. uint64_t CurPtr = 0; // PE header is optional and is present only in executables. If it exists, // it is placed right after COFF header. - bool hasPEHeader = false; + bool HasPEHeader = false; // Check if this is a PE/COFF file. if (base()[0] == 0x4d && base()[1] == 0x5a) { // PE/COFF, seek through MS-DOS compatibility stub and 4-byte // PE signature to find 'normal' COFF header. - if (!checkSize(Data, ec, 0x3c + 8)) return; + if (!checkSize(*Data, EC, 0x3c + 8)) + return; CurPtr = *reinterpret_cast<const ulittle16_t *>(base() + 0x3c); // Check the PE magic bytes. ("PE\0\0") if (std::memcmp(base() + CurPtr, "PE\0\0", 4) != 0) { - ec = object_error::parse_failed; + EC = object_error::parse_failed; return; } CurPtr += 4; // Skip the PE magic bytes. - hasPEHeader = true; + HasPEHeader = true; } - if ((ec = getObject(COFFHeader, Data, base() + CurPtr))) + if ((EC = getObject(COFFHeader, *Data, base() + CurPtr))) return; CurPtr += sizeof(coff_file_header); - if (hasPEHeader) { - if ((ec = getObject(PE32Header, Data, base() + CurPtr))) + if (HasPEHeader) { + const pe32_header *Header; + if ((EC = getObject(Header, *Data, base() + CurPtr))) + return; + + const uint8_t *DataDirAddr; + uint64_t DataDirSize; + if (Header->Magic == 0x10b) { + PE32Header = Header; + DataDirAddr = base() + CurPtr + sizeof(pe32_header); + DataDirSize = sizeof(data_directory) * PE32Header->NumberOfRvaAndSize; + } else if (Header->Magic == 0x20b) { + PE32PlusHeader = reinterpret_cast<const pe32plus_header *>(Header); + DataDirAddr = base() + CurPtr + sizeof(pe32plus_header); + DataDirSize = sizeof(data_directory) * PE32PlusHeader->NumberOfRvaAndSize; + } else { + // It's neither PE32 nor PE32+. + EC = object_error::parse_failed; return; - if (PE32Header->Magic != 0x10b) { - // We only support PE32. If this is PE32 (not PE32+), the magic byte - // should be 0x10b. If this is not PE32, continue as if there's no PE - // header in this file. - PE32Header = 0; - } else if (PE32Header->NumberOfRvaAndSize > 0) { - const uint8_t *addr = base() + CurPtr + sizeof(pe32_header); - uint64_t size = sizeof(data_directory) * PE32Header->NumberOfRvaAndSize; - if ((ec = getObject(DataDirectory, Data, addr, size))) - return; } + if ((EC = getObject(DataDirectory, *Data, DataDirAddr, DataDirSize))) + return; CurPtr += COFFHeader->SizeOfOptionalHeader; } - if (!COFFHeader->isImportLibrary()) - if ((ec = getObject(SectionTable, Data, base() + CurPtr, - COFFHeader->NumberOfSections * sizeof(coff_section)))) - return; + if (COFFHeader->isImportLibrary()) + return; + + if ((EC = getObject(SectionTable, *Data, base() + CurPtr, + COFFHeader->NumberOfSections * sizeof(coff_section)))) + return; // Initialize the pointer to the symbol table. if (COFFHeader->PointerToSymbolTable != 0) - if ((ec = initSymbolTablePtr())) + if ((EC = initSymbolTablePtr())) return; // Initialize the pointer to the beginning of the import table. - if ((ec = initImportTablePtr())) + if ((EC = initImportTablePtr())) return; - ec = object_error::success; -} + // Initialize the pointer to the export table. + if ((EC = initExportTablePtr())) + return; -symbol_iterator COFFObjectFile::begin_symbols() const { - DataRefImpl ret; - ret.p = reinterpret_cast<uintptr_t>(SymbolTable); - return symbol_iterator(SymbolRef(ret, this)); + EC = object_error::success; } -symbol_iterator COFFObjectFile::end_symbols() const { - // The symbol table ends where the string table begins. - DataRefImpl ret; - ret.p = reinterpret_cast<uintptr_t>(StringTable); - return symbol_iterator(SymbolRef(ret, this)); +basic_symbol_iterator COFFObjectFile::symbol_begin_impl() const { + DataRefImpl Ret; + Ret.p = reinterpret_cast<uintptr_t>(SymbolTable); + return basic_symbol_iterator(SymbolRef(Ret, this)); } -symbol_iterator COFFObjectFile::begin_dynamic_symbols() const { - // TODO: implement - report_fatal_error("Dynamic symbols unimplemented in COFFObjectFile"); -} - -symbol_iterator COFFObjectFile::end_dynamic_symbols() const { - // TODO: implement - report_fatal_error("Dynamic symbols unimplemented in COFFObjectFile"); +basic_symbol_iterator COFFObjectFile::symbol_end_impl() const { + // The symbol table ends where the string table begins. + DataRefImpl Ret; + Ret.p = reinterpret_cast<uintptr_t>(StringTable); + return basic_symbol_iterator(SymbolRef(Ret, this)); } -library_iterator COFFObjectFile::begin_libraries_needed() const { +library_iterator COFFObjectFile::needed_library_begin() const { // TODO: implement report_fatal_error("Libraries needed unimplemented in COFFObjectFile"); } -library_iterator COFFObjectFile::end_libraries_needed() const { +library_iterator COFFObjectFile::needed_library_end() const { // TODO: implement report_fatal_error("Libraries needed unimplemented in COFFObjectFile"); } @@ -563,34 +626,40 @@ StringRef COFFObjectFile::getLoadName() const { } import_directory_iterator COFFObjectFile::import_directory_begin() const { - DataRefImpl Imp; - Imp.p = reinterpret_cast<uintptr_t>(ImportDirectory); - return import_directory_iterator(ImportDirectoryEntryRef(Imp, this)); + return import_directory_iterator( + ImportDirectoryEntryRef(ImportDirectory, 0, this)); } import_directory_iterator COFFObjectFile::import_directory_end() const { - DataRefImpl Imp; - if (ImportDirectory) { - Imp.p = reinterpret_cast<uintptr_t>( - ImportDirectory + (NumberOfImportDirectory - 1)); - } else { - Imp.p = 0; - } - return import_directory_iterator(ImportDirectoryEntryRef(Imp, this)); + return import_directory_iterator( + ImportDirectoryEntryRef(ImportDirectory, NumberOfImportDirectory, this)); +} + +export_directory_iterator COFFObjectFile::export_directory_begin() const { + return export_directory_iterator( + ExportDirectoryEntryRef(ExportDirectory, 0, this)); +} + +export_directory_iterator COFFObjectFile::export_directory_end() const { + if (!ExportDirectory) + return export_directory_iterator(ExportDirectoryEntryRef(nullptr, 0, this)); + ExportDirectoryEntryRef Ref(ExportDirectory, + ExportDirectory->AddressTableEntries, this); + return export_directory_iterator(Ref); } -section_iterator COFFObjectFile::begin_sections() const { - DataRefImpl ret; - ret.p = reinterpret_cast<uintptr_t>(SectionTable); - return section_iterator(SectionRef(ret, this)); +section_iterator COFFObjectFile::section_begin() const { + DataRefImpl Ret; + Ret.p = reinterpret_cast<uintptr_t>(SectionTable); + return section_iterator(SectionRef(Ret, this)); } -section_iterator COFFObjectFile::end_sections() const { - DataRefImpl ret; - int numSections = COFFHeader->isImportLibrary() +section_iterator COFFObjectFile::section_end() const { + DataRefImpl Ret; + int NumSections = COFFHeader->isImportLibrary() ? 0 : COFFHeader->NumberOfSections; - ret.p = reinterpret_cast<uintptr_t>(SectionTable + numSections); - return section_iterator(SectionRef(ret, this)); + Ret.p = reinterpret_cast<uintptr_t>(SectionTable + NumSections); + return section_iterator(SectionRef(Ret, this)); } uint8_t COFFObjectFile::getBytesInAddress() const { @@ -603,6 +672,8 @@ StringRef COFFObjectFile::getFileFormatName() const { return "COFF-i386"; case COFF::IMAGE_FILE_MACHINE_AMD64: return "COFF-x86-64"; + case COFF::IMAGE_FILE_MACHINE_ARMNT: + return "COFF-ARM"; default: return "COFF-<unknown arch>"; } @@ -614,6 +685,8 @@ unsigned COFFObjectFile::getArch() const { return Triple::x86; case COFF::IMAGE_FILE_MACHINE_AMD64: return Triple::x86_64; + case COFF::IMAGE_FILE_MACHINE_ARMNT: + return Triple::thumb; default: return Triple::UnknownArch; } @@ -621,107 +694,119 @@ unsigned COFFObjectFile::getArch() const { // This method is kept here because lld uses this. As soon as we make // lld to use getCOFFHeader, this method will be removed. -error_code COFFObjectFile::getHeader(const coff_file_header *&Res) const { +std::error_code COFFObjectFile::getHeader(const coff_file_header *&Res) const { return getCOFFHeader(Res); } -error_code COFFObjectFile::getCOFFHeader(const coff_file_header *&Res) const { +std::error_code +COFFObjectFile::getCOFFHeader(const coff_file_header *&Res) const { Res = COFFHeader; return object_error::success; } -error_code COFFObjectFile::getPE32Header(const pe32_header *&Res) const { +std::error_code COFFObjectFile::getPE32Header(const pe32_header *&Res) const { Res = PE32Header; return object_error::success; } -error_code COFFObjectFile::getDataDirectory(uint32_t index, - const data_directory *&Res) const { +std::error_code +COFFObjectFile::getPE32PlusHeader(const pe32plus_header *&Res) const { + Res = PE32PlusHeader; + return object_error::success; +} + +std::error_code +COFFObjectFile::getDataDirectory(uint32_t Index, + const data_directory *&Res) const { // Error if if there's no data directory or the index is out of range. - if (!DataDirectory || index > PE32Header->NumberOfRvaAndSize) + if (!DataDirectory) return object_error::parse_failed; - Res = &DataDirectory[index]; + assert(PE32Header || PE32PlusHeader); + uint32_t NumEnt = PE32Header ? PE32Header->NumberOfRvaAndSize + : PE32PlusHeader->NumberOfRvaAndSize; + if (Index > NumEnt) + return object_error::parse_failed; + Res = &DataDirectory[Index]; return object_error::success; } -error_code COFFObjectFile::getSection(int32_t index, - const coff_section *&Result) const { +std::error_code COFFObjectFile::getSection(int32_t Index, + const coff_section *&Result) const { // Check for special index values. - if (index == COFF::IMAGE_SYM_UNDEFINED || - index == COFF::IMAGE_SYM_ABSOLUTE || - index == COFF::IMAGE_SYM_DEBUG) - Result = NULL; - else if (index > 0 && index <= COFFHeader->NumberOfSections) + if (COFF::isReservedSectionNumber(Index)) + Result = nullptr; + else if (Index > 0 && Index <= COFFHeader->NumberOfSections) // We already verified the section table data, so no need to check again. - Result = SectionTable + (index - 1); + Result = SectionTable + (Index - 1); else return object_error::parse_failed; return object_error::success; } -error_code COFFObjectFile::getString(uint32_t offset, - StringRef &Result) const { +std::error_code COFFObjectFile::getString(uint32_t Offset, + StringRef &Result) const { if (StringTableSize <= 4) // Tried to get a string from an empty string table. return object_error::parse_failed; - if (offset >= StringTableSize) + if (Offset >= StringTableSize) return object_error::unexpected_eof; - Result = StringRef(StringTable + offset); + Result = StringRef(StringTable + Offset); return object_error::success; } -error_code COFFObjectFile::getSymbol(uint32_t index, - const coff_symbol *&Result) const { - if (index < COFFHeader->NumberOfSymbols) - Result = SymbolTable + index; +std::error_code COFFObjectFile::getSymbol(uint32_t Index, + const coff_symbol *&Result) const { + if (Index < COFFHeader->NumberOfSymbols) + Result = SymbolTable + Index; else return object_error::parse_failed; return object_error::success; } -error_code COFFObjectFile::getSymbolName(const coff_symbol *symbol, - StringRef &Res) const { +std::error_code COFFObjectFile::getSymbolName(const coff_symbol *Symbol, + StringRef &Res) const { // Check for string table entry. First 4 bytes are 0. - if (symbol->Name.Offset.Zeroes == 0) { - uint32_t Offset = symbol->Name.Offset.Offset; - if (error_code ec = getString(Offset, Res)) - return ec; + if (Symbol->Name.Offset.Zeroes == 0) { + uint32_t Offset = Symbol->Name.Offset.Offset; + if (std::error_code EC = getString(Offset, Res)) + return EC; return object_error::success; } - if (symbol->Name.ShortName[7] == 0) + if (Symbol->Name.ShortName[7] == 0) // Null terminated, let ::strlen figure out the length. - Res = StringRef(symbol->Name.ShortName); + Res = StringRef(Symbol->Name.ShortName); else // Not null terminated, use all 8 bytes. - Res = StringRef(symbol->Name.ShortName, 8); + Res = StringRef(Symbol->Name.ShortName, 8); return object_error::success; } ArrayRef<uint8_t> COFFObjectFile::getSymbolAuxData( - const coff_symbol *symbol) const { - const uint8_t *aux = NULL; + const coff_symbol *Symbol) const { + const uint8_t *Aux = nullptr; - if ( symbol->NumberOfAuxSymbols > 0 ) { + if (Symbol->NumberOfAuxSymbols > 0) { // AUX data comes immediately after the symbol in COFF - aux = reinterpret_cast<const uint8_t *>(symbol + 1); + Aux = reinterpret_cast<const uint8_t *>(Symbol + 1); # ifndef NDEBUG - // Verify that the aux symbol points to a valid entry in the symbol table. - uintptr_t offset = uintptr_t(aux) - uintptr_t(base()); - if (offset < COFFHeader->PointerToSymbolTable - || offset >= COFFHeader->PointerToSymbolTable + // Verify that the Aux symbol points to a valid entry in the symbol table. + uintptr_t Offset = uintptr_t(Aux) - uintptr_t(base()); + if (Offset < COFFHeader->PointerToSymbolTable + || Offset >= COFFHeader->PointerToSymbolTable + (COFFHeader->NumberOfSymbols * sizeof(coff_symbol))) report_fatal_error("Aux Symbol data was outside of symbol table."); - assert((offset - COFFHeader->PointerToSymbolTable) % sizeof(coff_symbol) + assert((Offset - COFFHeader->PointerToSymbolTable) % sizeof(coff_symbol) == 0 && "Aux Symbol data did not point to the beginning of a symbol"); # endif } - return ArrayRef<uint8_t>(aux, symbol->NumberOfAuxSymbols * sizeof(coff_symbol)); + return ArrayRef<uint8_t>(Aux, + Symbol->NumberOfAuxSymbols * sizeof(coff_symbol)); } -error_code COFFObjectFile::getSectionName(const coff_section *Sec, - StringRef &Res) const { +std::error_code COFFObjectFile::getSectionName(const coff_section *Sec, + StringRef &Res) const { StringRef Name; if (Sec->Name[7] == 0) // Null terminated, let ::strlen figure out the length. @@ -733,18 +818,24 @@ error_code COFFObjectFile::getSectionName(const coff_section *Sec, // Check for string table entry. First byte is '/'. if (Name[0] == '/') { uint32_t Offset; - if (Name.substr(1).getAsInteger(10, Offset)) - return object_error::parse_failed; - if (error_code ec = getString(Offset, Name)) - return ec; + if (Name[1] == '/') { + if (decodeBase64StringEntry(Name.substr(2), Offset)) + return object_error::parse_failed; + } else { + if (Name.substr(1).getAsInteger(10, Offset)) + return object_error::parse_failed; + } + if (std::error_code EC = getString(Offset, Name)) + return EC; } Res = Name; return object_error::success; } -error_code COFFObjectFile::getSectionContents(const coff_section *Sec, - ArrayRef<uint8_t> &Res) const { +std::error_code +COFFObjectFile::getSectionContents(const coff_section *Sec, + ArrayRef<uint8_t> &Res) const { // The only thing that we need to verify is that the contents is contained // within the file bounds. We don't need to make sure it doesn't cover other // data, as there's nothing that says that is not allowed. @@ -760,58 +851,65 @@ error_code COFFObjectFile::getSectionContents(const coff_section *Sec, const coff_relocation *COFFObjectFile::toRel(DataRefImpl Rel) const { return reinterpret_cast<const coff_relocation*>(Rel.p); } -error_code COFFObjectFile::getRelocationNext(DataRefImpl Rel, - RelocationRef &Res) const { + +void COFFObjectFile::moveRelocationNext(DataRefImpl &Rel) const { Rel.p = reinterpret_cast<uintptr_t>( reinterpret_cast<const coff_relocation*>(Rel.p) + 1); - Res = RelocationRef(Rel, this); - return object_error::success; } -error_code COFFObjectFile::getRelocationAddress(DataRefImpl Rel, - uint64_t &Res) const { + +std::error_code COFFObjectFile::getRelocationAddress(DataRefImpl Rel, + uint64_t &Res) const { report_fatal_error("getRelocationAddress not implemented in COFFObjectFile"); } -error_code COFFObjectFile::getRelocationOffset(DataRefImpl Rel, - uint64_t &Res) const { + +std::error_code COFFObjectFile::getRelocationOffset(DataRefImpl Rel, + uint64_t &Res) const { Res = toRel(Rel)->VirtualAddress; return object_error::success; } + symbol_iterator COFFObjectFile::getRelocationSymbol(DataRefImpl Rel) const { const coff_relocation* R = toRel(Rel); - DataRefImpl Symb; - Symb.p = reinterpret_cast<uintptr_t>(SymbolTable + R->SymbolTableIndex); - return symbol_iterator(SymbolRef(Symb, this)); + DataRefImpl Ref; + Ref.p = reinterpret_cast<uintptr_t>(SymbolTable + R->SymbolTableIndex); + return symbol_iterator(SymbolRef(Ref, this)); } -error_code COFFObjectFile::getRelocationType(DataRefImpl Rel, - uint64_t &Res) const { + +std::error_code COFFObjectFile::getRelocationType(DataRefImpl Rel, + uint64_t &Res) const { const coff_relocation* R = toRel(Rel); Res = R->Type; return object_error::success; } -const coff_section *COFFObjectFile::getCOFFSection(section_iterator &It) const { - return toSec(It->getRawDataRefImpl()); +const coff_section * +COFFObjectFile::getCOFFSection(const SectionRef &Section) const { + return toSec(Section.getRawDataRefImpl()); } -const coff_symbol *COFFObjectFile::getCOFFSymbol(symbol_iterator &It) const { - return toSymb(It->getRawDataRefImpl()); +const coff_symbol * +COFFObjectFile::getCOFFSymbol(const SymbolRef &Symbol) const { + return toSymb(Symbol.getRawDataRefImpl()); } -const coff_relocation *COFFObjectFile::getCOFFRelocation( - relocation_iterator &It) const { - return toRel(It->getRawDataRefImpl()); +const coff_relocation * +COFFObjectFile::getCOFFRelocation(const RelocationRef &Reloc) const { + return toRel(Reloc.getRawDataRefImpl()); } -#define LLVM_COFF_SWITCH_RELOC_TYPE_NAME(enum) \ - case COFF::enum: res = #enum; break; +#define LLVM_COFF_SWITCH_RELOC_TYPE_NAME(reloc_type) \ + case COFF::reloc_type: \ + Res = #reloc_type; \ + break; -error_code COFFObjectFile::getRelocationTypeName(DataRefImpl Rel, - SmallVectorImpl<char> &Result) const { - const coff_relocation *reloc = toRel(Rel); - StringRef res; +std::error_code +COFFObjectFile::getRelocationTypeName(DataRefImpl Rel, + SmallVectorImpl<char> &Result) const { + const coff_relocation *Reloc = toRel(Rel); + StringRef Res; switch (COFFHeader->Machine) { case COFF::IMAGE_FILE_MACHINE_AMD64: - switch (reloc->Type) { + switch (Reloc->Type) { LLVM_COFF_SWITCH_RELOC_TYPE_NAME(IMAGE_REL_AMD64_ABSOLUTE); LLVM_COFF_SWITCH_RELOC_TYPE_NAME(IMAGE_REL_AMD64_ADDR64); LLVM_COFF_SWITCH_RELOC_TYPE_NAME(IMAGE_REL_AMD64_ADDR32); @@ -830,11 +928,32 @@ error_code COFFObjectFile::getRelocationTypeName(DataRefImpl Rel, LLVM_COFF_SWITCH_RELOC_TYPE_NAME(IMAGE_REL_AMD64_PAIR); LLVM_COFF_SWITCH_RELOC_TYPE_NAME(IMAGE_REL_AMD64_SSPAN32); default: - res = "Unknown"; + Res = "Unknown"; + } + break; + case COFF::IMAGE_FILE_MACHINE_ARMNT: + switch (Reloc->Type) { + LLVM_COFF_SWITCH_RELOC_TYPE_NAME(IMAGE_REL_ARM_ABSOLUTE); + LLVM_COFF_SWITCH_RELOC_TYPE_NAME(IMAGE_REL_ARM_ADDR32); + LLVM_COFF_SWITCH_RELOC_TYPE_NAME(IMAGE_REL_ARM_ADDR32NB); + LLVM_COFF_SWITCH_RELOC_TYPE_NAME(IMAGE_REL_ARM_BRANCH24); + LLVM_COFF_SWITCH_RELOC_TYPE_NAME(IMAGE_REL_ARM_BRANCH11); + LLVM_COFF_SWITCH_RELOC_TYPE_NAME(IMAGE_REL_ARM_TOKEN); + LLVM_COFF_SWITCH_RELOC_TYPE_NAME(IMAGE_REL_ARM_BLX24); + LLVM_COFF_SWITCH_RELOC_TYPE_NAME(IMAGE_REL_ARM_BLX11); + LLVM_COFF_SWITCH_RELOC_TYPE_NAME(IMAGE_REL_ARM_SECTION); + LLVM_COFF_SWITCH_RELOC_TYPE_NAME(IMAGE_REL_ARM_SECREL); + LLVM_COFF_SWITCH_RELOC_TYPE_NAME(IMAGE_REL_ARM_MOV32A); + LLVM_COFF_SWITCH_RELOC_TYPE_NAME(IMAGE_REL_ARM_MOV32T); + LLVM_COFF_SWITCH_RELOC_TYPE_NAME(IMAGE_REL_ARM_BRANCH20T); + LLVM_COFF_SWITCH_RELOC_TYPE_NAME(IMAGE_REL_ARM_BRANCH24T); + LLVM_COFF_SWITCH_RELOC_TYPE_NAME(IMAGE_REL_ARM_BLX23T); + default: + Res = "Unknown"; } break; case COFF::IMAGE_FILE_MACHINE_I386: - switch (reloc->Type) { + switch (Reloc->Type) { LLVM_COFF_SWITCH_RELOC_TYPE_NAME(IMAGE_REL_I386_ABSOLUTE); LLVM_COFF_SWITCH_RELOC_TYPE_NAME(IMAGE_REL_I386_DIR16); LLVM_COFF_SWITCH_RELOC_TYPE_NAME(IMAGE_REL_I386_REL16); @@ -847,92 +966,158 @@ error_code COFFObjectFile::getRelocationTypeName(DataRefImpl Rel, LLVM_COFF_SWITCH_RELOC_TYPE_NAME(IMAGE_REL_I386_SECREL7); LLVM_COFF_SWITCH_RELOC_TYPE_NAME(IMAGE_REL_I386_REL32); default: - res = "Unknown"; + Res = "Unknown"; } break; default: - res = "Unknown"; + Res = "Unknown"; } - Result.append(res.begin(), res.end()); + Result.append(Res.begin(), Res.end()); return object_error::success; } #undef LLVM_COFF_SWITCH_RELOC_TYPE_NAME -error_code COFFObjectFile::getRelocationValueString(DataRefImpl Rel, - SmallVectorImpl<char> &Result) const { - const coff_relocation *reloc = toRel(Rel); - const coff_symbol *symb = 0; - if (error_code ec = getSymbol(reloc->SymbolTableIndex, symb)) return ec; - DataRefImpl sym; - sym.p = reinterpret_cast<uintptr_t>(symb); - StringRef symname; - if (error_code ec = getSymbolName(sym, symname)) return ec; - Result.append(symname.begin(), symname.end()); +std::error_code +COFFObjectFile::getRelocationValueString(DataRefImpl Rel, + SmallVectorImpl<char> &Result) const { + const coff_relocation *Reloc = toRel(Rel); + const coff_symbol *Symb = nullptr; + if (std::error_code EC = getSymbol(Reloc->SymbolTableIndex, Symb)) + return EC; + DataRefImpl Sym; + Sym.p = reinterpret_cast<uintptr_t>(Symb); + StringRef SymName; + if (std::error_code EC = getSymbolName(Sym, SymName)) + return EC; + Result.append(SymName.begin(), SymName.end()); return object_error::success; } -error_code COFFObjectFile::getLibraryNext(DataRefImpl LibData, - LibraryRef &Result) const { +std::error_code COFFObjectFile::getLibraryNext(DataRefImpl LibData, + LibraryRef &Result) const { report_fatal_error("getLibraryNext not implemented in COFFObjectFile"); } -error_code COFFObjectFile::getLibraryPath(DataRefImpl LibData, - StringRef &Result) const { +std::error_code COFFObjectFile::getLibraryPath(DataRefImpl LibData, + StringRef &Result) const { report_fatal_error("getLibraryPath not implemented in COFFObjectFile"); } bool ImportDirectoryEntryRef:: operator==(const ImportDirectoryEntryRef &Other) const { - return ImportDirectoryPimpl == Other.ImportDirectoryPimpl; + return ImportTable == Other.ImportTable && Index == Other.Index; } -static const import_directory_table_entry *toImportEntry(DataRefImpl Imp) { - return reinterpret_cast<const import_directory_table_entry *>(Imp.p); +void ImportDirectoryEntryRef::moveNext() { + ++Index; } -error_code -ImportDirectoryEntryRef::getNext(ImportDirectoryEntryRef &Result) const { - const import_directory_table_entry *Dir = toImportEntry(ImportDirectoryPimpl); - Dir += 1; - DataRefImpl Next; - Next.p = reinterpret_cast<uintptr_t>(Dir); - Result = ImportDirectoryEntryRef(Next, OwningObject); +std::error_code ImportDirectoryEntryRef::getImportTableEntry( + const import_directory_table_entry *&Result) const { + Result = ImportTable; return object_error::success; } -error_code ImportDirectoryEntryRef:: -getImportTableEntry(const import_directory_table_entry *&Result) const { - Result = toImportEntry(ImportDirectoryPimpl); +std::error_code ImportDirectoryEntryRef::getName(StringRef &Result) const { + uintptr_t IntPtr = 0; + if (std::error_code EC = + OwningObject->getRvaPtr(ImportTable->NameRVA, IntPtr)) + return EC; + Result = StringRef(reinterpret_cast<const char *>(IntPtr)); return object_error::success; } -error_code ImportDirectoryEntryRef::getName(StringRef &Result) const { - const import_directory_table_entry *Dir = toImportEntry(ImportDirectoryPimpl); +std::error_code ImportDirectoryEntryRef::getImportLookupEntry( + const import_lookup_table_entry32 *&Result) const { uintptr_t IntPtr = 0; - if (error_code ec = OwningObject->getRvaPtr(Dir->NameRVA, IntPtr)) - return ec; - const char *Ptr = reinterpret_cast<const char *>(IntPtr); - Result = StringRef(Ptr); + if (std::error_code EC = + OwningObject->getRvaPtr(ImportTable->ImportLookupTableRVA, IntPtr)) + return EC; + Result = reinterpret_cast<const import_lookup_table_entry32 *>(IntPtr); return object_error::success; } -error_code ImportDirectoryEntryRef::getImportLookupEntry( - const import_lookup_table_entry32 *&Result) const { - const import_directory_table_entry *Dir = toImportEntry(ImportDirectoryPimpl); +bool ExportDirectoryEntryRef:: +operator==(const ExportDirectoryEntryRef &Other) const { + return ExportTable == Other.ExportTable && Index == Other.Index; +} + +void ExportDirectoryEntryRef::moveNext() { + ++Index; +} + +// Returns the name of the current export symbol. If the symbol is exported only +// by ordinal, the empty string is set as a result. +std::error_code ExportDirectoryEntryRef::getDllName(StringRef &Result) const { uintptr_t IntPtr = 0; - if (error_code ec = OwningObject->getRvaPtr( - Dir->ImportLookupTableRVA, IntPtr)) - return ec; - Result = reinterpret_cast<const import_lookup_table_entry32 *>(IntPtr); + if (std::error_code EC = + OwningObject->getRvaPtr(ExportTable->NameRVA, IntPtr)) + return EC; + Result = StringRef(reinterpret_cast<const char *>(IntPtr)); return object_error::success; } -namespace llvm { +// Returns the starting ordinal number. +std::error_code +ExportDirectoryEntryRef::getOrdinalBase(uint32_t &Result) const { + Result = ExportTable->OrdinalBase; + return object_error::success; +} + +// Returns the export ordinal of the current export symbol. +std::error_code ExportDirectoryEntryRef::getOrdinal(uint32_t &Result) const { + Result = ExportTable->OrdinalBase + Index; + return object_error::success; +} + +// Returns the address of the current export symbol. +std::error_code ExportDirectoryEntryRef::getExportRVA(uint32_t &Result) const { + uintptr_t IntPtr = 0; + if (std::error_code EC = + OwningObject->getRvaPtr(ExportTable->ExportAddressTableRVA, IntPtr)) + return EC; + const export_address_table_entry *entry = + reinterpret_cast<const export_address_table_entry *>(IntPtr); + Result = entry[Index].ExportRVA; + return object_error::success; +} - ObjectFile *ObjectFile::createCOFFObjectFile(MemoryBuffer *Object) { - error_code ec; - return new COFFObjectFile(Object, ec); +// Returns the name of the current export symbol. If the symbol is exported only +// by ordinal, the empty string is set as a result. +std::error_code +ExportDirectoryEntryRef::getSymbolName(StringRef &Result) const { + uintptr_t IntPtr = 0; + if (std::error_code EC = + OwningObject->getRvaPtr(ExportTable->OrdinalTableRVA, IntPtr)) + return EC; + const ulittle16_t *Start = reinterpret_cast<const ulittle16_t *>(IntPtr); + + uint32_t NumEntries = ExportTable->NumberOfNamePointers; + int Offset = 0; + for (const ulittle16_t *I = Start, *E = Start + NumEntries; + I < E; ++I, ++Offset) { + if (*I != Index) + continue; + if (std::error_code EC = + OwningObject->getRvaPtr(ExportTable->NamePointerRVA, IntPtr)) + return EC; + const ulittle32_t *NamePtr = reinterpret_cast<const ulittle32_t *>(IntPtr); + if (std::error_code EC = OwningObject->getRvaPtr(NamePtr[Offset], IntPtr)) + return EC; + Result = StringRef(reinterpret_cast<const char *>(IntPtr)); + return object_error::success; } + Result = ""; + return object_error::success; +} -} // end namespace llvm +ErrorOr<ObjectFile *> +ObjectFile::createCOFFObjectFile(std::unique_ptr<MemoryBuffer> Object) { + std::error_code EC; + std::unique_ptr<COFFObjectFile> Ret( + new COFFObjectFile(std::move(Object), EC)); + if (EC) + return EC; + return Ret.release(); +} |
