[llvm-readobj] - Print "Unknown" when a program header is unknown.

[grimar]

Summary

Currently, when a program header type is unknown, we dont print anything:

ProgramHeader {
  Type:  (0x60000000)

With this patch the output will be:

ProgramHeader {
  Type: Unknown (0x60000000)

It was discussed in D85526 and consistent what we print for
'--sections' already, e.g.:

Section {
  Name: .sec
  Type: Unknown (0x7FFFFFFF)
}

[grimar]

Ping.

[jhenderson]

No idea how this slipped through my review net, sorry! LGTM.

[grimar]

In D86213#2235610, @jhenderson wrote:

No idea how this slipped through my review net, sorry! LGTM.

No worries, thanks for review!

lld/test/ELF/linkerscript/non-alloc-segment.s

 # CHECK-NEXT:  LOAD
 # CHECK-NEXT:  <unknown>: 0x12345678
 
 # CHECK:      Section to Segment mapping:
 # CHECK-NEXT:  Segment Sections...
 # CHECK-NEXT:   00     .text
 # CHECK-NEXT:   01     .foo
 
-# PHDR: Type:  (0x12345678)
+# PHDR:      Type: Unknown (0x12345678)
 # PHDR-NEXT: Offset: 0x1004
 # PHDR-NEXT: VirtualAddress
 # PHDR-NEXT: PhysicalAddress
 # PHDR-NEXT: FileSize: 4
 
 .global _start
 _start:
  nop
 
 .section .foo
  .align 4
  .long 0

lld/test/ELF/linkerscript/phdrs.s

 ## Check the numetic values for PHDRS.
 # RUN: echo "PHDRS {text PT_LOAD FILEHDR PHDRS; foo 0x11223344; } \
 # RUN:       SECTIONS { . = SIZEOF_HEADERS; .foo : { *(.foo* .text*) } : text : foo}" > %t1.script
 # RUN: ld.lld -o %t2 --script %t1.script %t
 # RUN: llvm-readobj -l %t2 | FileCheck --check-prefix=INT-PHDRS %s
 
 # INT-PHDRS:      ProgramHeaders [
 # INT-PHDRS:        ProgramHeader {
-# INT-PHDRS:           Type:  (0x11223344)
+# INT-PHDRS:           Type: Unknown (0x11223344)
 # INT-PHDRS-NEXT:      Offset: 0xB0
 # INT-PHDRS-NEXT:      VirtualAddress: 0xB0
 # INT-PHDRS-NEXT:      PhysicalAddress: 0xB0
 # INT-PHDRS-NEXT:      FileSize:
 # INT-PHDRS-NEXT:      MemSize:
 # INT-PHDRS-NEXT:      Flags [
 # INT-PHDRS-NEXT:        PF_R
 # INT-PHDRS-NEXT:        PF_W

llvm/test/tools/llvm-readobj/ELF/program-headers.test

 # ELF-LLVM-NEXT:     PhysicalAddress: 0x4000
 # ELF-LLVM-NEXT:     FileSize: 1
 # ELF-LLVM-NEXT:     MemSize: 1
 # ELF-LLVM-NEXT:     Flags [ (0x0)
 # ELF-LLVM-NEXT:     ]
 # ELF-LLVM-NEXT:     Alignment: 1
 # ELF-LLVM-NEXT:   }
 # ELF-LLVM-NEXT:   ProgramHeader {
-# ELF-LLVM-NEXT:     Type:  (0x60000000)
+# ELF-LLVM-NEXT:     Type: Unknown (0x60000000)
 # ELF32-LLVM-NEXT:   Offset: 0x314
 # ELF64-LLVM-NEXT:   Offset: 0x548
 # ELF-LLVM-NEXT:     VirtualAddress: 0x1000
 # ELF-LLVM-NEXT:     PhysicalAddress: 0x1000
 # ELF-LLVM-NEXT:     FileSize: 3
 # ELF-LLVM-NEXT:     MemSize: 3
 # ELF-LLVM-NEXT:     Flags [ (0x0)
 # ELF-LLVM-NEXT:     ]

 # ELF-LLVM-NEXT:     PhysicalAddress: 0x1000
 # ELF-LLVM-NEXT:     FileSize: 3
 # ELF-LLVM-NEXT:     MemSize: 3
 # ELF-LLVM-NEXT:     Flags [ (0x0)
 # ELF-LLVM-NEXT:     ]
 # ELF-LLVM-NEXT:     Alignment: 1
 # ELF-LLVM-NEXT:   }
 # ELF-LLVM-NEXT:   ProgramHeader {
-# ELF-LLVM-NEXT:     Type:  (0x6FFFFFFF)
+# ELF-LLVM-NEXT:     Type: Unknown (0x6FFFFFFF)
 # ELF32-LLVM-NEXT:   Offset: 0x314
 # ELF64-LLVM-NEXT:   Offset: 0x548
 # ELF-LLVM-NEXT:     VirtualAddress: 0x1000
 # ELF-LLVM-NEXT:     PhysicalAddress: 0x1000
 # ELF-LLVM-NEXT:     FileSize: 3
 # ELF-LLVM-NEXT:     MemSize: 3
 # ELF-LLVM-NEXT:     Flags [ (0x0)
 # ELF-LLVM-NEXT:     ]
 # ELF-LLVM-NEXT:     Alignment: 1
 # ELF-LLVM-NEXT:   }
 # ELF-LLVM-NEXT:   ProgramHeader {
-# ELF-LLVM-NEXT:     Type:  (0x70000000)
+# ELF-LLVM-NEXT:     Type: Unknown (0x70000000)
 # ELF32-LLVM-NEXT:   Offset: 0x314
 # ELF64-LLVM-NEXT:   Offset: 0x548
 # ELF-LLVM-NEXT:     VirtualAddress: 0x1000
 # ELF-LLVM-NEXT:     PhysicalAddress: 0x1000
 # ELF-LLVM-NEXT:     FileSize: 3
 # ELF-LLVM-NEXT:     MemSize: 3
 # ELF-LLVM-NEXT:     Flags [ (0x0)
 # ELF-LLVM-NEXT:     ]
 # ELF-LLVM-NEXT:     Alignment: 1
 # ELF-LLVM-NEXT:   }
 # ELF-LLVM-NEXT:   ProgramHeader {
-# ELF-LLVM-NEXT:     Type:  (0x70000001)
+# ELF-LLVM-NEXT:     Type: Unknown (0x70000001)
 # ELF32-LLVM-NEXT:   Offset: 0x314
 # ELF64-LLVM-NEXT:   Offset: 0x548
 # ELF-LLVM-NEXT:     VirtualAddress: 0x1000
 # ELF-LLVM-NEXT:     PhysicalAddress: 0x1000
 # ELF-LLVM-NEXT:     FileSize: 3
 # ELF-LLVM-NEXT:     MemSize: 3
 # ELF-LLVM-NEXT:     Flags [ (0x0)
 # ELF-LLVM-NEXT:     ]
 # ELF-LLVM-NEXT:     Alignment: 1
 # ELF-LLVM-NEXT:   }
 # ELF-LLVM-NEXT:   ProgramHeader {
-# ELF-LLVM-NEXT:     Type:  (0x70000002)
+# ELF-LLVM-NEXT:     Type: Unknown (0x70000002)
 # ELF32-LLVM-NEXT:   Offset: 0x314
 # ELF64-LLVM-NEXT:   Offset: 0x548
 # ELF-LLVM-NEXT:     VirtualAddress: 0x1000
 # ELF-LLVM-NEXT:     PhysicalAddress: 0x1000
 # ELF-LLVM-NEXT:     FileSize: 3
 # ELF-LLVM-NEXT:     MemSize: 3
 # ELF-LLVM-NEXT:     Flags [ (0x0)
 # ELF-LLVM-NEXT:     ]
 # ELF-LLVM-NEXT:     Alignment: 1
 # ELF-LLVM-NEXT:   }
 # ELF-LLVM-NEXT:   ProgramHeader {
-# ELF-LLVM-NEXT:     Type:  (0x70000003)
+# ELF-LLVM-NEXT:     Type: Unknown (0x70000003)
 # ELF32-LLVM-NEXT:   Offset: 0x314
 # ELF64-LLVM-NEXT:   Offset: 0x548
 # ELF-LLVM-NEXT:     VirtualAddress: 0x1000
 # ELF-LLVM-NEXT:     PhysicalAddress: 0x1000
 # ELF-LLVM-NEXT:     FileSize: 3
 # ELF-LLVM-NEXT:     MemSize: 3
 # ELF-LLVM-NEXT:     Flags [ (0x0)
 # ELF-LLVM-NEXT:     ]
 # ELF-LLVM-NEXT:     Alignment: 1
 # ELF-LLVM-NEXT:   }
 # ELF-LLVM-NEXT:   ProgramHeader {
-# ELF-LLVM-NEXT:     Type:  (0x7FFFFFFF)
+# ELF-LLVM-NEXT:     Type: Unknown (0x7FFFFFFF)
 # ELF32-LLVM-NEXT:   Offset: 0x314
 # ELF64-LLVM-NEXT:   Offset: 0x548
 # ELF-LLVM-NEXT:     VirtualAddress: 0x1000
 # ELF-LLVM-NEXT:     PhysicalAddress: 0x1000
 # ELF-LLVM-NEXT:     FileSize: 3
 # ELF-LLVM-NEXT:     MemSize: 3
 # ELF-LLVM-NEXT:     Flags [ (0x0)
 # ELF-LLVM-NEXT:     ]

 # RUN: llvm-readelf --program-headers %tarm.elf | FileCheck %s --check-prefix=ARM-GNU
 # RUN: llvm-readobj --program-headers %tarm.elf | FileCheck %s --check-prefix=ARM-LLVM
 
 # ARM-GNU:      <unknown>: 0x70000000 0x000548 0x0000000000001000 0x0000000000001000 0x000003 0x000003 0x1
 # ARM-GNU-NEXT:            EXIDX      0x000548 0x0000000000001000 0x0000000000001000 0x000003 0x000003 0x1
 # ARM-GNU-NEXT: <unknown>: 0x70000002 0x000548 0x0000000000001000 0x0000000000001000 0x000003 0x000003 0x1
 
 # ARM-LLVM:      ProgramHeader {
-# ARM-LLVM:        Type:  (0x70000000)
+# ARM-LLVM:        Type: Unknown (0x70000000)
 # ARM-LLVM:      ProgramHeader {
 # ARM-LLVM-NEXT:   Type: PT_ARM_EXIDX (0x70000001)
 # ARM-LLVM:      ProgramHeader {
-# ARM-LLVM-NEXT:   Type:  (0x70000002)
+# ARM-LLVM-NEXT:   Type: Unknown (0x70000002)
 
 ## Check how we dump MIPS specific program headers.
 # RUN: yaml2obj --docnum=1 -DBITS=64 -DMACHINE=EM_MIPS %s -o %tmips.elf
 # RUN: llvm-readelf --program-headers %tmips.elf | FileCheck %s --check-prefix=MIPS-GNU
 # RUN: llvm-readobj --program-headers %tmips.elf | FileCheck %s --check-prefix=MIPS-LLVM
 
 # MIPS-GNU:      REGINFO  0x000548 0x0000000000001000 0x0000000000001000 0x000003 0x000003 0x1
 # MIPS-GNU-NEXT: RTPROC   0x000548 0x0000000000001000 0x0000000000001000 0x000003 0x000003 0x1

llvm/tools/llvm-readobj/ELFDumper.cpp

void LLVMStyle<ELFT>::printProgramHeaders(const ELFO *Obj) {
   if (!PhdrsOrErr) {
     this->reportUniqueWarning(createError("unable to dump program headers: " +
                                           toString(PhdrsOrErr.takeError())));
     return;
   }
 
   for (const Elf_Phdr &Phdr : *PhdrsOrErr) {
     DictScope P(W, "ProgramHeader");
-    W.printHex("Type",
-               segmentTypeToString(Obj->getHeader()->e_machine, Phdr.p_type),
-               Phdr.p_type);
+    StringRef Type =
+        segmentTypeToString(Obj->getHeader()->e_machine, Phdr.p_type);
+
+    W.printHex("Type", Type.empty() ? "Unknown" : Type, Phdr.p_type);
     W.printHex("Offset", Phdr.p_offset);
     W.printHex("VirtualAddress", Phdr.p_vaddr);
     W.printHex("PhysicalAddress", Phdr.p_paddr);
     W.printNumber("FileSize", Phdr.p_filesz);
     W.printNumber("MemSize", Phdr.p_memsz);
     W.printFlags("Flags", Phdr.p_flags, makeArrayRef(ElfSegmentFlags));
     W.printNumber("Alignment", Phdr.p_align);
   }