[llvm-readelf] Print EI_ABIVERSION as decimal instead of hexadecimal

[MaskRay]

Summary

This matches GNU readelf and llvm-readobj.

[merge_guards_bot]

Unit tests: fail. 61248 tests passed, 1 failed and 736 were skipped.

failed: LLVM.tools/llvm-objcopy/ELF/partitions.test

clang-tidy: pass.

clang-format: pass.

Build artifacts: diff.json, clang-tidy.txt, clang-format.patch, CMakeCache.txt, console-log.txt, test-results.xml

[jhenderson]

LGTM. I have no idea why this was hex in the first place.

llvm/tools/llvm-readobj/ELFDumper.cpp

3065

BTW, do you know the rationale for using llvm::to_string versus std::to_string? Both are widely used in the code base...

[MaskRay]

Fix tools/llvm-objcopy/ELF/partitions.test

[MaskRay]

llvm/tools/llvm-readobj/ELFDumper.cpp

3065

D17523 added llvm::to_string and used it in llvm-readobj. Over time, the function gets adopted in more than 100 places.. I think many call sites convert an integer to a string and they should use https://en.cppreference.com/w/cpp/string/basic_string/to_string instead. They got adopted probably because the authors thought std::to_string is C++14 (LLVM migrated to LLVM just last year), like std::make_unique vs llvm::make_unique..

[merge_guards_bot]

Unit tests: pass. 61252 tests passed, 0 failed and 736 were skipped.

clang-tidy: pass.

clang-format: pass.

Build artifacts: diff.json, clang-tidy.txt, clang-format.patch, CMakeCache.txt, console-log.txt, test-results.xml

lld/test/ELF/mips-n32-rels.s

 #                                          ^-- 0x20100 - 0x28100
 #                                          ^-- 0 - 0xffff8000
 #                                          ^-- %lo(0x8000)
 
 # ELF: Class:                ELF32
 # ELF: Data:                 2's complement, big endian
 # ELF: Version:              1 (current)
 # ELF: OS/ABI:               UNIX - System V
-# ELF: ABI Version:          0x0
+# ELF: ABI Version:          0
 # ELF: Type:                 EXEC (Executable file)
 # ELF: Machine:              MIPS R3000
 # ELF: Version:              0x1
 # ELF: Entry point address:  0x20100
 # ELF: Flags:                0x60000026, pic, cpic, abi2, mips64

llvm/test/tools/llvm-objcopy/ELF/partitions.test

 RUN: llvm-readelf --headers --sections --symbols %t3 | FileCheck --check-prefix=PART2 %s
 
 MAIN:      ELF Header:
 MAIN-NEXT:   Magic:   7f 45 4c 46 02 01 01 00 00 00 00 00 00 00 00 00
 MAIN-NEXT:   Class:                             ELF64
 MAIN-NEXT:   Data:                              2's complement, little endian
 MAIN-NEXT:   Version:                           1 (current)
 MAIN-NEXT:   OS/ABI:                            UNIX - System V
-MAIN-NEXT:   ABI Version:                       0x0
+MAIN-NEXT:   ABI Version:                       0
 MAIN-NEXT:   Type:                              EXEC (Executable file)
 MAIN-NEXT:   Machine:                           Advanced Micro Devices X86-64
 MAIN-NEXT:   Version:                           0x1
 MAIN-NEXT:   Entry point address:               0x201000
 MAIN-NEXT:   Start of program headers:          64 (bytes into file)
 MAIN-NEXT:   Start of section headers:          12488 (bytes into file)
 MAIN-NEXT:   Flags:                             0x0
 MAIN-NEXT:   Size of this header:               64 (bytes)

 MAIN-NEXT:   GNU_STACK      0x000000 0x0000000000000000 0x0000000000000000 0x000000 0x000000 RW  0x0
 
 PART1: ELF Header:
 PART1-NEXT:   Magic:   7f 45 4c 46 02 01 01 00 00 00 00 00 00 00 00 00
 PART1-NEXT:   Class:                             ELF64
 PART1-NEXT:   Data:                              2's complement, little endian
 PART1-NEXT:   Version:                           1 (current)
 PART1-NEXT:   OS/ABI:                            UNIX - System V
