From c6bf547564088ad0ba0b2f281ffa813974f66bda Mon Sep 17 00:00:00 2001
From: Saleem Abdulrasool <compnerd@compnerd.org>
Date: Thu, 18 Aug 2016 16:39:19 +0000
Subject: [PATCH] llvm-objdump: add coff import library symbol listing support

This adds behaviour similar to binutils' objdump which can show symbols in an
import library.  Differences from that stem around the fact that we do not
create section symbols nor the all import import descriptor symbol reference.
However, this does mean that the tool can serve as a possible replacement for
the existing tool.

llvm-svn: 279088
---
 llvm/test/tools/llvm-objdump/Inputs/library.lib    | Bin 0 -> 2166 bytes
 .../tools/llvm-objdump/coff-import-library.test    |  12 +++++++++++
 llvm/tools/llvm-objdump/COFFDump.cpp               |  24 +++++++++++++++++++++
 llvm/tools/llvm-objdump/llvm-objdump.cpp           |  17 +++++++++++++++
 llvm/tools/llvm-objdump/llvm-objdump.h             |   2 ++
 5 files changed, 55 insertions(+)
 create mode 100755 llvm/test/tools/llvm-objdump/Inputs/library.lib
 create mode 100644 llvm/test/tools/llvm-objdump/coff-import-library.test

