<div dir="ltr">Hello Martell,<br><br>This commit added some warnings, please take care of these?<br><br>Thanks<br><br>Galina<br><br><br>/home/buildslave/am1i-slv2/builddir/llvm/lib/Object/COFFImportFile.cpp: In member function ‘llvm::NewArchiveMember llvm::object::{anonymous}::ObjectFactory::createImportDescriptor(std::vector<unsigned char, std::allocator<unsigned char> >&)’:<br>/home/buildslave/am1i-slv2/builddir/llvm/lib/Object/COFFImportFile.cpp:288:60: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing]<br> reinterpret_cast<StringTableOffset &>(SymbolTable[0].Name).Offset =<br> ^<br>/home/buildslave/am1i-slv2/builddir/llvm/lib/Object/COFFImportFile.cpp:290:60: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing]<br> reinterpret_cast<StringTableOffset &>(SymbolTable[5].Name).Offset =<br> ^<br>/home/buildslave/am1i-slv2/builddir/llvm/lib/Object/COFFImportFile.cpp:292:60: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing]<br> reinterpret_cast<StringTableOffset &>(SymbolTable[6].Name).Offset =<br> ^<br>/home/buildslave/am1i-slv2/builddir/llvm/lib/Object/COFFImportFile.cpp: In member function ‘llvm::NewArchiveMember llvm::object::{anonymous}::ObjectFactory::createNullImportDescriptor(std::vector<unsigned char, std::allocator<unsigned char> >&)’:<br>/home/buildslave/am1i-slv2/builddir/llvm/lib/Object/COFFImportFile.cpp:357:60: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing]<br> reinterpret_cast<StringTableOffset &>(SymbolTable[0].Name).Offset =<br> ^<br>/home/buildslave/am1i-slv2/builddir/llvm/lib/Object/COFFImportFile.cpp: In member function ‘llvm::NewArchiveMember llvm::object::{anonymous}::ObjectFactory::createNullThunk(std::vector<unsigned char, std::allocator<unsigned char> >&)’:<br>/home/buildslave/am1i-slv2/builddir/llvm/lib/Object/COFFImportFile.cpp:440:60: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing]<br> reinterpret_cast<StringTableOffset &>(SymbolTable[0].Name).Offset =<br> ^<br><br></div><div class="gmail_extra"><br><div class="gmail_quote">On Sat, May 20, 2017 at 12: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:29 2017<br>
New Revision: 303490<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=303490&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project?rev=303490&view=rev</a><br>
Log:<br>
COFF: migrate def parser from LLD to LLVM [1/2]<br>
<br>
This is split up into two commits.<br>
The will create the DEF parser in LLVM.<br>
Check the following commit to see the removal from LLD<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>
Added:<br>
llvm/trunk/include/llvm/<wbr>Object/COFFModuleDefinition.h<br>
llvm/trunk/lib/Object/<wbr>COFFImportFile.cpp<br>
llvm/trunk/lib/Object/<wbr>COFFModuleDefinition.cpp<br>
Modified:<br>
llvm/trunk/include/llvm/<wbr>Object/COFFImportFile.h<br>
llvm/trunk/lib/Object/<wbr>CMakeLists.txt<br>
<br>
Modified: llvm/trunk/include/llvm/<wbr>Object/COFFImportFile.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Object/COFFImportFile.h?rev=303490&r1=303489&r2=303490&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/llvm/trunk/include/<wbr>llvm/Object/COFFImportFile.h?<wbr>rev=303490&r1=303489&r2=<wbr>303490&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- llvm/trunk/include/llvm/<wbr>Object/COFFImportFile.h (original)<br>
+++ llvm/trunk/include/llvm/<wbr>Object/COFFImportFile.h Sat May 20 14:56:29 2017<br>
@@ -9,13 +9,15 @@<br>
//<br>
// COFF short import file is a special kind of file which contains<br>
// only symbol names for DLL-exported symbols. This class implements<br>
-// SymbolicFile interface for the file.<br>
+// exporting of Symbols to create libraries and a SymbolicFile<br>
+// interface for the file type.<br>
//<br>
//===-------------------------<wbr>------------------------------<wbr>---------------===//<br>
<br>
#ifndef LLVM_OBJECT_COFF_IMPORT_FILE_H<br>
#define LLVM_OBJECT_COFF_IMPORT_FILE_H<br>
<br>
+#include "llvm/ADT/ArrayRef.h"<br>
#include "llvm/Object/COFF.h"<br>
#include "llvm/Object/IRObjectFile.h"<br>
#include "llvm/Object/ObjectFile.h"<br>
@@ -68,6 +70,36 @@ private:<br>
}<br>
};<br>
<br>
+struct COFFShortExport {<br>
+ std::string Name;<br>
+ std::string ExtName;<br>
+<br>
+ uint16_t Ordinal = 0;<br>
+ bool Noname = false;<br>
+ bool Data = false;<br>
+ bool Private = false;<br>
+ bool Constant = false;<br>
+<br>
+ bool isWeak() {<br>
+ return ExtName.size() && ExtName != Name;<br>
+ }<br>
+<br>
+ friend bool operator==(const COFFShortExport &L, const COFFShortExport &R) {<br>
+ return L.Name == R.Name && L.ExtName == R.ExtName &&<br>
+ L.Ordinal == R.Ordinal && L.Noname == R.Noname &&<br>
+ L.Data == R.Data && L.Private == R.Private;<br>
+ }<br>
+<br>
+ friend bool operator!=(const COFFShortExport &L, const COFFShortExport &R) {<br>
+ return !(L == R);<br>
+ }<br>
+};<br>
+<br>
+std::error_code writeImportLibrary(StringRef DLLName,<br>
+ StringRef Path,<br>
+ ArrayRef<COFFShortExport> Exports,<br>
+ COFF::MachineTypes Machine);<br>
+<br>
} // namespace object<br>
} // namespace llvm<br>
<br>
<br>
Added: llvm/trunk/include/llvm/<wbr>Object/COFFModuleDefinition.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Object/COFFModuleDefinition.h?rev=303490&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/llvm/trunk/include/<wbr>llvm/Object/<wbr>COFFModuleDefinition.h?rev=<wbr>303490&view=auto</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- llvm/trunk/include/llvm/<wbr>Object/COFFModuleDefinition.h (added)<br>
+++ llvm/trunk/include/llvm/<wbr>Object/COFFModuleDefinition.h Sat May 20 14:56:29 2017<br>
@@ -0,0 +1,49 @@<br>
+//===--- COFFModuleDefinition.h ------------------------------<wbr>---*- C++ -*-===//<br>
+//<br>
+// The LLVM Compiler Infrastructure<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>
+<br>
+#ifndef LLVM_OBJECT_COFF_MODULE_<wbr>DEFINITION_H<br>
+#define LLVM_OBJECT_COFF_MODULE_<wbr>DEFINITION_H<br>
+<br>
+#include "llvm/Object/COFFImportFile.h"<br>
+#include "llvm/Object/COFF.h"<br>
+<br>
+namespace llvm {<br>
+namespace object {<br>
+<br>
+struct COFFModuleDefinition {<br>
+ std::vector<COFFShortExport> Exports;<br>
+ std::string OutputFile;<br>
+ uint64_t ImageBase = 0;<br>
+ uint64_t StackReserve = 0;<br>
+ uint64_t StackCommit = 0;<br>
+ uint64_t HeapReserve = 0;<br>
+ uint64_t HeapCommit = 0;<br>
+ uint32_t MajorImageVersion = 0;<br>
+ uint32_t MinorImageVersion = 0;<br>
+ uint32_t MajorOSVersion = 0;<br>
+ uint32_t MinorOSVersion = 0;<br>
+};<br>
+<br>
+Expected<<wbr>COFFModuleDefinition><br>
+parseCOFFModuleDefinition(<wbr>MemoryBufferRef MB, COFF::MachineTypes Machine);<br>
+<br>
+} // End namespace object.<br>
+} // End namespace llvm.<br>
+<br>
+#endif<br>
<br>
Modified: llvm/trunk/lib/Object/<wbr>CMakeLists.txt<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Object/CMakeLists.txt?rev=303490&r1=303489&r2=303490&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/llvm/trunk/lib/Object/<wbr>CMakeLists.txt?rev=303490&r1=<wbr>303489&r2=303490&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- llvm/trunk/lib/Object/<wbr>CMakeLists.txt (original)<br>
+++ llvm/trunk/lib/Object/<wbr>CMakeLists.txt Sat May 20 14:56:29 2017<br>
@@ -2,6 +2,8 @@ add_llvm_library(LLVMObject<br>
Archive.cpp<br>
ArchiveWriter.cpp<br>
Binary.cpp<br>
+ COFFImportFile.cpp<br>
+ COFFModuleDefinition.cpp<br>
COFFObjectFile.cpp<br>
Decompressor.cpp<br>
ELF.cpp<br>
<br>
Added: llvm/trunk/lib/Object/<wbr>COFFImportFile.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Object/COFFImportFile.cpp?rev=303490&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/llvm/trunk/lib/Object/<wbr>COFFImportFile.cpp?rev=303490&<wbr>view=auto</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- llvm/trunk/lib/Object/<wbr>COFFImportFile.cpp (added)<br>
+++ llvm/trunk/lib/Object/<wbr>COFFImportFile.cpp Sat May 20 14:56:29 2017<br>
@@ -0,0 +1,527 @@<br>
+//===- COFFImportFile.cpp - COFF short import file implementation ---------===//<br>
+//<br>
+// The LLVM Compiler Infrastructure<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 defines the writeImportLibrary function.<br>
+//<br>
+//===------------------------<wbr>------------------------------<wbr>----------------===//<br>
+<br>
+#include "llvm/Object/COFFImportFile.h"<br>
+#include "llvm/ADT/ArrayRef.h"<br>
+#include "llvm/Object/Archive.h"<br>
+#include "llvm/Object/ArchiveWriter.h"<br>
+#include "llvm/Object/COFF.h"<br>
+#include "llvm/Support/Error.h"<br>
+#include "llvm/Support/Path.h"<br>
+<br>
+#include <cstdint><br>
+#include <map><br>
+#include <set><br>
+#include <string><br>
+#include <vector><br>
+<br>
+using namespace llvm::COFF;<br>
+using namespace llvm::object;<br>
+using namespace llvm;<br>
+<br>
+namespace llvm {<br>
+namespace object {<br>
+<br>
+static bool is32bit(MachineTypes Machine) {<br>
+ switch (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(<wbr>MachineTypes Machine) {<br>
+ switch (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>
+ size_t Pos = B.size();<br>
+ size_t 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>
+ support::endian::write32le(&B[<wbr>Offset], Length);<br>
+}<br>
+<br>
+static ImportNameType getNameType(StringRef Sym, StringRef ExtName,<br>
+ MachineTypes Machine) {<br>
+ if (Sym != ExtName)<br>
+ return IMPORT_NAME_UNDECORATE;<br>
+ if (Machine == IMAGE_FILE_MACHINE_I386 && Sym.startswith("_"))<br>
+ return IMPORT_NAME_NOPREFIX;<br>
+ return IMPORT_NAME;<br>
+}<br>
+<br>
+static Expected<std::string> replace(StringRef S, StringRef From,<br>
+ 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>
+ return make_error<StringError>(<br>
+ Twine(S + ": replacing '" + From + "' with '" + To + "' failed")<br>
+ .getSingleStringRef(), object_error::parse_failed);<br>
+ }<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>
+ MachineTypes Machine;<br>
+ BumpPtrAllocator Alloc;<br>
+ StringRef DLLName;<br>
+ StringRef Library;<br>
+ std::string ImportDescriptorSymbolName;<br>
+ std::string NullThunkSymbolName;<br>
+<br>
+public:<br>
+ ObjectFactory(StringRef S, MachineTypes M)<br>
+ : Machine(M), 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>
+} // namespace<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(Machine),<br>
+ u16(NumberOfSections),<br>
+ 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),<br>
+ u16(0),<br>
+ u16(is32bit(Machine) ? 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(<wbr>Machine))},<br>
+ {u32(offsetof(coff_import_<wbr>directory_table_entry, ImportLookupTableRVA)),<br>
+ u32(3), u16(getImgRelRelocation(<wbr>Machine))},<br>
+ {u32(offsetof(coff_import_<wbr>directory_table_entry, ImportAddressTableRVA)),<br>
+ u32(4), u16(getImgRelRelocation(<wbr>Machine))},<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(Machine),<br>
+ u16(NumberOfSections),<br>
+ u32(0),<br>
+ u32(sizeof(Header) + (NumberOfSections * sizeof(coff_section)) +<br>
+ // .idata$3<br>
+ sizeof(coff_import_directory_<wbr>table_entry)),<br>
+ u32(NumberOfSymbols),<br>
+ u16(0),<br>
+ u16(is32bit(Machine) ? 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(Machine) ? 4 : 8;<br>
+<br>
+ // COFF Header<br>
+ coff_file_header Header{<br>
+ u16(Machine),<br>
+ u16(NumberOfSections),<br>
+ u32(0),<br>
+ u32(sizeof(Header) + (NumberOfSections * sizeof(coff_section)) +<br>
+ // .idata$5<br>
+ VASize +<br>
+ // .idata$4<br>
+ VASize),<br>
+ u32(NumberOfSymbols),<br>
+ u16(0),<br>
+ u16(is32bit(Machine) ? 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(Machine) ? IMAGE_SCN_ALIGN_4BYTES<br>
+ : 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(Machine) ? IMAGE_SCN_ALIGN_4BYTES<br>
+ : 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(Machine))<br>
+ append(Buffer, u32(0));<br>
+<br>
+ // .idata$4, IAT<br>
+ append(Buffer, u32(0));<br>
+ if (!is32bit(Machine))<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 = 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>
+std::error_code writeImportLibrary(StringRef DLLName, StringRef Path,<br>
+ ArrayRef<COFFShortExport> Exports,<br>
+ MachineTypes Machine) {<br>
+<br>
+ std::vector<NewArchiveMember> Members;<br>
+ ObjectFactory OF(llvm::sys::path::filename(<wbr>DLLName), Machine);<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 (COFFShortExport E : 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>
+ StringRef SymbolName = E.isWeak() ? E.ExtName : E.Name;<br>
+ ImportNameType NameType = getNameType(SymbolName, E.Name, Machine);<br>
+ Expected<std::string> Name = E.ExtName.empty()<br>
+ ? SymbolName<br>
+ : replace(SymbolName, E.Name, E.ExtName);<br>
+<br>
+ if (!Name) {<br>
+ return errorToErrorCode(Name.<wbr>takeError());<br>
+ }<br>
+<br>
+ Members.push_back(<br>
+ OF.createShortImport(*Name, E.Ordinal, ImportType, 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>
+<br>
+ return Result.second;<br>
+}<br>
+<br>
+} // namespace object<br>
+} // namespace llvm<br>
<br>
Added: llvm/trunk/lib/Object/<wbr>COFFModuleDefinition.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Object/COFFModuleDefinition.cpp?rev=303490&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/llvm/trunk/lib/Object/<wbr>COFFModuleDefinition.cpp?rev=<wbr>303490&view=auto</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- llvm/trunk/lib/Object/<wbr>COFFModuleDefinition.cpp (added)<br>
+++ llvm/trunk/lib/Object/<wbr>COFFModuleDefinition.cpp Sat May 20 14:56:29 2017<br>
@@ -0,0 +1,319 @@<br>
+//===--- COFFModuleDefinition.cpp - Simple DEF parser ---------------------===//<br>
+//<br>
+// The LLVM Compiler Infrastructure<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>
+//<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 "llvm/Object/<wbr>COFFModuleDefinition.h"<br>
+#include "llvm/ADT/StringRef.h"<br>
+#include "llvm/ADT/StringSwitch.h"<br>
+#include "llvm/Object/COFF.h"<br>
+#include "llvm/Object/COFFImportFile.h"<br>
+#include "llvm/Object/Error.h"<br>
+#include "llvm/Support/Error.h"<br>
+#include "llvm/Support/raw_ostream.h"<br>
+<br>
+using namespace llvm::COFF;<br>
+using namespace llvm;<br>
+<br>
+namespace llvm {<br>
+namespace object {<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>
+static Error createError(const Twine &Err) {<br>
+ return make_error<StringError>(Err.<wbr>getSingleStringRef(),<br>
+ object_error::parse_failed);<br>
+}<br>
+<br>
+class Lexer {<br>
+public:<br>
+ 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, MachineTypes M) : Lex(S), Machine(M) {}<br>
+<br>
+ Expected<COFFModuleDefinition> parse() {<br>
+ do {<br>
+ if (Error Err = parseOne())<br>
+ return std::move(Err);<br>
+ } while (Tok.K != Eof);<br>
+ return Info;<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>
+ Error readAsInt(uint64_t *I) {<br>
+ read();<br>
+ if (Tok.K != Identifier || Tok.Value.getAsInteger(10, *I))<br>
+ return createError("integer expected");<br>
+ return Error::success();<br>
+ }<br>
+<br>
+ Error expect(Kind Expected, StringRef Msg) {<br>
+ read();<br>
+ if (Tok.K != Expected)<br>
+ return createError(Msg);<br>
+ return Error::success();<br>
+ }<br>
+<br>
+ void unget() { Stack.push_back(Tok); }<br>
+<br>
+ Error parseOne() {<br>
+ read();<br>
+ switch (Tok.K) {<br>
+ case Eof:<br>
+ return Error::success();<br>
+ case KwExports:<br>
+ for (;;) {<br>
+ read();<br>
+ if (Tok.K != Identifier) {<br>
+ unget();<br>
+ return Error::success();<br>
+ }<br>
+ if (Error Err = parseExport())<br>
+ return Err;<br>
+ }<br>
+ case KwHeapsize:<br>
+ return parseNumbers(&Info.<wbr>HeapReserve, &Info.HeapCommit);<br>
+ case KwStacksize:<br>
+ return parseNumbers(&Info.<wbr>StackReserve, &Info.StackCommit);<br>
+ case KwLibrary:<br>
+ case KwName: {<br>
+ bool IsDll = Tok.K == KwLibrary; // Check before parseName.<br>
+ std::string Name;<br>
+ if (Error Err = parseName(&Name, &Info.ImageBase))<br>
+ return Err;<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 (Info.OutputFile.empty())<br>
+ Info.OutputFile = Name;<br>
+ return Error::success();<br>
+ }<br>
+ case KwVersion:<br>
+ return parseVersion(&Info.<wbr>MajorImageVersion, &Info.MinorImageVersion);<br>
+ default:<br>
+ return createError("unknown directive: " + Tok.Value);<br>
+ }<br>
+ }<br>
+<br>
+ Error parseExport() {<br>
+ COFFShortExport E;<br>
+ E.Name = Tok.Value;<br>
+ read();<br>
+ if (Tok.K == Equal) {<br>
+ read();<br>
+ if (Tok.K != Identifier)<br>
+ return createError("identifier expected, but got " + Tok.Value);<br>
+ E.ExtName = E.Name;<br>
+ E.Name = Tok.Value;<br>
+ } else {<br>
+ unget();<br>
+ }<br>
+<br>
+ if (Machine == IMAGE_FILE_MACHINE_I386) {<br>
+ if (!isDecorated(E.Name))<br>
+ E.Name = (std::string("_").append(E.<wbr>Name));<br>
+ if (!E.ExtName.empty() && !isDecorated(E.ExtName))<br>
+ E.ExtName = (std::string("_").append(E.<wbr>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>
+ E.Constant = true;<br>
+ continue;<br>
+ }<br>
+ if (Tok.K == KwPrivate) {<br>
+ E.Private = true;<br>
+ continue;<br>
+ }<br>
+ unget();<br>
+ Info.Exports.push_back(E);<br>
+ return Error::success();<br>
+ }<br>
+ }<br>
+<br>
+ // HEAPSIZE/STACKSIZE reserve[,commit]<br>
+ Error parseNumbers(uint64_t *Reserve, uint64_t *Commit) {<br>
+ if (Error Err = readAsInt(Reserve))<br>
+ return Err;<br>
+ read();<br>
+ if (Tok.K != Comma) {<br>
+ unget();<br>
+ Commit = nullptr;<br>
+ return Error::success();<br>
+ }<br>
+ if (Error Err = readAsInt(Commit))<br>
+ return Err;<br>
+ return Error::success();<br>
+ }<br>
+<br>
+ // NAME outputPath [BASE=address]<br>
+ Error 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 Error::success();<br>
+ }<br>
+ read();<br>
+ if (Tok.K == KwBase) {<br>
+ if (Error Err = expect(Equal, "'=' expected"))<br>
+ return Err;<br>
+ if (Error Err = readAsInt(Baseaddr))<br>
+ return Err;<br>
+ } else {<br>
+ unget();<br>
+ *Baseaddr = 0;<br>
+ }<br>
+ return Error::success();<br>
+ }<br>
+<br>
+ // VERSION major[.minor]<br>
+ Error parseVersion(uint32_t *Major, uint32_t *Minor) {<br>
+ read();<br>
+ if (Tok.K != Identifier)<br>
+ return createError("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>
+ return createError("integer expected, but got " + Tok.Value);<br>
+ if (V2.empty())<br>
+ *Minor = 0;<br>
+ else if (V2.getAsInteger(10, *Minor))<br>
+ return createError("integer expected, but got " + Tok.Value);<br>
+ return Error::success();<br>
+ }<br>
+<br>
+ Lexer Lex;<br>
+ Token Tok;<br>
+ std::vector<Token> Stack;<br>
+ MachineTypes Machine;<br>
+ COFFModuleDefinition Info;<br>
+};<br>
+<br>
+Expected<<wbr>COFFModuleDefinition> parseCOFFModuleDefinition(<wbr>MemoryBufferRef MB,<br>
+ MachineTypes Machine) {<br>
+ return Parser(MB.getBuffer(), Machine).parse();<br>
+}<br>
+<br>
+} // namespace object<br>
+} // namespace llvm<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>