tools: teach objdump about FILE aux records

Add support for file auxiliary symbol entries in COFF symbol tables.  A COFF
symbol table with a FILE entry is followed by sizeof(__FILE__) / 18 auxiliary
symbol records which contain the filename.  Read them and form the original
filename that the record contains.  Then display the name in the output.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@206126 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/llvm/Object/COFF.h b/include/llvm/Object/COFF.h
index 26620959d0f07d9216b982be159e1ff7d67c8402..43dc2c8bda70c92d705ab6110492249c5b331069 100644 (file)
--- a/include/llvm/Object/COFF.h
+++ b/include/llvm/Object/COFF.h
@@ -287,6 +287,10 @@ struct coff_aux_weak_external {
   char Unused[10];
 };
 
+struct coff_aux_file {
+  char FileName[18];
+};
+
 struct coff_aux_section_definition {
   support::ulittle32_t Length;
   support::ulittle16_t NumberOfRelocations;

diff --git a/test/tools/llvm-objdump/Inputs/file.obj.coff-arm b/test/tools/llvm-objdump/Inputs/file.obj.coff-arm
new file mode 100755 (executable)
index 0000000..a333a87
Binary files /dev/null and b/test/tools/llvm-objdump/Inputs/file.obj.coff-arm differ

diff --git a/test/tools/llvm-objdump/coff-file.test b/test/tools/llvm-objdump/coff-file.test
new file mode 100644 (file)
index 0000000..ba345b4
--- /dev/null
+++ b/test/tools/llvm-objdump/coff-file.test
@@ -0,0 +1,5 @@
+RUN: llvm-objdump -t %p/Inputs/file.obj.coff-arm | FileCheck %s
+
+CHECK: .file
+CHECK-NEXT: AUX /Users/compnerd/work/llvm/test/tools/llvm-readobj/Inputs/file.asm
+

diff --git a/tools/llvm-objdump/llvm-objdump.cpp b/tools/llvm-objdump/llvm-objdump.cpp
index 729fcbaff48b453d4071fe94e89d5e85d2445631..095fdca2dd0a268deace407fe02d8eb04dde9700 100644 (file)
--- a/tools/llvm-objdump/llvm-objdump.cpp
+++ b/tools/llvm-objdump/llvm-objdump.cpp
@@ -669,11 +669,21 @@ static void PrintCOFFSymbolTable(const COFFObjectFile *coff) {
   const coff_symbol *symbol = 0;
   for (int i = 0, e = header->NumberOfSymbols; i != e; ++i) {
     if (aux_count--) {
-      // Figure out which type of aux this is.
-      if (symbol->isSectionDefinition()) { // Section definition.
+      switch (symbol->StorageClass) {
+      default: outs() << "AUX Unknown\n";
+      case COFF::IMAGE_SYM_CLASS_STATIC:
+        // Section definition.  Follows a symbol-table record that defines a
+        // section.  Such a record has a symbol name that is the name of a
+        // section and has storage class STATIC (3).
+        if (symbol->Value) {
+          errs() << "invalid entry in Symbol Table";
+          break;
+        }
+
         const coff_aux_section_definition *asd;
         if (error(coff->getAuxSymbol<coff_aux_section_definition>(i, asd)))
           return;
+
         outs() << "AUX "
                << format("scnlen 0x%x nreloc %d nlnno %d checksum 0x%x "
                          , unsigned(asd->Length)
@@ -683,8 +693,20 @@ static void PrintCOFFSymbolTable(const COFFObjectFile *coff) {
                << format("assoc %d comdat %d\n"
                          , unsigned(asd->Number)
                          , unsigned(asd->Selection));
-      } else
-        outs() << "AUX Unknown\n";
+        break;
+      case COFF::IMAGE_SYM_CLASS_FILE:
+        SmallString<261> FileName;
+        for (unsigned AI = i, AE = i + aux_count + 1; AI < AE; ++AI) {
+          const coff_aux_file *AF;
+          if (error(coff->getAuxSymbol<coff_aux_file>(AI, AF)))
+            return;
+          FileName.append(&AF->FileName[0], &AF->FileName[18]);
+        }
+        outs() << "AUX " << FileName << '\n';
+        i = i + aux_count;
+        aux_count = 0;
+        break;
+      }
     } else {
       StringRef name;
       if (error(coff->getSymbol(i, symbol))) return;