-PART1-NEXT:   ABI Version:                       0x0
+PART1-NEXT:   ABI Version:                       0
 PART1-NEXT:   Type:                              DYN (Shared object file)
 PART1-NEXT:   Machine:                           Advanced Micro Devices X86-64
 PART1-NEXT:   Version:                           0x1
 PART1-NEXT:   Entry point address:               0x0
 PART1-NEXT:   Start of program headers:          64 (bytes into file)
 PART1-NEXT:   Start of section headers:          8336 (bytes into file)
 PART1-NEXT:   Flags:                             0x0
 PART1-NEXT:   Size of this header:               64 (bytes)

 PART1-NEXT:   GNU_STACK      0x000000 0x0000000000000000 0x0000000000000000 0x000000 0x000000 RW  0x0
 
 PART2: ELF Header:
 PART2-NEXT:   Magic:   7f 45 4c 46 02 01 01 00 00 00 00 00 00 00 00 00
 PART2-NEXT:   Class:                             ELF64
 PART2-NEXT:   Data:                              2's complement, little endian
 PART2-NEXT:   Version:                           1 (current)
 PART2-NEXT:   OS/ABI:                            UNIX - System V
-PART2-NEXT:   ABI Version:                       0x0
+PART2-NEXT:   ABI Version:                       0
 PART2-NEXT:   Type:                              DYN (Shared object file)
 PART2-NEXT:   Machine:                           Advanced Micro Devices X86-64
 PART2-NEXT:   Version:                           0x1
 PART2-NEXT:   Entry point address:               0x0
 PART2-NEXT:   Start of program headers:          64 (bytes into file)
 PART2-NEXT:   Start of section headers:          8336 (bytes into file)
 PART2-NEXT:   Flags:                             0x0
 PART2-NEXT:   Size of this header:               64 (bytes)

llvm/test/tools/llvm-readobj/ELF/file-header-abi-version.test

 ## This is a test to test how ABI version (EI_ABIVERSION) of an ELF file header is dumped.
 
 ## EI_ABIVERSION is set to zero.
 # RUN: yaml2obj %s --docnum=1 -o %t.abiver.zero
 # RUN: llvm-readobj --file-headers %t.abiver.zero | FileCheck %s --match-full-lines --check-prefix=ABIVER-ZERO-LLVM
 # RUN: llvm-readelf --file-headers %t.abiver.zero | FileCheck %s --match-full-lines --check-prefix=ABIVER-ZERO-GNU
 ## EI_ABIVERSION is set to an arbitrary number.
 # RUN: yaml2obj %s --docnum=2 -o %t.abiver.any
 # RUN: llvm-readobj --file-headers %t.abiver.any | FileCheck %s --match-full-lines --check-prefix=ABIVER-ANY-LLVM
 # RUN: llvm-readelf --file-headers %t.abiver.any | FileCheck %s --match-full-lines --check-prefix=ABIVER-ANY-GNU
 ## EI_ABIVERSION is set to the maximum possible value.
 # RUN: yaml2obj %s --docnum=3 -o %t.abiver.max
 # RUN: llvm-readobj --file-headers %t.abiver.max | FileCheck %s --match-full-lines --check-prefix=ABIVER-MAX-LLVM
 # RUN: llvm-readelf --file-headers %t.abiver.max | FileCheck %s --match-full-lines --check-prefix=ABIVER-MAX-GNU
 
 # ABIVER-ZERO-LLVM: ABIVersion: 0
-# ABIVER-ZERO-GNU:  ABI Version: 0x0
+# ABIVER-ZERO-GNU:  ABI Version: 0
 
 # ABIVER-ANY-LLVM: ABIVersion: 52
-# ABIVER-ANY-GNU:  ABI Version: 0x34
+# ABIVER-ANY-GNU:  ABI Version: 52
 
 # ABIVER-MAX-LLVM: ABIVersion: 255
-# ABIVER-MAX-GNU:  ABI Version: 0xFF
+# ABIVER-MAX-GNU:  ABI Version: 255
 
 --- !ELF
 FileHeader:
   Class:      ELFCLASS64
   Data:       ELFDATA2LSB
   Type:       ET_REL
   Machine:    EM_X86_64
   ABIVersion: 0x0

llvm/test/tools/llvm-readobj/ELF/gnu-file-headers.test

 ## In this test we test how llvm-readelf prints file headers.
 
 ## Case 1: Test EM_386 object.
 # RUN: yaml2obj %s --docnum=1 -o %t1
 # RUN: llvm-readelf -h %t1 | FileCheck %s --check-prefix=I386
 # RUN: llvm-readelf --file-header %t1 \
 # RUN:   | FileCheck %s --strict-whitespace --match-full-lines --check-prefix=I386
 # RUN: llvm-readelf --file-headers %t1  \
 # RUN:   | FileCheck %s --strict-whitespace --match-full-lines --check-prefix=I386
 
 #      I386:ELF Header:
 # I386-NEXT:  Magic:   7f 45 4c 46 01 01 01 00 00 00 00 00 00 00 00 00
 # I386-NEXT:  Class:                             ELF32
 # I386-NEXT:  Data:                              2's complement, little endian
 # I386-NEXT:  Version:                           1 (current)
 # I386-NEXT:  OS/ABI:                            UNIX - System V
