[XCOFF] [llvm-objdump] Add XCOFF recognition of debug section types under `--section-headers` option.

[Esme]

Summary

This is a child patch derived from D102603 to add XCOFF recognition of debug section types.

[Higuoxing]

LGTM, thanks! But please wait until another reviewer is happy about this change :)

P.S. You can click the Edit Related Revisions ... button on the right side to add a parent or a child patch.

[shchenz]

LGTM too with some nits.

llvm/test/tools/llvm-objdump/XCOFF/section-headers.test

107

nit: two Address?

122

I understand this is for testing purposes. But STYP_DEBUG is specific for stabstrings and .dwinfo is specific for dwarf on AIX, I think it is not a good idea to make them together.
Maybe you can use .debug section for STYP_DEBUG.

126

Nit: should we put the RUN lines together at the front of this file?

[jhenderson]

llvm/test/tools/llvm-objdump/XCOFF/section-headers-truncate.test

1 ↗

(On Diff #347630)

Didn't notice this before, but it sounds like this functionality is unrelated to the debug section types, so should be split off into its own patch.

llvm/test/tools/llvm-objdump/XCOFF/section-headers.test

80

I think you can drop the quotes around the option name. I'd also normalise the order to match the previous comment (i.e. -h/--section-headers).

81

Delete this blank line, so that the comment is clearly tied to the specific test case.

125

Delete this blank line, so that the comment is clearly tied to the specific test case.

126

Nit: should we put the RUN lines together at the front of this file?

I don't think we should do this. The RUN/CHECK/YAML blocks are for two somewhat distinct test cases, so shouldn't be intermixed. Intermixing them would make the test harder to follow.

[Esme]

Address comment.

[jhenderson]

LGTM, thanks!

llvm/include/llvm/Object/XCOFFObjectFile.h

public:
   uint64_t getSectionSize(DataRefImpl Sec) const override;
   Expected<ArrayRef<uint8_t>>
   getSectionContents(DataRefImpl Sec) const override;
   uint64_t getSectionAlignment(DataRefImpl Sec) const override;
   bool isSectionCompressed(DataRefImpl Sec) const override;
   bool isSectionText(DataRefImpl Sec) const override;
   bool isSectionData(DataRefImpl Sec) const override;
   bool isSectionBSS(DataRefImpl Sec) const override;
+  bool isDebugSection(DataRefImpl Sec) const override;
 
   bool isSectionVirtual(DataRefImpl Sec) const override;
   relocation_iterator section_rel_begin(DataRefImpl Sec) const override;
   relocation_iterator section_rel_end(DataRefImpl Sec) const override;
 
   void moveRelocationNext(DataRefImpl &Rel) const override;
 
   /// \returns the relocation offset with the base address of the containing

llvm/lib/Object/XCOFFObjectFile.cpp

bool XCOFFObjectFile::isSectionData(DataRefImpl Sec) const {
   return Flags & (XCOFF::STYP_DATA | XCOFF::STYP_TDATA);
 }
 
 bool XCOFFObjectFile::isSectionBSS(DataRefImpl Sec) const {
   uint32_t Flags = getSectionFlags(Sec);
   return Flags & (XCOFF::STYP_BSS | XCOFF::STYP_TBSS);
 }
 
+bool XCOFFObjectFile::isDebugSection(DataRefImpl Sec) const {
+  uint32_t Flags = getSectionFlags(Sec);
+  return Flags & (XCOFF::STYP_DEBUG | XCOFF::STYP_DWARF);
+}
+
 bool XCOFFObjectFile::isSectionVirtual(DataRefImpl Sec) const {
   return is64Bit() ? toSection64(Sec)->FileOffsetToRawData == 0
                    : toSection32(Sec)->FileOffsetToRawData == 0;
 }
 
 relocation_iterator XCOFFObjectFile::section_rel_begin(DataRefImpl Sec) const {
   if (is64Bit())
     report_fatal_error("64-bit support not implemented yet");

llvm/test/tools/llvm-objdump/XCOFF/section-headers.test

 ## Test various details of llvm-objdump -h/--section-headers for XCOFF.
 
 ## Check the -h/--section-headers option prints section headers correctly.
 # RUN: yaml2obj %s --docnum=1 -o %t-basic.o
 # RUN: llvm-objdump --section-headers %t-basic.o | FileCheck %s
 
 # CHECK:      Sections:
 # CHECK-NEXT: Idx Name          Size     VMA      Type
 # CHECK-NEXT:   0 .text         00000008 00000008 TEXT
 # CHECK-NEXT:   1 .data         00000004 00000000 DATA
 # CHECK-NEXT:   2 .bss          00000000 00000010 BSS
 # CHECK-NEXT:   3 .tdata        00000004 00000000 DATA
 # CHECK-NEXT:   4 .tbss         00000000 00000000 BSS
+# CHECK-NEXT:   5 .dwline       00000046 00000000 DEBUG
+# CHECK-NEXT:   6 .debug        00000046 00000000 DEBUG
 
 --- !XCOFF
 FileHeader:
   MagicNumber: 0x1DF
 Sections:
   - Name:    .text
     Address: 0x8
     Size:    0x8
     Flags:   [ STYP_TEXT ]
   - Name:    .data
     Size:    0x4
     Flags:   [ STYP_DATA ]
   - Name:    .bss
     Size:    0x0
     Address: 0x10
     Flags:   [ STYP_BSS ]
   - Name:    .tdata
     Size:    0x4
     Flags:   [ STYP_TDATA ]
   - Name:    .tbss
     Size:    0x0
     Flags:   [ STYP_TBSS ]
+  - Name:    .dwline
+    Size:    0x46
+    Flags:   [ STYP_DWARF ]
+  - Name:    .debug
+    Size:    0x46
+    Flags:   [ STYP_DEBUG ]
 
 ## Check the -h/--section-headers option prints long section names.
 # RUN: yaml2obj %s --docnum=2 -o %t-longname.o
 # RUN: llvm-objdump --section-headers %t-longname.o \
 # RUN:   | FileCheck %s --check-prefix=LONG
 
 # LONG:      Sections:
 # LONG-NEXT: Idx Name          Size     VMA      Type

 # RUN: %python -c "with open('%/t-truncate.o', 'r+b') as input: input.truncate(20)"
 # RUN: not llvm-objdump --section-headers %t-truncate.o 2>&1 \
 # RUN:  | FileCheck --check-prefix=ERROR %s
 
 # ERROR: The end of the file was unexpectedly encountered
 
 --- !XCOFF
 FileHeader:
   MagicNumber: 0x1DF
 Sections:
   - Name:  .text
     Size:  0x8
     Flags: [ STYP_TEXT ]