diff --git a/llvm/test/tools/llvm-objdump/Inputs/library.lib b/llvm/test/tools/llvm-objdump/Inputs/library.lib
new file mode 100755
index 0000000000000000000000000000000000000000..193380dd4858ce8cf4cc02298eeb4678a31f83ad
GIT binary patch
literal 2166
zcmcIm&2G~`5dQ4^;vy7<pBs{qDgl>}I1V8af`k?+QQfpkQz2EVoHU`-QW{rjdf>zh
zaOg{L>74_&z5oX*@c{Hi%8b1mJE18_3oGs4?5t<z+iz$6=w*A**?Xlu)5lBBEauEo
zF>B<<<ykQ`a&pwt08mx4Ky(X;9RrCIQL8}w+^@+LkWATjZFPOE(X^M}ZY(uw>&>->
z-E(#Z?ZHRbc74;b{#3vxq2aGLtDE%|d%4oA&<<z+z_xdf`kkTU_7NKSE8X_6Ewwss
z|8Usu4`Bx*U&|eIoqoFqTMp(%!!QIcEiFNCWL01*3LM9P6B1OZp2vYy(t`>LRKyWO
z6bb6NjgXhuKt=#C8BjRv0Gx?ngH3^o1Yj!S;v_QNUe5#RZ#*$el0YrZQX+W0^!43>
zLQEi(s3@84`<<f?iyQtFsL<fEoQS@R)SHaMF)bQ$=^hQfQ~f0b5$emxo(jF^LX6uq
zxS%TaSYC#HN(Y2AZt)Zgp`ae)Zi-KkzsKbc)wAvNs?!;`hwkoBf6{oWTebR%w>r_V
zG2X}@pv&Nmi1l>PEDKpdx#R91kgsRkigH2z`Q~^B7j{mC47m(=?(Rv67aZ@1NQuch
zB)~|g5J*_Ab0Z3W9Vm$zcPbjxUW<TJiK2zVorx(%A;>6}qIyjE<~heMUe1)Rw-huX
zrsSoRnes(WM9)n5FASLFTpyAXQ&ZjCs1;v~GLO7pKgoc9$d{vb#r-NspqPq$zrrPS
zzf37-y&rNS`hSY<tcXq};=G8OGL`H6vhn4#6wX=?yy&#h>k;~L_;Sz0_Pji{2`g!`
oqEKG4y%c^E3s=RVQvMCz${Sh9$^V0KwC+<J%#G2L8aAT+26YIq(*OVf

literal 0
HcmV?d00001

diff --git a/llvm/test/tools/llvm-objdump/coff-import-library.test b/llvm/test/tools/llvm-objdump/coff-import-library.test
new file mode 100644
index 0000000..2590fac
--- /dev/null
+++ b/llvm/test/tools/llvm-objdump/coff-import-library.test
@@ -0,0 +1,12 @@
+RUN: llvm-objdump -t %p/Inputs/library.lib
+
+CHECK: [ 0](sec  0)(fl 0x00)(ty   0)(scl   0) (nx 0) 0x00000000 __imp__constant
+
+CHECK: [ 0](sec  0)(fl 0x00)(ty   0)(scl   0) (nx 0) 0x00000000 __imp__data
+
+CHECK: [ 0](sec  0)(fl 0x00)(ty   0)(scl   0) (nx 0) 0x00000000 __imp__function
+CHECK: [ 1](sec  0)(fl 0x00)(ty  20)(scl   0) (nx 0) 0x00000000 _function
+
+CHECK: [ 0](sec  0)(fl 0x00)(ty   0)(scl   0) (nx 0) 0x00000000 __imp__ordinal
+CHECK: [ 1](sec  0)(fl 0x00)(ty  20)(scl   0) (nx 0) 0x00000000 _ordinal
+
diff --git a/llvm/tools/llvm-objdump/COFFDump.cpp b/llvm/tools/llvm-objdump/COFFDump.cpp
index b7ab860..e95de86 100644
--- a/llvm/tools/llvm-objdump/COFFDump.cpp
+++ b/llvm/tools/llvm-objdump/COFFDump.cpp
@@ -17,6 +17,7 @@
 
 #include "llvm-objdump.h"
 #include "llvm/Object/COFF.h"
+#include "llvm/Object/COFFImportFile.h"
 #include "llvm/Object/ObjectFile.h"
 #include "llvm/Support/Format.h"
 #include "llvm/Support/SourceMgr.h"
@@ -617,6 +618,29 @@ void llvm::printCOFFFileHeader(const object::ObjectFile *Obj) {
   printExportTable(file);
 }
 
+void llvm::printCOFFSymbolTable(const object::COFFImportFile *i) {
+  unsigned Index = 0;
+  bool IsCode = i->getCOFFImportHeader()->getType() == COFF::IMPORT_CODE;
+
+  for (const object::BasicSymbolRef &Sym : i->symbols()) {
+    std::string Name;
+    raw_string_ostream NS(Name);
+
+    Sym.printName(NS);
+    NS.flush();
+
+    outs() << "[" << format("%2d", Index) << "]"
+           << "(sec " << format("%2d", 0) << ")"
+           << "(fl 0x00)" // Flag bits, which COFF doesn't have.
+           << "(ty " << format("%3x", (IsCode && Index) ? 32 : 0) << ")"
+           << "(scl " << format("%3x", 0) << ") "
+           << "(nx " << 0 << ") "
+           << "0x" << format("%08x", 0) << " " << Name << '\n';
+
+    ++Index;
+  }
+}
+
 void llvm::printCOFFSymbolTable(const COFFObjectFile *coff) {
   for (unsigned SI = 0, SE = coff->getNumberOfSymbols(); SI != SE; ++SI) {
     ErrorOr<COFFSymbolRef> Symbol = coff->getSymbol(SI);
diff --git a/llvm/tools/llvm-objdump/llvm-objdump.cpp b/llvm/tools/llvm-objdump/llvm-objdump.cpp
index 4fc4aff..bff63e4 100644
--- a/llvm/tools/llvm-objdump/llvm-objdump.cpp
+++ b/llvm/tools/llvm-objdump/llvm-objdump.cpp
@@ -37,6 +37,7 @@
 #include "llvm/MC/MCSubtargetInfo.h"
 #include "llvm/Object/Archive.h"
 #include "llvm/Object/COFF.h"
+#include "llvm/Object/COFFImportFile.h"
 #include "llvm/Object/ELFObjectFile.h"
 #include "llvm/Object/MachO.h"
 #include "llvm/Object/ObjectFile.h"
@@ -1824,6 +1825,20 @@ static void DumpObject(const ObjectFile *o, const Archive *a = nullptr) {
   }
 }
 
+static void DumpObject(const COFFImportFile *I, const Archive *A) {
+  StringRef ArchiveName = A ? A->getFileName() : "";
+
+  // Avoid other output when using a raw option.
+  if (!RawClangAST)
+    outs() << '\n'
+           << ArchiveName << "(" << I->getFileName() << ")"
+           << ":\tfile format COFF-import-file"
+           << "\n\n";
+
+  if (SymbolTable)
+    printCOFFSymbolTable(I);
+}
+
 /// @brief Dump each object file in \a a;
 static void DumpArchive(const Archive *a) {
   Error Err;
@@ -1836,6 +1851,8 @@ static void DumpArchive(const Archive *a) {
     }
     if (ObjectFile *o = dyn_cast<ObjectFile>(&*ChildOrErr.get()))
       DumpObject(o, a);
+    else if (COFFImportFile *I = dyn_cast<COFFImportFile>(&*ChildOrErr.get()))
+      DumpObject(I, a);
     else
       report_error(a->getFileName(), object_error::invalid_file_type);
   }
diff --git a/llvm/tools/llvm-objdump/llvm-objdump.h b/llvm/tools/llvm-objdump/llvm-objdump.h
index 5b10ee8..85ad0bb 100644
--- a/llvm/tools/llvm-objdump/llvm-objdump.h
+++ b/llvm/tools/llvm-objdump/llvm-objdump.h
@@ -20,6 +20,7 @@ class StringRef;
 
 namespace object {
   class COFFObjectFile;
+  class COFFImportFile;
   class MachOObjectFile;
   class ObjectFile;
   class Archive;
@@ -74,6 +75,7 @@ void printMachOLazyBindTable(const object::MachOObjectFile* o);
 void printMachOWeakBindTable(const object::MachOObjectFile* o);
 void printELFFileHeader(const object::ObjectFile *o);
 void printCOFFFileHeader(const object::ObjectFile *o);
+void printCOFFSymbolTable(const object::COFFImportFile *i);
 void printCOFFSymbolTable(const object::COFFObjectFile *o);
 void printMachOFileHeader(const object::ObjectFile *o);
 void printMachOLoadCommands(const object::ObjectFile *o);
-- 
2.7.4