From e8402a23ca2f78f2564e8aba54a2eec00519dab9 Mon Sep 17 00:00:00 2001 From: Rui Ueyama Date: Fri, 28 Aug 2015 05:47:46 +0000 Subject: [PATCH] Object: Teach llvm-ar to create symbol table for COFF short import files. COFF short import files are special kind of files that contains only DLL-exported symbol names. That's different from object files because it has no data except symbol names. This change implements a SymbolicFile interface for the short import files so that symbol names can be accessed through that interface. llvm-ar is now able to read the file and create symbol table entries for short import files. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@246276 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Object/SymbolicFile.cpp | 47 +++++++++++++++++++++- test/Object/Inputs/coff-short-import-code | Bin 0 -> 31 bytes test/Object/Inputs/coff-short-import-data | Bin 0 -> 31 bytes test/Object/archive-symtab.test | 10 +++++ 4 files changed, 56 insertions(+), 1 deletion(-) create mode 100644 test/Object/Inputs/coff-short-import-code create mode 100644 test/Object/Inputs/coff-short-import-data diff --git a/lib/Object/SymbolicFile.cpp b/lib/Object/SymbolicFile.cpp index 854e68e40f4..c3106319c7f 100644 --- a/lib/Object/SymbolicFile.cpp +++ b/lib/Object/SymbolicFile.cpp @@ -11,14 +11,58 @@ // //===----------------------------------------------------------------------===// +#include "llvm/Object/COFF.h" #include "llvm/Object/IRObjectFile.h" #include "llvm/Object/ObjectFile.h" #include "llvm/Object/SymbolicFile.h" +#include "llvm/Support/COFF.h" #include "llvm/Support/MemoryBuffer.h" using namespace llvm; using namespace object; +// COFF short import file is a special kind of file which contains +// only symbol names for DLL-exported symbols. This class implements +// SymbolicFile interface for the file. +namespace { +class COFFImportFile : public SymbolicFile { +public: + COFFImportFile(MemoryBufferRef Source) + : SymbolicFile(sys::fs::file_magic::coff_import_library, Source) {} + + void moveSymbolNext(DataRefImpl &Symb) const override { ++Symb.p; } + + std::error_code printSymbolName(raw_ostream &OS, + DataRefImpl Symb) const override { + if (Symb.p == 1) + OS << "__imp_"; + OS << StringRef(Data.getBufferStart() + sizeof(coff_import_header)); + return std::error_code(); + } + + uint32_t getSymbolFlags(DataRefImpl Symb) const override { + return SymbolRef::SF_Global; + } + + basic_symbol_iterator symbol_begin_impl() const override { + return BasicSymbolRef(DataRefImpl(), this); + } + + basic_symbol_iterator symbol_end_impl() const override { + DataRefImpl Symb; + Symb.p = isCode() ? 2 : 1; + return BasicSymbolRef(Symb, this); + } + +private: + bool isCode() const { + auto *Import = reinterpret_cast( + Data.getBufferStart()); + return Import->getType() == llvm::COFF::IMPORT_CODE; + } +}; +} // anonymous namespace + SymbolicFile::SymbolicFile(unsigned int Type, MemoryBufferRef Source) : Binary(Type, Source) {} @@ -54,9 +98,10 @@ ErrorOr> SymbolicFile::createSymbolicFile( case sys::fs::file_magic::macho_dynamically_linked_shared_lib_stub: case sys::fs::file_magic::macho_dsym_companion: case sys::fs::file_magic::macho_kext_bundle: - case sys::fs::file_magic::coff_import_library: case sys::fs::file_magic::pecoff_executable: return ObjectFile::createObjectFile(Object, Type); + case sys::fs::file_magic::coff_import_library: + return std::unique_ptr(new COFFImportFile(Object)); case sys::fs::file_magic::elf_relocatable: case sys::fs::file_magic::macho_object: case sys::fs::file_magic::coff_object: { diff --git a/test/Object/Inputs/coff-short-import-code b/test/Object/Inputs/coff-short-import-code new file mode 100644 index 0000000000000000000000000000000000000000..446279037b53cf0673eadfa7828e793d143b05fb GIT binary patch literal 31 mcmZQz`2U}Q!H03#$NQn&3=9m63>*ycY5DmK6?!Q-ISc@m69}*X literal 0 HcmV?d00001 diff --git a/test/Object/Inputs/coff-short-import-data b/test/Object/Inputs/coff-short-import-data new file mode 100644 index 0000000000000000000000000000000000000000..71b635ba1920a269a349864cdbd89e1ed21913d1 GIT binary patch literal 31 kcmZQz`2U}Q!H03#$NQn&3?RVC5TBG-#89D^l9R�F;9Wp#T5? literal 0 HcmV?d00001 diff --git a/test/Object/archive-symtab.test b/test/Object/archive-symtab.test index c50833d6a77..120401bad36 100644 --- a/test/Object/archive-symtab.test +++ b/test/Object/archive-symtab.test @@ -99,6 +99,16 @@ MACHO-NEXT: 0000000000000000 t _bar MACHO-NEXT: 0000000000000001 T _foo MACHO-NEXT: 0000000000000002 T _main +RUN: rm -f %t.a +RUN: llvm-ar --format=gnu rcsU %t.a %p/Inputs/coff-short-import-code %p/Inputs/coff-short-import-data +RUN: llvm-nm -M %t.a | FileCheck --check-prefix=COFF-SHORT-IMPORT %s + +COFF-SHORT-IMPORT: Archive map +COFF-SHORT-IMPORT-NEXT: _foo in coff-short-import-code +COFF-SHORT-IMPORT-NEXT: __imp__foo in coff-short-import-code +COFF-SHORT-IMPORT-NEXT: _bar in coff-short-import-data +COFF-SHORT-IMPORT-NOT: __imp__bar in coff-short-import-data + Test that we pad the symbol table so that it ends in a multiple of 4 bytes: 8 + 60 + 36 == 104 RUN: rm -f %t.a -- 2.34.1