[lld] r303491 - COFF: migrate def parser from LLD to LLVM [2/2]
Martell Malone via llvm-commits
llvm-commits at lists.llvm.org
Sat May 20 13:48:27 PDT 2017
Hey all,
```
[418/419] Running all regression tests
Testing Time: 394.13s
Expected Passes : 25869
Expected Failures : 75
Unsupported Tests : 6619
```
Here are my results locally after applying the changes so I can't see whats
wrong.
I don't want to leave it broken for too long.
I will try building from another platform before reverting
Best,
Martell
On Sat, May 20, 2017 at 8:56 PM, Martell Malone via llvm-commits <
llvm-commits at lists.llvm.org> wrote:
> Author: martell
> Date: Sat May 20 14:56:44 2017
> New Revision: 303491
>
> URL: http://llvm.org/viewvc/llvm-project?rev=303491&view=rev
> Log:
> COFF: migrate def parser from LLD to LLVM [2/2]
>
> This is split up into two commits.
> This commit removes the DEF parser from LLD
> See the previous commit for the creation in LLVM.
>
> Reviewers: ruiu
>
> Differential Revision: https://reviews.llvm.org/D32689
>
> Removed:
> lld/trunk/COFF/Librarian.cpp
> lld/trunk/COFF/ModuleDef.cpp
> Modified:
> lld/trunk/COFF/CMakeLists.txt
> lld/trunk/COFF/Driver.cpp
> lld/trunk/COFF/Driver.h
>
> Modified: lld/trunk/COFF/CMakeLists.txt
> URL: http://llvm.org/viewvc/llvm-project/lld/trunk/COFF/
> CMakeLists.txt?rev=303491&r1=303490&r2=303491&view=diff
> ============================================================
> ==================
> --- lld/trunk/COFF/CMakeLists.txt (original)
> +++ lld/trunk/COFF/CMakeLists.txt Sat May 20 14:56:44 2017
> @@ -14,11 +14,9 @@ add_lld_library(lldCOFF
> Error.cpp
> ICF.cpp
> InputFiles.cpp
> - Librarian.cpp
> LTO.cpp
> MapFile.cpp
> MarkLive.cpp
> - ModuleDef.cpp
> PDB.cpp
> Strings.cpp
> SymbolTable.cpp
>
> Modified: lld/trunk/COFF/Driver.cpp
> URL: http://llvm.org/viewvc/llvm-project/lld/trunk/COFF/Driver.
> cpp?rev=303491&r1=303490&r2=303491&view=diff
> ============================================================
> ==================
> --- lld/trunk/COFF/Driver.cpp (original)
> +++ lld/trunk/COFF/Driver.cpp Sat May 20 14:56:44 2017
> @@ -19,6 +19,8 @@
> #include "llvm/ADT/Optional.h"
> #include "llvm/ADT/StringSwitch.h"
> #include "llvm/Object/ArchiveWriter.h"
> +#include "llvm/Object/COFFImportFile.h"
> +#include "llvm/Object/COFFModuleDefinition.h"
> #include "llvm/Option/Arg.h"
> #include "llvm/Option/ArgList.h"
> #include "llvm/Option/Option.h"
> @@ -35,6 +37,7 @@
> #include <future>
>
> using namespace llvm;
> +using namespace llvm::object;
> using namespace llvm::COFF;
> using llvm::sys::Process;
> using llvm::sys::fs::file_magic;
> @@ -419,6 +422,84 @@ static std::string getMapFile(const opt:
> return (OutFile.substr(0, OutFile.rfind('.')) + ".map").str();
> }
>
> +static std::string getImplibPath() {
> + if (!Config->Implib.empty())
> + return Config->Implib;
> + SmallString<128> Out = StringRef(Config->OutputFile);
> + sys::path::replace_extension(Out, ".lib");
> + return Out.str();
> +}
> +
> +std::vector<COFFShortExport> createCOFFShortExportFromConfig() {
> + std::vector<COFFShortExport> Exports;
> + for (Export &E1 : Config->Exports) {
> + COFFShortExport E2;
> + E2.Name = E1.Name;
> + E2.ExtName = E1.ExtName;
> + E2.Ordinal = E1.Ordinal;
> + E2.Noname = E1.Noname;
> + E2.Data = E1.Data;
> + E2.Private = E1.Private;
> + E2.Constant = E1.Constant;
> + Exports.push_back(E2);
> + }
> + return Exports;
> +}
> +
> +static void createImportLibrary() {
> + std::vector<COFFShortExport> Exports = createCOFFShortExportFromConfi
> g();
> + std::string DLLName = sys::path::filename(Config->OutputFile);
> + std::string Path = getImplibPath();
> + writeImportLibrary(DLLName, Path, Exports, Config->Machine);
> +}
> +
> +static void parseModuleDefs(StringRef Path) {
> + std::unique_ptr<MemoryBuffer> MB = check(
> + MemoryBuffer::getFile(Path, -1, false, true), "could not open " +
> Path);
> + MemoryBufferRef MBRef = MB->getMemBufferRef();
> +
> + Expected<COFFModuleDefinition> Def =
> + parseCOFFModuleDefinition(MBRef, Config->Machine);
> + if (!Def)
> + fatal(errorToErrorCode(Def.takeError()).message());
> +
> + COFFModuleDefinition &M = *Def;
> + if (Config->OutputFile.empty())
> + Config->OutputFile = Saver.save(M.OutputFile);
> +
> + if (M.ImageBase)
> + Config->ImageBase = M.ImageBase;
> + if (M.StackReserve)
> + Config->StackReserve = M.StackReserve;
> + if (M.StackCommit)
> + Config->StackCommit = M.StackCommit;
> + if (M.HeapReserve)
> + Config->HeapReserve = M.HeapReserve;
> + if (M.HeapCommit)
> + Config->HeapCommit = M.HeapCommit;
> + if (M.MajorImageVersion)
> + Config->MajorImageVersion = M.MajorImageVersion;
> + if (M.MinorImageVersion)
> + Config->MinorImageVersion = M.MinorImageVersion;
> + if (M.MajorOSVersion)
> + Config->MajorOSVersion = M.MajorOSVersion;
> + if (M.MinorOSVersion)
> + Config->MinorOSVersion = M.MinorOSVersion;
> +
> + for (COFFShortExport E1 : M.Exports) {
> + Export E2;
> + E2.Name = Saver.save(E1.Name);
> + if (E1.isWeak())
> + E2.ExtName = Saver.save(E1.ExtName);
> + E2.Ordinal = E1.Ordinal;
> + E2.Noname = E1.Noname;
> + E2.Data = E1.Data;
> + E2.Private = E1.Private;
> + E2.Constant = E1.Constant;
> + Config->Exports.push_back(E2);
> + }
> +}
> +
> std::vector<MemoryBufferRef> getArchiveMembers(Archive *File) {
> std::vector<MemoryBufferRef> V;
> Error Err = Error::success();
> @@ -912,9 +993,7 @@ void LinkerDriver::link(ArrayRef<const c
> // Handle /def
> if (auto *Arg = Args.getLastArg(OPT_deffile)) {
> // parseModuleDefs mutates Config object.
> - parseModuleDefs(
> - takeBuffer(check(MemoryBuffer::getFile(Arg->getValue()),
> - Twine("could not open ") + Arg->getValue())));
> + parseModuleDefs(Arg->getValue());
> }
>
> // Handle /delayload
> @@ -1034,7 +1113,7 @@ void LinkerDriver::link(ArrayRef<const c
> // need to create a .lib file.
> if (!Config->Exports.empty() || Config->DLL) {
> fixupExports();
> - writeImportLibrary();
> + createImportLibrary();
> assignExportOrdinals();
> }
>
>
> Modified: lld/trunk/COFF/Driver.h
> URL: http://llvm.org/viewvc/llvm-project/lld/trunk/COFF/Driver.
> h?rev=303491&r1=303490&r2=303491&view=diff
> ============================================================
> ==================
> --- lld/trunk/COFF/Driver.h (original)
> +++ lld/trunk/COFF/Driver.h Sat May 20 14:56:44 2017
> @@ -124,9 +124,6 @@ private:
> std::vector<MemoryBufferRef> Resources;
> };
>
> -void parseModuleDefs(MemoryBufferRef MB);
> -void writeImportLibrary();
> -
> // Functions below this line are defined in DriverUtils.cpp.
>
> void printHelp(const char *Argv0);
>
> Removed: lld/trunk/COFF/Librarian.cpp
> URL: http://llvm.org/viewvc/llvm-project/lld/trunk/COFF/
> Librarian.cpp?rev=303490&view=auto
> ============================================================
> ==================
> --- lld/trunk/COFF/Librarian.cpp (original)
> +++ lld/trunk/COFF/Librarian.cpp (removed)
> @@ -1,511 +0,0 @@
> -//===- Librarian.cpp ------------------------------
> ------------------------===//
> -//
> -// The LLVM Linker
> -//
> -// This file is distributed under the University of Illinois Open Source
> -// License. See LICENSE.TXT for details.
> -//
> -//===------------------------------------------------------
> ----------------===//
> -//
> -// This file contains functions for the Librarian. The librarian creates
> and
> -// manages libraries of the Common Object File Format (COFF) object
> files. It
> -// primarily is used for creating static libraries and import libraries.
> -//
> -//===------------------------------------------------------
> ----------------===//
> -
> -#include "Config.h"
> -#include "Driver.h"
> -#include "Error.h"
> -#include "Symbols.h"
> -#include "llvm/Object/Archive.h"
> -#include "llvm/Object/ArchiveWriter.h"
> -#include "llvm/Object/COFF.h"
> -#include "llvm/Support/Path.h"
> -
> -#include <vector>
> -
> -using namespace lld::coff;
> -using namespace llvm::COFF;
> -using namespace llvm::object;
> -using namespace llvm;
> -
> -static bool is32bit() {
> - switch (Config->Machine) {
> - default:
> - llvm_unreachable("unsupported machine");
> - case IMAGE_FILE_MACHINE_AMD64:
> - return false;
> - case IMAGE_FILE_MACHINE_ARMNT:
> - case IMAGE_FILE_MACHINE_I386:
> - return true;
> - }
> -}
> -
> -static uint16_t getImgRelRelocation() {
> - switch (Config->Machine) {
> - default:
> - llvm_unreachable("unsupported machine");
> - case IMAGE_FILE_MACHINE_AMD64:
> - return IMAGE_REL_AMD64_ADDR32NB;
> - case IMAGE_FILE_MACHINE_ARMNT:
> - return IMAGE_REL_ARM_ADDR32NB;
> - case IMAGE_FILE_MACHINE_I386:
> - return IMAGE_REL_I386_DIR32NB;
> - }
> -}
> -
> -template <class T> static void append(std::vector<uint8_t> &B, const T
> &Data) {
> - size_t S = B.size();
> - B.resize(S + sizeof(T));
> - memcpy(&B[S], &Data, sizeof(T));
> -}
> -
> -static void writeStringTable(std::vector<uint8_t> &B,
> - ArrayRef<const std::string> Strings) {
> - // The COFF string table consists of a 4-byte value which is the size
> of the
> - // table, including the length field itself. This value is followed by
> the
> - // string content itself, which is an array of null-terminated C-style
> - // strings. The termination is important as they are referenced to by
> offset
> - // by the symbol entity in the file format.
> -
> - std::vector<uint8_t>::size_type Pos = B.size();
> - std::vector<uint8_t>::size_type Offset = B.size();
> -
> - // Skip over the length field, we will fill it in later as we will have
> - // computed the length while emitting the string content itself.
> - Pos += sizeof(uint32_t);
> -
> - for (const auto &S : Strings) {
> - B.resize(Pos + S.length() + 1);
> - strcpy(reinterpret_cast<char *>(&B[Pos]), S.c_str());
> - Pos += S.length() + 1;
> - }
> -
> - // Backfill the length of the table now that it has been computed.
> - support::ulittle32_t Length(B.size() - Offset);
> - memcpy(&B[Offset], &Length, sizeof(Length));
> -}
> -
> -static std::string getImplibPath() {
> - if (!Config->Implib.empty())
> - return Config->Implib;
> - SmallString<128> Out = StringRef(Config->OutputFile);
> - sys::path::replace_extension(Out, ".lib");
> - return Out.str();
> -}
> -
> -static ImportNameType getNameType(StringRef Sym, StringRef ExtName) {
> - if (Sym != ExtName)
> - return IMPORT_NAME_UNDECORATE;
> - if (Config->Machine == I386 && Sym.startswith("_"))
> - return IMPORT_NAME_NOPREFIX;
> - return IMPORT_NAME;
> -}
> -
> -static std::string replace(StringRef S, StringRef From, StringRef To) {
> - size_t Pos = S.find(From);
> -
> - // From and To may be mangled, but substrings in S may not.
> - if (Pos == StringRef::npos && From.startswith("_") &&
> To.startswith("_")) {
> - From = From.substr(1);
> - To = To.substr(1);
> - Pos = S.find(From);
> - }
> -
> - if (Pos == StringRef::npos) {
> - error(S + ": replacing '" + From + "' with '" + To + "' failed");
> - return "";
> - }
> - return (Twine(S.substr(0, Pos)) + To + S.substr(Pos +
> From.size())).str();
> -}
> -
> -static const std::string NullImportDescriptorSymbolName =
> - "__NULL_IMPORT_DESCRIPTOR";
> -
> -namespace {
> -// This class constructs various small object files necessary to support
> linking
> -// symbols imported from a DLL. The contents are pretty strictly defined
> and
> -// nearly entirely static. The details of the structures files are
> defined in
> -// WINNT.h and the PE/COFF specification.
> -class ObjectFactory {
> - using u16 = support::ulittle16_t;
> - using u32 = support::ulittle32_t;
> -
> - BumpPtrAllocator Alloc;
> - StringRef DLLName;
> - StringRef Library;
> - std::string ImportDescriptorSymbolName;
> - std::string NullThunkSymbolName;
> -
> -public:
> - ObjectFactory(StringRef S)
> - : DLLName(S), Library(S.drop_back(4)),
> - ImportDescriptorSymbolName(("__IMPORT_DESCRIPTOR_" +
> Library).str()),
> - NullThunkSymbolName(("\x7f" + Library +
> "_NULL_THUNK_DATA").str()) {}
> -
> - // Creates an Import Descriptor. This is a small object file which
> contains a
> - // reference to the terminators and contains the library name (entry)
> for the
> - // import name table. It will force the linker to construct the
> necessary
> - // structure to import symbols from the DLL.
> - NewArchiveMember createImportDescriptor(std::vector<uint8_t> &Buffer);
> -
> - // Creates a NULL import descriptor. This is a small object file whcih
> - // contains a NULL import descriptor. It is used to terminate the
> imports
> - // from a specific DLL.
> - NewArchiveMember createNullImportDescriptor(std::vector<uint8_t>
> &Buffer);
> -
> - // Create a NULL Thunk Entry. This is a small object file which
> contains a
> - // NULL Import Address Table entry and a NULL Import Lookup Table
> Entry. It
> - // is used to terminate the IAT and ILT.
> - NewArchiveMember createNullThunk(std::vector<uint8_t> &Buffer);
> -
> - // Create a short import file which is described in PE/COFF spec 7.
> Import
> - // Library Format.
> - NewArchiveMember createShortImport(StringRef Sym, uint16_t Ordinal,
> - ImportType Type, ImportNameType
> NameType);
> -};
> -}
> -
> -NewArchiveMember
> -ObjectFactory::createImportDescriptor(std::vector<uint8_t> &Buffer) {
> - static const uint32_t NumberOfSections = 2;
> - static const uint32_t NumberOfSymbols = 7;
> - static const uint32_t NumberOfRelocations = 3;
> -
> - // COFF Header
> - coff_file_header Header{
> - u16(Config->Machine), u16(NumberOfSections), u32(0),
> - u32(sizeof(Header) + (NumberOfSections * sizeof(coff_section)) +
> - // .idata$2
> - sizeof(coff_import_directory_table_entry) +
> - NumberOfRelocations * sizeof(coff_relocation) +
> - // .idata$4
> - (DLLName.size() + 1)),
> - u32(NumberOfSymbols), u16(0),
> - u16(is32bit() ? IMAGE_FILE_32BIT_MACHINE : 0),
> - };
> - append(Buffer, Header);
> -
> - // Section Header Table
> - static const coff_section SectionTable[NumberOfSections] = {
> - {{'.', 'i', 'd', 'a', 't', 'a', '$', '2'},
> - u32(0),
> - u32(0),
> - u32(sizeof(coff_import_directory_table_entry)),
> - u32(sizeof(coff_file_header) + NumberOfSections *
> sizeof(coff_section)),
> - u32(sizeof(coff_file_header) + NumberOfSections *
> sizeof(coff_section) +
> - sizeof(coff_import_directory_table_entry)),
> - u32(0),
> - u16(NumberOfRelocations),
> - u16(0),
> - u32(IMAGE_SCN_ALIGN_4BYTES | IMAGE_SCN_CNT_INITIALIZED_DATA |
> - IMAGE_SCN_MEM_READ | IMAGE_SCN_MEM_WRITE)},
> - {{'.', 'i', 'd', 'a', 't', 'a', '$', '6'},
> - u32(0),
> - u32(0),
> - u32(DLLName.size() + 1),
> - u32(sizeof(coff_file_header) + NumberOfSections *
> sizeof(coff_section) +
> - sizeof(coff_import_directory_table_entry) +
> - NumberOfRelocations * sizeof(coff_relocation)),
> - u32(0),
> - u32(0),
> - u16(0),
> - u16(0),
> - u32(IMAGE_SCN_ALIGN_2BYTES | IMAGE_SCN_CNT_INITIALIZED_DATA |
> - IMAGE_SCN_MEM_READ | IMAGE_SCN_MEM_WRITE)},
> - };
> - append(Buffer, SectionTable);
> -
> - // .idata$2
> - static const coff_import_directory_table_entry ImportDescriptor{
> - u32(0), u32(0), u32(0), u32(0), u32(0),
> - };
> - append(Buffer, ImportDescriptor);
> -
> - static const coff_relocation RelocationTable[NumberOfRelocations] = {
> - {u32(offsetof(coff_import_directory_table_entry, NameRVA)), u32(2),
> - u16(getImgRelRelocation())},
> - {u32(offsetof(coff_import_directory_table_entry,
> ImportLookupTableRVA)),
> - u32(3), u16(getImgRelRelocation())},
> - {u32(offsetof(coff_import_directory_table_entry,
> ImportAddressTableRVA)),
> - u32(4), u16(getImgRelRelocation())},
> - };
> - append(Buffer, RelocationTable);
> -
> - // .idata$6
> - auto S = Buffer.size();
> - Buffer.resize(S + DLLName.size() + 1);
> - memcpy(&Buffer[S], DLLName.data(), DLLName.size());
> - Buffer[S + DLLName.size()] = '\0';
> -
> - // Symbol Table
> - coff_symbol16 SymbolTable[NumberOfSymbols] = {
> - {{{0, 0, 0, 0, 0, 0, 0, 0}},
> - u32(0),
> - u16(1),
> - u16(0),
> - IMAGE_SYM_CLASS_EXTERNAL,
> - 0},
> - {{{'.', 'i', 'd', 'a', 't', 'a', '$', '2'}},
> - u32(0),
> - u16(1),
> - u16(0),
> - IMAGE_SYM_CLASS_SECTION,
> - 0},
> - {{{'.', 'i', 'd', 'a', 't', 'a', '$', '6'}},
> - u32(0),
> - u16(2),
> - u16(0),
> - IMAGE_SYM_CLASS_STATIC,
> - 0},
> - {{{'.', 'i', 'd', 'a', 't', 'a', '$', '4'}},
> - u32(0),
> - u16(0),
> - u16(0),
> - IMAGE_SYM_CLASS_SECTION,
> - 0},
> - {{{'.', 'i', 'd', 'a', 't', 'a', '$', '5'}},
> - u32(0),
> - u16(0),
> - u16(0),
> - IMAGE_SYM_CLASS_SECTION,
> - 0},
> - {{{0, 0, 0, 0, 0, 0, 0, 0}},
> - u32(0),
> - u16(0),
> - u16(0),
> - IMAGE_SYM_CLASS_EXTERNAL,
> - 0},
> - {{{0, 0, 0, 0, 0, 0, 0, 0}},
> - u32(0),
> - u16(0),
> - u16(0),
> - IMAGE_SYM_CLASS_EXTERNAL,
> - 0},
> - };
> - reinterpret_cast<StringTableOffset &>(SymbolTable[0].Name).Offset =
> - sizeof(uint32_t);
> - reinterpret_cast<StringTableOffset &>(SymbolTable[5].Name).Offset =
> - sizeof(uint32_t) + ImportDescriptorSymbolName.length() + 1;
> - reinterpret_cast<StringTableOffset &>(SymbolTable[6].Name).Offset =
> - sizeof(uint32_t) + ImportDescriptorSymbolName.length() + 1 +
> - NullImportDescriptorSymbolName.length() + 1;
> - append(Buffer, SymbolTable);
> -
> - // String Table
> - writeStringTable(Buffer,
> - {ImportDescriptorSymbolName,
> NullImportDescriptorSymbolName,
> - NullThunkSymbolName});
> -
> - StringRef F{reinterpret_cast<const char *>(Buffer.data()),
> Buffer.size()};
> - return {MemoryBufferRef(F, DLLName)};
> -}
> -
> -NewArchiveMember
> -ObjectFactory::createNullImportDescriptor(std::vector<uint8_t> &Buffer) {
> - static const uint32_t NumberOfSections = 1;
> - static const uint32_t NumberOfSymbols = 1;
> -
> - // COFF Header
> - coff_file_header Header{
> - u16(Config->Machine), u16(NumberOfSections), u32(0),
> - u32(sizeof(Header) + (NumberOfSections * sizeof(coff_section)) +
> - // .idata$3
> - sizeof(coff_import_directory_table_entry)),
> - u32(NumberOfSymbols), u16(0),
> - u16(is32bit() ? IMAGE_FILE_32BIT_MACHINE : 0),
> - };
> - append(Buffer, Header);
> -
> - // Section Header Table
> - static const coff_section SectionTable[NumberOfSections] = {
> - {{'.', 'i', 'd', 'a', 't', 'a', '$', '3'},
> - u32(0),
> - u32(0),
> - u32(sizeof(coff_import_directory_table_entry)),
> - u32(sizeof(coff_file_header) +
> - (NumberOfSections * sizeof(coff_section))),
> - u32(0),
> - u32(0),
> - u16(0),
> - u16(0),
> - u32(IMAGE_SCN_ALIGN_4BYTES | IMAGE_SCN_CNT_INITIALIZED_DATA |
> - IMAGE_SCN_MEM_READ | IMAGE_SCN_MEM_WRITE)},
> - };
> - append(Buffer, SectionTable);
> -
> - // .idata$3
> - static const coff_import_directory_table_entry ImportDescriptor{
> - u32(0), u32(0), u32(0), u32(0), u32(0),
> - };
> - append(Buffer, ImportDescriptor);
> -
> - // Symbol Table
> - coff_symbol16 SymbolTable[NumberOfSymbols] = {
> - {{{0, 0, 0, 0, 0, 0, 0, 0}},
> - u32(0),
> - u16(1),
> - u16(0),
> - IMAGE_SYM_CLASS_EXTERNAL,
> - 0},
> - };
> - reinterpret_cast<StringTableOffset &>(SymbolTable[0].Name).Offset =
> - sizeof(uint32_t);
> - append(Buffer, SymbolTable);
> -
> - // String Table
> - writeStringTable(Buffer, {NullImportDescriptorSymbolName});
> -
> - StringRef F{reinterpret_cast<const char *>(Buffer.data()),
> Buffer.size()};
> - return {MemoryBufferRef(F, DLLName)};
> -}
> -
> -NewArchiveMember ObjectFactory::createNullThunk(std::vector<uint8_t>
> &Buffer) {
> - static const uint32_t NumberOfSections = 2;
> - static const uint32_t NumberOfSymbols = 1;
> - uint32_t VASize = is32bit() ? 4 : 8;
> -
> - // COFF Header
> - coff_file_header Header{
> - u16(Config->Machine), u16(NumberOfSections), u32(0),
> - u32(sizeof(Header) + (NumberOfSections * sizeof(coff_section)) +
> - // .idata$5
> - VASize +
> - // .idata$4
> - VASize),
> - u32(NumberOfSymbols), u16(0),
> - u16(is32bit() ? IMAGE_FILE_32BIT_MACHINE : 0),
> - };
> - append(Buffer, Header);
> -
> - // Section Header Table
> - static const coff_section SectionTable[NumberOfSections] = {
> - {{'.', 'i', 'd', 'a', 't', 'a', '$', '5'},
> - u32(0),
> - u32(0),
> - u32(VASize),
> - u32(sizeof(coff_file_header) + NumberOfSections *
> sizeof(coff_section)),
> - u32(0),
> - u32(0),
> - u16(0),
> - u16(0),
> - u32((is32bit() ? IMAGE_SCN_ALIGN_4BYTES : IMAGE_SCN_ALIGN_8BYTES) |
> - IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_READ |
> - IMAGE_SCN_MEM_WRITE)},
> - {{'.', 'i', 'd', 'a', 't', 'a', '$', '4'},
> - u32(0),
> - u32(0),
> - u32(VASize),
> - u32(sizeof(coff_file_header) + NumberOfSections *
> sizeof(coff_section) +
> - VASize),
> - u32(0),
> - u32(0),
> - u16(0),
> - u16(0),
> - u32((is32bit() ? IMAGE_SCN_ALIGN_4BYTES : IMAGE_SCN_ALIGN_8BYTES) |
> - IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_READ |
> - IMAGE_SCN_MEM_WRITE)},
> - };
> - append(Buffer, SectionTable);
> -
> - // .idata$5, ILT
> - append(Buffer, u32(0));
> - if (!is32bit())
> - append(Buffer, u32(0));
> -
> - // .idata$4, IAT
> - append(Buffer, u32(0));
> - if (!is32bit())
> - append(Buffer, u32(0));
> -
> - // Symbol Table
> - coff_symbol16 SymbolTable[NumberOfSymbols] = {
> - {{{0, 0, 0, 0, 0, 0, 0, 0}},
> - u32(0),
> - u16(1),
> - u16(0),
> - IMAGE_SYM_CLASS_EXTERNAL,
> - 0},
> - };
> - reinterpret_cast<StringTableOffset &>(SymbolTable[0].Name).Offset =
> - sizeof(uint32_t);
> - append(Buffer, SymbolTable);
> -
> - // String Table
> - writeStringTable(Buffer, {NullThunkSymbolName});
> -
> - StringRef F{reinterpret_cast<const char *>(Buffer.data()),
> Buffer.size()};
> - return {MemoryBufferRef{F, DLLName}};
> -}
> -
> -NewArchiveMember ObjectFactory::createShortImport(StringRef Sym,
> - uint16_t Ordinal,
> - ImportType ImportType,
> - ImportNameType
> NameType) {
> - size_t ImpSize = DLLName.size() + Sym.size() + 2; // +2 for NULs
> - size_t Size = sizeof(coff_import_header) + ImpSize;
> - char *Buf = Alloc.Allocate<char>(Size);
> - memset(Buf, 0, Size);
> - char *P = Buf;
> -
> - // Write short import library.
> - auto *Imp = reinterpret_cast<coff_import_header *>(P);
> - P += sizeof(*Imp);
> - Imp->Sig2 = 0xFFFF;
> - Imp->Machine = Config->Machine;
> - Imp->SizeOfData = ImpSize;
> - if (Ordinal > 0)
> - Imp->OrdinalHint = Ordinal;
> - Imp->TypeInfo = (NameType << 2) | ImportType;
> -
> - // Write symbol name and DLL name.
> - memcpy(P, Sym.data(), Sym.size());
> - P += Sym.size() + 1;
> - memcpy(P, DLLName.data(), DLLName.size());
> -
> - return {MemoryBufferRef(StringRef(Buf, Size), DLLName)};
> -}
> -
> -// Creates an import library for a DLL. In this function, we first
> -// create an empty import library using lib.exe and then adds short
> -// import files to that file.
> -void lld::coff::writeImportLibrary() {
> - std::vector<NewArchiveMember> Members;
> -
> - std::string Path = getImplibPath();
> - std::string DLLName = sys::path::filename(Config->OutputFile);
> - ObjectFactory OF(DLLName);
> -
> - std::vector<uint8_t> ImportDescriptor;
> - Members.push_back(OF.createImportDescriptor(ImportDescriptor));
> -
> - std::vector<uint8_t> NullImportDescriptor;
> - Members.push_back(OF.createNullImportDescriptor(NullImportDescriptor));
> -
> - std::vector<uint8_t> NullThunk;
> - Members.push_back(OF.createNullThunk(NullThunk));
> -
> - for (Export &E : Config->Exports) {
> - if (E.Private)
> - continue;
> -
> - ImportType ImportType = IMPORT_CODE;
> - if (E.Data)
> - ImportType = IMPORT_DATA;
> - if (E.Constant)
> - ImportType = IMPORT_CONST;
> -
> - ImportNameType NameType = getNameType(E.SymbolName, E.Name);
> - std::string Name = E.ExtName.empty()
> - ? std::string(E.SymbolName)
> - : replace(E.SymbolName, E.Name, E.ExtName);
> - Members.push_back(OF.createShortImport(Name, E.Ordinal, ImportType,
> - NameType));
> - }
> -
> - std::pair<StringRef, std::error_code> Result =
> - writeArchive(Path, Members, /*WriteSymtab*/ true,
> object::Archive::K_GNU,
> - /*Deterministic*/ true, /*Thin*/ false);
> - if (auto EC = Result.second)
> - fatal(EC, "failed to write " + Path);
> -}
>
> Removed: lld/trunk/COFF/ModuleDef.cpp
> URL: http://llvm.org/viewvc/llvm-project/lld/trunk/COFF/
> ModuleDef.cpp?rev=303490&view=auto
> ============================================================
> ==================
> --- lld/trunk/COFF/ModuleDef.cpp (original)
> +++ lld/trunk/COFF/ModuleDef.cpp (removed)
> @@ -1,304 +0,0 @@
> -//===- COFF/ModuleDef.cpp ------------------------------
> -------------------===//
> -//
> -// The LLVM Linker
> -//
> -// This file is distributed under the University of Illinois Open Source
> -// License. See LICENSE.TXT for details.
> -//
> -//===------------------------------------------------------
> ----------------===//
> -//
> -// Windows-specific.
> -// A parser for the module-definition file (.def file).
> -// Parsed results are directly written to Config global variable.
> -//
> -// The format of module-definition files are described in this document:
> -// https://msdn.microsoft.com/en-us/library/28d6s79h.aspx
> -//
> -//===------------------------------------------------------
> ----------------===//
> -
> -#include "Config.h"
> -#include "Error.h"
> -#include "Memory.h"
> -#include "llvm/ADT/StringRef.h"
> -#include "llvm/ADT/StringSwitch.h"
> -#include "llvm/Support/StringSaver.h"
> -#include "llvm/Support/raw_ostream.h"
> -#include <system_error>
> -
> -using namespace llvm;
> -
> -namespace lld {
> -namespace coff {
> -namespace {
> -
> -enum Kind {
> - Unknown,
> - Eof,
> - Identifier,
> - Comma,
> - Equal,
> - KwBase,
> - KwConstant,
> - KwData,
> - KwExports,
> - KwHeapsize,
> - KwLibrary,
> - KwName,
> - KwNoname,
> - KwPrivate,
> - KwStacksize,
> - KwVersion,
> -};
> -
> -struct Token {
> - explicit Token(Kind T = Unknown, StringRef S = "") : K(T), Value(S) {}
> - Kind K;
> - StringRef Value;
> -};
> -
> -static bool isDecorated(StringRef Sym) {
> - return Sym.startswith("_") || Sym.startswith("@") ||
> Sym.startswith("?");
> -}
> -
> -class Lexer {
> -public:
> - explicit Lexer(StringRef S) : Buf(S) {}
> -
> - Token lex() {
> - Buf = Buf.trim();
> - if (Buf.empty())
> - return Token(Eof);
> -
> - switch (Buf[0]) {
> - case '\0':
> - return Token(Eof);
> - case ';': {
> - size_t End = Buf.find('\n');
> - Buf = (End == Buf.npos) ? "" : Buf.drop_front(End);
> - return lex();
> - }
> - case '=':
> - Buf = Buf.drop_front();
> - return Token(Equal, "=");
> - case ',':
> - Buf = Buf.drop_front();
> - return Token(Comma, ",");
> - case '"': {
> - StringRef S;
> - std::tie(S, Buf) = Buf.substr(1).split('"');
> - return Token(Identifier, S);
> - }
> - default: {
> - size_t End = Buf.find_first_of("=,\r\n \t\v");
> - StringRef Word = Buf.substr(0, End);
> - Kind K = llvm::StringSwitch<Kind>(Word)
> - .Case("BASE", KwBase)
> - .Case("CONSTANT", KwConstant)
> - .Case("DATA", KwData)
> - .Case("EXPORTS", KwExports)
> - .Case("HEAPSIZE", KwHeapsize)
> - .Case("LIBRARY", KwLibrary)
> - .Case("NAME", KwName)
> - .Case("NONAME", KwNoname)
> - .Case("PRIVATE", KwPrivate)
> - .Case("STACKSIZE", KwStacksize)
> - .Case("VERSION", KwVersion)
> - .Default(Identifier);
> - Buf = (End == Buf.npos) ? "" : Buf.drop_front(End);
> - return Token(K, Word);
> - }
> - }
> - }
> -
> -private:
> - StringRef Buf;
> -};
> -
> -class Parser {
> -public:
> - explicit Parser(StringRef S) : Lex(S) {}
> -
> - void parse() {
> - do {
> - parseOne();
> - } while (Tok.K != Eof);
> - }
> -
> -private:
> - void read() {
> - if (Stack.empty()) {
> - Tok = Lex.lex();
> - return;
> - }
> - Tok = Stack.back();
> - Stack.pop_back();
> - }
> -
> - void readAsInt(uint64_t *I) {
> - read();
> - if (Tok.K != Identifier || Tok.Value.getAsInteger(10, *I))
> - fatal("integer expected");
> - }
> -
> - void expect(Kind Expected, StringRef Msg) {
> - read();
> - if (Tok.K != Expected)
> - fatal(Msg);
> - }
> -
> - void unget() { Stack.push_back(Tok); }
> -
> - void parseOne() {
> - read();
> - switch (Tok.K) {
> - case Eof:
> - return;
> - case KwExports:
> - for (;;) {
> - read();
> - if (Tok.K != Identifier) {
> - unget();
> - return;
> - }
> - parseExport();
> - }
> - case KwHeapsize:
> - parseNumbers(&Config->HeapReserve, &Config->HeapCommit);
> - return;
> - case KwStacksize:
> - parseNumbers(&Config->StackReserve, &Config->StackCommit);
> - return;
> - case KwLibrary:
> - case KwName: {
> - bool IsDll = Tok.K == KwLibrary; // Check before parseName.
> - std::string Name;
> - parseName(&Name, &Config->ImageBase);
> -
> - // Append the appropriate file extension if not already present.
> - StringRef Ext = IsDll ? ".dll" : ".exe";
> - if (!StringRef(Name).endswith_lower(Ext))
> - Name += Ext;
> -
> - // Set the output file, but don't override /out if it was already
> passed.
> - if (Config->OutputFile.empty())
> - Config->OutputFile = Name;
> - return;
> - }
> - case KwVersion:
> - parseVersion(&Config->MajorImageVersion,
> &Config->MinorImageVersion);
> - return;
> - default:
> - fatal("unknown directive: " + Tok.Value);
> - }
> - }
> -
> - void parseExport() {
> - Export E;
> - E.Name = Tok.Value;
> - read();
> - if (Tok.K == Equal) {
> - read();
> - if (Tok.K != Identifier)
> - fatal("identifier expected, but got " + Tok.Value);
> - E.ExtName = E.Name;
> - E.Name = Tok.Value;
> - } else {
> - unget();
> - }
> -
> - if (Config->Machine == I386) {
> - if (!isDecorated(E.Name))
> - E.Name = Saver.save("_" + E.Name);
> - if (!E.ExtName.empty() && !isDecorated(E.ExtName))
> - E.ExtName = Saver.save("_" + E.ExtName);
> - }
> -
> - for (;;) {
> - read();
> - if (Tok.K == Identifier && Tok.Value[0] == '@') {
> - Tok.Value.drop_front().getAsInteger(10, E.Ordinal);
> - read();
> - if (Tok.K == KwNoname) {
> - E.Noname = true;
> - } else {
> - unget();
> - }
> - continue;
> - }
> - if (Tok.K == KwData) {
> - E.Data = true;
> - continue;
> - }
> - if (Tok.K == KwConstant) {
> - warn("CONSTANT keyword is obsolete; use DATA");
> - E.Constant = true;
> - continue;
> - }
> - if (Tok.K == KwPrivate) {
> - E.Private = true;
> - continue;
> - }
> - unget();
> - Config->Exports.push_back(E);
> - return;
> - }
> - }
> -
> - // HEAPSIZE/STACKSIZE reserve[,commit]
> - void parseNumbers(uint64_t *Reserve, uint64_t *Commit) {
> - readAsInt(Reserve);
> - read();
> - if (Tok.K != Comma) {
> - unget();
> - Commit = nullptr;
> - return;
> - }
> - readAsInt(Commit);
> - }
> -
> - // NAME outputPath [BASE=address]
> - void parseName(std::string *Out, uint64_t *Baseaddr) {
> - read();
> - if (Tok.K == Identifier) {
> - *Out = Tok.Value;
> - } else {
> - *Out = "";
> - unget();
> - return;
> - }
> - read();
> - if (Tok.K == KwBase) {
> - expect(Equal, "'=' expected");
> - readAsInt(Baseaddr);
> - } else {
> - unget();
> - *Baseaddr = 0;
> - }
> - }
> -
> - // VERSION major[.minor]
> - void parseVersion(uint32_t *Major, uint32_t *Minor) {
> - read();
> - if (Tok.K != Identifier)
> - fatal("identifier expected, but got " + Tok.Value);
> - StringRef V1, V2;
> - std::tie(V1, V2) = Tok.Value.split('.');
> - if (V1.getAsInteger(10, *Major))
> - fatal("integer expected, but got " + Tok.Value);
> - if (V2.empty())
> - *Minor = 0;
> - else if (V2.getAsInteger(10, *Minor))
> - fatal("integer expected, but got " + Tok.Value);
> - }
> -
> - Lexer Lex;
> - Token Tok;
> - std::vector<Token> Stack;
> -};
> -
> -} // anonymous namespace
> -
> -void parseModuleDefs(MemoryBufferRef MB) { Parser(MB.getBuffer()).parse();
> }
> -
> -} // namespace coff
> -} // namespace lld
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at lists.llvm.org
> http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20170520/e09e29f6/attachment-0001.html>
More information about the llvm-commits
mailing list