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