-# I386-NEXT:  ABI Version:                       0x0
+# I386-NEXT:  ABI Version:                       0
 # I386-NEXT:  Type:                              REL (Relocatable file)
 # I386-NEXT:  Machine:                           Intel 80386
 # I386-NEXT:  Version:                           0x1
 # I386-NEXT:  Entry point address:               0x11223344
 # I386-NEXT:  Start of program headers:          52 (bytes into file)
 # I386-NEXT:  Start of section headers:          112 (bytes into file)
 # I386-NEXT:  Flags:                             0x0
 # I386-NEXT:  Size of this header:               52 (bytes)

 # RUN:   | FileCheck %s --check-prefix=X86-64 --strict-whitespace --match-full-lines
 
 #      X86-64:ELF Header:
 # X86-64-NEXT:  Magic:   7f 45 4c 46 02 01 01 00 00 00 00 00 00 00 00 00
 # X86-64-NEXT:  Class:                             ELF64
 # X86-64-NEXT:  Data:                              2's complement, little endian
 # X86-64-NEXT:  Version:                           1 (current)
 # X86-64-NEXT:  OS/ABI:                            UNIX - System V
-# X86-64-NEXT:  ABI Version:                       0x0
+# X86-64-NEXT:  ABI Version:                       0
 # X86-64-NEXT:  Type:                              REL (Relocatable file)
 # X86-64-NEXT:  Machine:                           Advanced Micro Devices X86-64
 # X86-64-NEXT:  Version:                           0x1
 # X86-64-NEXT:  Entry point address:               0x1122334455667788
 # X86-64-NEXT:  Start of program headers:          64 (bytes into file)
 # X86-64-NEXT:  Start of section headers:          152 (bytes into file)
 # X86-64-NEXT:  Flags:                             0x0
 # X86-64-NEXT:  Size of this header:               64 (bytes)

 # RUN:   | FileCheck %s --check-prefix=MIPSEL --strict-whitespace --match-full-lines
 
 #      MIPSEL:ELF Header:
 # MIPSEL-NEXT:  Magic:   7f 45 4c 46 01 01 01 00 00 00 00 00 00 00 00 00
 # MIPSEL-NEXT:  Class:                             ELF32
 # MIPSEL-NEXT:  Data:                              2's complement, little endian
 # MIPSEL-NEXT:  Version:                           1 (current)
 # MIPSEL-NEXT:  OS/ABI:                            UNIX - System V
-# MIPSEL-NEXT:  ABI Version:                       0x0
+# MIPSEL-NEXT:  ABI Version:                       0
 # MIPSEL-NEXT:  Type:                              REL (Relocatable file)
 # MIPSEL-NEXT:  Machine:                           MIPS R3000
 # MIPSEL-NEXT:  Version:                           0x1
 # MIPSEL-NEXT:  Entry point address:               0x0
 # MIPSEL-NEXT:  Start of program headers:          52 (bytes into file)
 # MIPSEL-NEXT:  Start of section headers:          112 (bytes into file)
 # MIPSEL-NEXT:  Flags:                             0x50001000, o32, mips32
 # MIPSEL-NEXT:  Size of this header:               52 (bytes)

llvm/tools/llvm-readobj/ELFDumper.cpp

template <class ELFT> void GNUStyle<ELFT>::printFileHeaders(const ELFO *Obj) {
   OS << "Version:";
   OS.PadToColumn(37u);
   OS << to_hexString(e->e_ident[ELF::EI_VERSION]);
   if (e->e_version == ELF::EV_CURRENT)
     OS << " (current)";
   OS << "\n";
   Str = printEnum(e->e_ident[ELF::EI_OSABI], makeArrayRef(ElfOSABI));
   printFields(OS, "OS/ABI:", Str);
-  Str = "0x" + to_hexString(e->e_ident[ELF::EI_ABIVERSION]);
-  printFields(OS, "ABI Version:", Str);
+  printFields(OS,
+              "ABI Version:", std::to_string(e->e_ident[ELF::EI_ABIVERSION]));
   Str = printEnum(e->e_type, makeArrayRef(ElfObjectFileType));
   printFields(OS, "Type:", Str);
   Str = printEnum(e->e_machine, makeArrayRef(ElfMachineType));
   printFields(OS, "Machine:", Str);
   Str = "0x" + to_hexString(e->e_version);
   printFields(OS, "Version:", Str);
   Str = "0x" + to_hexString(e->e_entry);
   printFields(OS, "Entry point address:", Str);