[llvm] d212b63 - [llvm-readobj] - Refine program headers testing (`-l`, `--program-headers` and `--segment`).
Georgii Rymar via llvm-commits
llvm-commits at lists.llvm.org
Tue Aug 11 06:38:28 PDT 2020
Author: Georgii Rymar
Date: 2020-08-11T16:38:11+03:00
New Revision: d212b63a792188ba483be861554deb4b173e8233
URL: https://github.com/llvm/llvm-project/commit/d212b63a792188ba483be861554deb4b173e8233
DIFF: https://github.com/llvm/llvm-project/commit/d212b63a792188ba483be861554deb4b173e8233.diff
LOG: [llvm-readobj] - Refine program headers testing (`-l`, `--program-headers` and `--segment`).
We have `gnu-phdrs.test` that tests
`-l`, `--program-headers` and `--segment` options for `llvm-readelf`.
We also have:
1) `program-headers.test` that tests `--program-headers` and `-l`
for `llvm-readobj`. It doesn't test `--segment` and also uses
lots of precompiled objects. It is very incomplete in compare
with the `gnu-phdrs.test`.
2) `pt-gnu-property.test` that contains a simple test for the
`PT_GNU_PROPERTY` segment. There is no reason to have it in
a separate file.
This patch:
1) Merges `program-headers.test` and `pt-gnu-property.test` to `gnu-phdrs.test`.
2) Removes 2 precompiled binaries used by `program-headers.test`
(other ones are still used by another tests).
Differential revision: https://reviews.llvm.org/D85526
Added:
Modified:
llvm/test/tools/llvm-readobj/ELF/gnu-phdrs.test
Removed:
llvm/test/Object/Inputs/program-headers.mips
llvm/test/Object/Inputs/program-headers.mips64
llvm/test/tools/llvm-readobj/ELF/program-headers.test
llvm/test/tools/llvm-readobj/ELF/pt-gnu-property.test
################################################################################
diff --git a/llvm/test/Object/Inputs/program-headers.mips b/llvm/test/Object/Inputs/program-headers.mips
deleted file mode 100755
index e3485b223747..000000000000
Binary files a/llvm/test/Object/Inputs/program-headers.mips and /dev/null
diff er
diff --git a/llvm/test/Object/Inputs/program-headers.mips64 b/llvm/test/Object/Inputs/program-headers.mips64
deleted file mode 100644
index ad21c7db08d2..000000000000
Binary files a/llvm/test/Object/Inputs/program-headers.mips64 and /dev/null
diff er
diff --git a/llvm/test/tools/llvm-readobj/ELF/gnu-phdrs.test b/llvm/test/tools/llvm-readobj/ELF/gnu-phdrs.test
index a767c95069cc..0d8b586a2048 100644
--- a/llvm/test/tools/llvm-readobj/ELF/gnu-phdrs.test
+++ b/llvm/test/tools/llvm-readobj/ELF/gnu-phdrs.test
@@ -1,6 +1,9 @@
-## Check how llvm-readelf dumps program headers and prints sections to segments mapping.
+## Check how we dump program headers and print sections to segments
+## mapping (llvm-readelf only) with -l, --program-headers and --segments options.
## Check that -l, --program-headers and --segments are the same option.
+
+## Case A: test llvm-readelf tool.
# RUN: yaml2obj --docnum=1 -DBITS=32 -DMACHINE=EM_386 %s -o %t32.elf
# RUN: llvm-readelf -l %t32.elf 2>&1 > %t.readelf-l.txt
# RUN: llvm-readelf --program-headers %t32.elf 2>&1 > %t.readelf-pheaders.txt
@@ -8,13 +11,23 @@
# RUN: llvm-readelf --segments %t32.elf 2>&1 > %t.readelf-segments.txt
# RUN: cmp %t.readelf-l.txt %t.readelf-segments.txt
+## Case B: test llvm-readobj tool.
+# RUN: llvm-readobj -l %t32.elf 2>&1 > %t.readobj-l.txt
+# RUN: llvm-readobj --program-headers %t32.elf 2>&1 > %t.readobj-pheaders.txt
+# RUN: cmp %t.readobj-l.txt %t.readobj-pheaders.txt
+# RUN: llvm-readobj --segments %t32.elf 2>&1 > %t.readobj-segments.txt
+# RUN: cmp %t.readobj-l.txt %t.readobj-segments.txt
+
## Check we are able to print program headers of
diff erent types.
-# RUN: llvm-readelf -l %t32.elf | \
-# RUN: FileCheck %s --check-prefixes=ELF32,MAPPING --strict-whitespace --match-full-lines
+# RUN: FileCheck %s --check-prefixes=ELF32,MAPPING \
+# RUN: --match-full-lines --strict-whitespace --input-file=%t.readelf-l.txt
+# RUN: FileCheck %s --check-prefixes=ELF-LLVM,ELF32-LLVM \
+# RUN: --match-full-lines --input-file=%t.readobj-l.txt
# RUN: yaml2obj --docnum=1 -DBITS=64 -DMACHINE=EM_X86_64 %s -o %t64.elf
# RUN: llvm-readelf -l %t64.elf | \
# RUN: FileCheck %s --check-prefixes=ELF64,MAPPING --strict-whitespace --match-full-lines
+# RUN: llvm-readobj -l %t64.elf | FileCheck %s --check-prefixes=ELF-LLVM,ELF64-LLVM
# ELF32:There are 23 program headers, starting at offset 52
# ELF32-EMPTY:
@@ -103,6 +116,293 @@
# MAPPING-NEXT: 22 .foo.begin .foo.end {{$}}
# MAPPING-NEXT: None .unused .strtab .shstrtab {{$}}
+# ELF-LLVM: ProgramHeaders [
+# ELF-LLVM-NEXT: ProgramHeader {
+# ELF-LLVM-NEXT: Type: PT_PHDR (0x6)
+# 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 [ (0x2)
+# ELF-LLVM-NEXT: PF_W (0x2)
+# ELF-LLVM-NEXT: ]
+# ELF-LLVM-NEXT: Alignment: 1
+# ELF-LLVM-NEXT: }
+# ELF-LLVM-NEXT: ProgramHeader {
+# ELF-LLVM-NEXT: Type: PT_PHDR (0x6)
+# ELF32-LLVM-NEXT: Offset: 0x317
+# ELF64-LLVM-NEXT: Offset: 0x54B
+# ELF-LLVM-NEXT: VirtualAddress: 0x2000
+# ELF-LLVM-NEXT: PhysicalAddress: 0x2000
+# ELF-LLVM-NEXT: FileSize: 7
+# ELF-LLVM-NEXT: MemSize: 7
+# ELF-LLVM-NEXT: Flags [ (0x1)
+# ELF-LLVM-NEXT: PF_X (0x1)
+# ELF-LLVM-NEXT: ]
+# ELF-LLVM-NEXT: Alignment: 1
+# ELF-LLVM-NEXT: }
+# ELF-LLVM-NEXT: ProgramHeader {
+# ELF-LLVM-NEXT: Type: PT_NULL (0x0)
+# ELF32-LLVM-NEXT: Offset: 0x317
+# ELF64-LLVM-NEXT: Offset: 0x54B
+# ELF-LLVM-NEXT: VirtualAddress: 0x2000
+# ELF-LLVM-NEXT: PhysicalAddress: 0x2000
+# ELF-LLVM-NEXT: FileSize: 7
+# ELF-LLVM-NEXT: MemSize: 7
+# ELF-LLVM-NEXT: Flags [ (0x1)
+# ELF-LLVM-NEXT: PF_X (0x1)
+# ELF-LLVM-NEXT: ]
+# ELF-LLVM-NEXT: Alignment: 1
+# ELF-LLVM-NEXT: }
+# ELF-LLVM-NEXT: ProgramHeader {
+# ELF-LLVM-NEXT: Type: PT_DYNAMIC (0x2)
+# 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 [ (0x7)
+# ELF-LLVM-NEXT: PF_R (0x4)
+# ELF-LLVM-NEXT: PF_W (0x2)
+# ELF-LLVM-NEXT: PF_X (0x1)
+# ELF-LLVM-NEXT: ]
+# ELF-LLVM-NEXT: Alignment: 1
+# ELF-LLVM-NEXT: }
+# ELF-LLVM-NEXT: ProgramHeader {
+# ELF-LLVM-NEXT: Type: PT_INTERP (0x3)
+# ELF32-LLVM-NEXT: Offset: 0x31E
+# ELF64-LLVM-NEXT: Offset: 0x552
+# ELF-LLVM-NEXT: VirtualAddress: 0x3000
+# ELF-LLVM-NEXT: PhysicalAddress: 0x3000
+# ELF-LLVM-NEXT: FileSize: 4
+# ELF-LLVM-NEXT: MemSize: 4
+# ELF-LLVM-NEXT: Flags [ (0x6)
+# ELF-LLVM-NEXT: PF_R (0x4)
+# ELF-LLVM-NEXT: PF_W (0x2)
+# ELF-LLVM-NEXT: ]
+# ELF-LLVM-NEXT: Alignment: 1
+# ELF-LLVM-NEXT: }
+# ELF-LLVM-NEXT: ProgramHeader {
+# ELF-LLVM-NEXT: Type: PT_NOTE (0x4)
+# 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: PT_SHLIB (0x5)
+# ELF32-LLVM-NEXT: Offset: 0x314
+# ELF64-LLVM-NEXT: Offset: 0x548
+# ELF-LLVM-NEXT: VirtualAddress: 0x1000
+# ELF-LLVM-NEXT: PhysicalAddress: 0x1000
+# 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: PT_TLS (0x7)
+# ELF32-LLVM-NEXT: Offset: 0x322
+# ELF64-LLVM-NEXT: Offset: 0x556
+# ELF-LLVM-NEXT: VirtualAddress: 0x4000
+# 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)
+# 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: PT_GNU_EH_FRAME (0x6474E550)
+# 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: PT_SUNW_UNWIND (0x6464E550)
+# 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: PT_GNU_STACK (0x6474E551)
+# 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: PT_GNU_RELRO (0x6474E552)
+# 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: PT_GNU_PROPERTY (0x6474E553)
+# 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: PT_OPENBSD_RANDOMIZE (0x65A3DBE6)
+# 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: PT_OPENBSD_WXNEEDED (0x65A3DBE7)
+# 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: PT_OPENBSD_BOOTDATA (0x65A41BE6)
+# 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: (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)
+# 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)
+# 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)
+# 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)
+# 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)
+# 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: ]
+
--- !ELF
FileHeader:
Class: ELFCLASS[[BITS]]
@@ -288,23 +588,42 @@ ProgramHeaders:
## Check how we dump ARM specific program headers.
# RUN: yaml2obj --docnum=1 -DBITS=64 -DMACHINE=EM_ARM %s -o %tarm.elf
-# RUN: llvm-readelf --program-headers %tarm.elf | FileCheck %s --check-prefix=ARM
+# 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: <unknown>: 0x70000000 0x000548 0x0000000000001000 0x0000000000001000 0x000003 0x000003 0x1
-# ARM-NEXT: EXIDX 0x000548 0x0000000000001000 0x0000000000001000 0x000003 0x000003 0x1
-# ARM-NEXT: <unknown>: 0x70000002 0x000548 0x0000000000001000 0x0000000000001000 0x000003 0x000003 0x1
+# ARM-LLVM: ProgramHeader {
+# ARM-LLVM: Type: (0x70000000)
+# ARM-LLVM: ProgramHeader {
+# ARM-LLVM-NEXT: Type: PT_ARM_EXIDX (0x70000001)
+# ARM-LLVM: ProgramHeader {
+# ARM-LLVM-NEXT: Type: (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
+# 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: REGINFO 0x000548 0x0000000000001000 0x0000000000001000 0x000003 0x000003 0x1
-# MIPS-NEXT: RTPROC 0x000548 0x0000000000001000 0x0000000000001000 0x000003 0x000003 0x1
-# MIPS-NEXT: OPTIONS 0x000548 0x0000000000001000 0x0000000000001000 0x000003 0x000003 0x1
-# MIPS-NEXT: ABIFLAGS 0x000548 0x0000000000001000 0x0000000000001000 0x000003 0x000003 0x1
+# MIPS-GNU: REGINFO 0x000548 0x0000000000001000 0x0000000000001000 0x000003 0x000003 0x1
+# MIPS-GNU-NEXT: RTPROC 0x000548 0x0000000000001000 0x0000000000001000 0x000003 0x000003 0x1
+# MIPS-GNU-NEXT: OPTIONS 0x000548 0x0000000000001000 0x0000000000001000 0x000003 0x000003 0x1
+# MIPS-GNU-NEXT: ABIFLAGS 0x000548 0x0000000000001000 0x0000000000001000 0x000003 0x000003 0x1
-## Check we report a warning when a program interpreter name is non-null-terminated or when
-## PT_INTERP has an offset that goes past the end of the file.
+# MIPS-LLVM: ProgramHeader {
+# MIPS-LLVM: Type: PT_MIPS_REGINFO (0x70000000)
+# MIPS-LLVM: ProgramHeader {
+# MIPS-LLVM-NEXT: Type: PT_MIPS_RTPROC (0x70000001)
+# MIPS-LLVM: ProgramHeader {
+# MIPS-LLVM-NEXT: Type: PT_MIPS_OPTIONS (0x70000002)
+# MIPS-LLVM: ProgramHeader {
+# MIPS-LLVM-NEXT: Type: PT_MIPS_ABIFLAGS (0x70000003)
+
+## Check that llvm-readelf reports a warning when a program interpreter
+## name is non-null-terminated or when PT_INTERP has an offset that
+## goes past the end of the file.
# RUN: yaml2obj --docnum=2 %s -o %t.err
## Show the size of the output produced. It is used in the YAML below.
@@ -358,14 +677,20 @@ ProgramHeaders:
## Case A: the e_phentsize field is invalid.
# RUN: yaml2obj --docnum=3 -DPHENTSIZE=1 %s -o %t.phdr.err
# RUN: llvm-readelf --program-headers %t.phdr.err 2>&1 | \
-# RUN: FileCheck %s -DFILE=%t.phdr.err --check-prefix=WARN-PHENTSIZE
+# RUN: FileCheck %s -DFILE=%t.phdr.err --check-prefix=WARN-PHENTSIZE-GNU
+# RUN: llvm-readobj --program-headers %t.phdr.err 2>&1 | \
+# RUN: FileCheck %s -DFILE=%t.phdr.err --check-prefix=WARN-PHENTSIZE-LLVM
+
+# WARN-PHENTSIZE-GNU: Program Headers:
+# WARN-PHENTSIZE-GNU-NEXT: Type Offset VirtAddr PhysAddr FileSiz MemSiz Flg Align
+# WARN-PHENTSIZE-GNU-NEXT: warning: '[[FILE]]': unable to dump program headers: invalid e_phentsize: 1
+# WARN-PHENTSIZE-GNU: Section to Segment mapping:
+# WARN-PHENTSIZE-GNU-NEXT: Segment Sections...
+# WARN-PHENTSIZE-GNU-NEXT: warning: '[[FILE]]': can't read program headers to build section to segment mapping: invalid e_phentsize: 1
-# WARN-PHENTSIZE: Program Headers:
-# WARN-PHENTSIZE-NEXT: Type Offset VirtAddr PhysAddr FileSiz MemSiz Flg Align
-# WARN-PHENTSIZE-NEXT: warning: '[[FILE]]': unable to dump program headers: invalid e_phentsize: 1
-# WARN-PHENTSIZE: Section to Segment mapping:
-# WARN-PHENTSIZE-NEXT: Segment Sections...
-# WARN-PHENTSIZE-NEXT: warning: '[[FILE]]': can't read program headers to build section to segment mapping: invalid e_phentsize: 1
+# WARN-PHENTSIZE-LLVM: ProgramHeaders [
+# WARN-PHENTSIZE-LLVM-NEXT: warning: '[[FILE]]': unable to dump program headers: invalid e_phentsize: 1
+# WARN-PHENTSIZE-LLVM-NEXT: ]
--- !ELF
FileHeader:
@@ -389,21 +714,30 @@ ProgramHeaders:
## 0x160 + size of headers (56) == file size.
# RUN: yaml2obj --docnum=3 -DPHOFF=0x160 %s -o %t.phdr.no.err2
# RUN: llvm-readelf %t.phdr.no.err2 --program-headers 2>&1 | FileCheck %s --implicit-check-not=warning:
+# RUN: llvm-readobj %t.phdr.no.err2 --program-headers 2>&1 | FileCheck %s --implicit-check-not=warning:
## Check we report a warning when e_phoff goes 1 byte past the end of the file.
# RUN: yaml2obj --docnum=3 -DPHOFF=0x161 %s -o %t.phdr.err2
# RUN: llvm-readelf --program-headers %t.phdr.err2 2>&1 | \
-# RUN: FileCheck %s -DFILE=%t.phdr.err2 --check-prefix=WARN-PHOFF -DOFF=0x161
+# RUN: FileCheck %s -DFILE=%t.phdr.err2 --check-prefix=WARN-PHOFF-GNU -DOFF=0x161
+# RUN: llvm-readobj --program-headers %t.phdr.err2 2>&1 | \
+# RUN: FileCheck %s -DFILE=%t.phdr.err2 --check-prefix=WARN-PHOFF-LLVM -DOFF=0x161
+
+# WARN-PHOFF-GNU: Program Headers:
+# WARN-PHOFF-GNU-NEXT: Type Offset VirtAddr PhysAddr FileSiz MemSiz Flg Align
+# WARN-PHOFF-GNU-NEXT: warning: '[[FILE]]': unable to dump program headers: program headers are longer than binary of size 408: e_phoff = [[OFF]], e_phnum = 1, e_phentsize = 56
+# WARN-PHOFF-GNU: Section to Segment mapping:
+# WARN-PHOFF-GNU-NEXT: Segment Sections...
+# WARN-PHOFF-GNU-NEXT: warning: '[[FILE]]': can't read program headers to build section to segment mapping: program headers are longer than binary of size 408: e_phoff = [[OFF]], e_phnum = 1, e_phentsize = 56
-# WARN-PHOFF: Program Headers:
-# WARN-PHOFF-NEXT: Type Offset VirtAddr PhysAddr FileSiz MemSiz Flg Align
-# WARN-PHOFF-NEXT: warning: '[[FILE]]': unable to dump program headers: program headers are longer than binary of size 408: e_phoff = [[OFF]], e_phnum = 1, e_phentsize = 56
-# WARN-PHOFF: Section to Segment mapping:
-# WARN-PHOFF-NEXT: Segment Sections...
-# WARN-PHOFF-NEXT: warning: '[[FILE]]': can't read program headers to build section to segment mapping: program headers are longer than binary of size 408: e_phoff = [[OFF]], e_phnum = 1, e_phentsize = 56
+# WARN-PHOFF-LLVM: ProgramHeaders [
+# WARN-PHOFF-LLVM-NEXT: warning: '[[FILE]]': unable to dump program headers: program headers are longer than binary of size 408: e_phoff = [[OFF]], e_phnum = 1, e_phentsize = 56
+# WARN-PHOFF-LLVM-NEXT: ]
## Check we report a warning when the value of e_phoff is so large that
## e_phoff + e_phnum * e_phentsize > UINT64_MAX.
# RUN: yaml2obj --docnum=3 -DPHOFF=0xffffffffffffffff %s -o %t.phdr.err3
# RUN: llvm-readelf --program-headers %t.phdr.err3 2>&1 | \
-# RUN: FileCheck %s -DFILE=%t.phdr.err3 --check-prefix=WARN-PHOFF -DOFF=0xffffffffffffffff
+# RUN: FileCheck %s -DFILE=%t.phdr.err3 --check-prefix=WARN-PHOFF-GNU -DOFF=0xffffffffffffffff
+# RUN: llvm-readobj --program-headers %t.phdr.err3 2>&1 | \
+# RUN: FileCheck %s -DFILE=%t.phdr.err3 --check-prefix=WARN-PHOFF-LLVM -DOFF=0xffffffffffffffff
diff --git a/llvm/test/tools/llvm-readobj/ELF/program-headers.test b/llvm/test/tools/llvm-readobj/ELF/program-headers.test
deleted file mode 100644
index 04fd85b23c1b..000000000000
--- a/llvm/test/tools/llvm-readobj/ELF/program-headers.test
+++ /dev/null
@@ -1,194 +0,0 @@
-# RUN: llvm-readobj --program-headers %p/../../../Object/Inputs/program-headers.elf-i386 \
-# RUN: | FileCheck %s -check-prefix ELF-I386
-# RUN: llvm-readobj -l %p/../../../Object/Inputs/program-headers.elf-i386 \
-# RUN: | FileCheck %s -check-prefix ELF-I386
-
-# ELF-I386: ProgramHeaders [
-# ELF-I386-NEXT: ProgramHeader {
-# ELF-I386-NEXT: Type: PT_LOAD (0x1)
-# ELF-I386-NEXT: Offset: 0x0
-# ELF-I386-NEXT: VirtualAddress: 0x8048000
-# ELF-I386-NEXT: PhysicalAddress: 0x8048000
-# ELF-I386-NEXT: FileSize: 308
-# ELF-I386-NEXT: MemSize: 308
-# ELF-I386-NEXT: Flags [ (0x5)
-# ELF-I386-NEXT: PF_R (0x4)
-# ELF-I386-NEXT: PF_X (0x1)
-# ELF-I386-NEXT: ]
-# ELF-I386-NEXT: Alignment: 4096
-# ELF-I386-NEXT: }
-# ELF-I386-NEXT: ProgramHeader {
-# ELF-I386-NEXT: Type: PT_GNU_STACK (0x6474E551)
-# ELF-I386-NEXT: Offset: 0x0
-# ELF-I386-NEXT: VirtualAddress: 0x0
-# ELF-I386-NEXT: PhysicalAddress: 0x0
-# ELF-I386-NEXT: FileSize: 0
-# ELF-I386-NEXT: MemSize: 0
-# ELF-I386-NEXT: Flags [ (0x6)
-# ELF-I386-NEXT: PF_R (0x4)
-# ELF-I386-NEXT: PF_W (0x2)
-# ELF-I386-NEXT: ]
-# ELF-I386-NEXT: Alignment: 4
-# ELF-I386-NEXT: }
-# ELF-I386-NEXT: ]
-
-# RUN: llvm-readobj -l %p/../../../Object/Inputs/program-headers.elf-x86-64 \
-# RUN: | FileCheck %s -check-prefix ELF-X86-64
-
-# ELF-X86-64: ProgramHeaders [
-# ELF-X86-64-NEXT: ProgramHeader {
-# ELF-X86-64-NEXT: Type: PT_LOAD (0x1)
-# ELF-X86-64-NEXT: Offset: 0x0
-# ELF-X86-64-NEXT: VirtualAddress: 0x400000
-# ELF-X86-64-NEXT: PhysicalAddress: 0x400000
-# ELF-X86-64-NEXT: FileSize: 312
-# ELF-X86-64-NEXT: MemSize: 312
-# ELF-X86-64-NEXT: Flags [ (0x5)
-# ELF-X86-64-NEXT: PF_R (0x4)
-# ELF-X86-64-NEXT: PF_X (0x1)
-# ELF-X86-64-NEXT: ]
-# ELF-X86-64-NEXT: Alignment: 2097152
-# ELF-X86-64-NEXT: }
-# ELF-X86-64-NEXT: ProgramHeader {
-# ELF-X86-64-NEXT: Type: PT_GNU_EH_FRAME (0x6474E550)
-# ELF-X86-64-NEXT: Offset: 0xF4
-# ELF-X86-64-NEXT: VirtualAddress: 0x4000F4
-# ELF-X86-64-NEXT: PhysicalAddress: 0x4000F4
-# ELF-X86-64-NEXT: FileSize: 20
-# ELF-X86-64-NEXT: MemSize: 20
-# ELF-X86-64-NEXT: Flags [ (0x4)
-# ELF-X86-64-NEXT: PF_R (0x4)
-# ELF-X86-64-NEXT: ]
-# ELF-X86-64-NEXT: Alignment: 4
-# ELF-X86-64-NEXT: }
-# ELF-X86-64-NEXT: ProgramHeader {
-# ELF-X86-64-NEXT: Type: PT_GNU_STACK (0x6474E551)
-# ELF-X86-64-NEXT: Offset: 0x0
-# ELF-X86-64-NEXT: VirtualAddress: 0x0
-# ELF-X86-64-NEXT: PhysicalAddress: 0x0
-# ELF-X86-64-NEXT: FileSize: 0
-# ELF-X86-64-NEXT: MemSize: 0
-# ELF-X86-64-NEXT: Flags [ (0x6)
-# ELF-X86-64-NEXT: PF_R (0x4)
-# ELF-X86-64-NEXT: PF_W (0x2)
-# ELF-X86-64-NEXT: ]
-# ELF-X86-64-NEXT: Alignment: 8
-# ELF-X86-64-NEXT: }
-# ELF-X86-64-NEXT: ]
-
-# RUN: llvm-readobj -l %p/../../../Object/Inputs/program-headers.mips \
-# RUN: | FileCheck %s -check-prefix ELF-MIPS
-
-# ELF-MIPS: Format: elf32-mips
-# ELF-MIPS-NEXT: Arch: mips
-# ELF-MIPS-NEXT: AddressSize: 32bit
-# ELF-MIPS-NEXT: LoadName:
-# ELF-MIPS-NEXT: ProgramHeaders [
-# ELF-MIPS-NEXT: ProgramHeader {
-# ELF-MIPS-NEXT: Type: PT_MIPS_ABIFLAGS (0x70000003)
-# ELF-MIPS-NEXT: Offset: 0x98
-# ELF-MIPS-NEXT: VirtualAddress: 0x400098
-# ELF-MIPS-NEXT: PhysicalAddress: 0x400098
-# ELF-MIPS-NEXT: FileSize: 24
-# ELF-MIPS-NEXT: MemSize: 24
-# ELF-MIPS-NEXT: Flags [ (0x4)
-# ELF-MIPS-NEXT: PF_R (0x4)
-# ELF-MIPS-NEXT: ]
-# ELF-MIPS-NEXT: Alignment: 8
-# ELF-MIPS-NEXT: }
-# ELF-MIPS-NEXT: ProgramHeader {
-# ELF-MIPS-NEXT: Type: PT_MIPS_REGINFO (0x70000000)
-# ELF-MIPS-NEXT: Offset: 0xB0
-# ELF-MIPS-NEXT: VirtualAddress: 0x4000B0
-# ELF-MIPS-NEXT: PhysicalAddress: 0x4000B0
-# ELF-MIPS-NEXT: FileSize: 24
-# ELF-MIPS-NEXT: MemSize: 24
-# ELF-MIPS-NEXT: Flags [ (0x4)
-# ELF-MIPS-NEXT: PF_R (0x4)
-# ELF-MIPS-NEXT: ]
-# ELF-MIPS-NEXT: Alignment: 4
-# ELF-MIPS-NEXT: }
-# ELF-MIPS-NEXT: ProgramHeader {
-# ELF-MIPS-NEXT: Type: PT_LOAD (0x1)
-# ELF-MIPS-NEXT: Offset: 0x0
-# ELF-MIPS-NEXT: VirtualAddress: 0x400000
-# ELF-MIPS-NEXT: PhysicalAddress: 0x400000
-# ELF-MIPS-NEXT: FileSize: 224
-# ELF-MIPS-NEXT: MemSize: 224
-# ELF-MIPS-NEXT: Flags [ (0x5)
-# ELF-MIPS-NEXT: PF_R (0x4)
-# ELF-MIPS-NEXT: PF_X (0x1)
-# ELF-MIPS-NEXT: ]
-# ELF-MIPS-NEXT: Alignment: 65536
-# ELF-MIPS-NEXT: }
-# ELF-MIPS-NEXT: ]
-
-# RUN: llvm-readobj -l %p/../../../Object/Inputs/program-headers.mips64 \
-# RUN: | FileCheck %s -check-prefix ELF-MIPS64
-
-# ELF-MIPS64: Format: elf64-mips
-# ELF-MIPS64-NEXT: Arch: mips64
-# ELF-MIPS64-NEXT: AddressSize: 64bit
-# ELF-MIPS64-NEXT: LoadName:
-# ELF-MIPS64-NEXT: ProgramHeaders [
-# ELF-MIPS64-NEXT: ProgramHeader {
-# ELF-MIPS64-NEXT: Type: PT_LOAD (0x1)
-# ELF-MIPS64-NEXT: Offset: 0x0
-# ELF-MIPS64-NEXT: VirtualAddress: 0x120000000
-# ELF-MIPS64-NEXT: PhysicalAddress: 0x120000000
-# ELF-MIPS64-NEXT: FileSize: 136
-# ELF-MIPS64-NEXT: MemSize: 136
-# ELF-MIPS64-NEXT: Flags [ (0x5)
-# ELF-MIPS64-NEXT: PF_R (0x4)
-# ELF-MIPS64-NEXT: PF_X (0x1)
-# ELF-MIPS64-NEXT: ]
-# ELF-MIPS64-NEXT: Alignment: 65536
-# ELF-MIPS64-NEXT: }
-# ELF-MIPS64-NEXT: ]
-
-## Test that llvm-readobj dumps OpenBSD specific program headers.
-
-# RUN: yaml2obj %s -o %t
-# RUN: llvm-readobj -l %t | FileCheck %s --check-prefix=OPENBSD-X86-64
-
-# OPENBSD-X86-64: ProgramHeader {
-# OPENBSD-X86-64-NEXT: Type: PT_OPENBSD_RANDOMIZE
-# OPENBSD-X86-64: ProgramHeader {
-# OPENBSD-X86-64-NEXT: Type: PT_OPENBSD_WXNEEDED
-# OPENBSD-X86-64: ProgramHeader {
-# OPENBSD-X86-64-NEXT: Type: PT_OPENBSD_BOOTDATA
-
---- !ELF
-FileHeader:
- Class: ELFCLASS64
- Data: ELFDATA2LSB
- Type: ET_EXEC
- Machine: EM_X86_64
-ProgramHeaders:
- - Type: 0x65a3dbe6 ## PT_OPENBSD_RANDOMIZE
- - Type: 0x65a3dbe7 ## PT_OPENBSD_WXNEEDED
- - Type: 0x65a41be6 ## PT_OPENBSD_BOOTDATA
-
-## Check we report a warning when we are unable to read program headers.
-# RUN: yaml2obj --docnum=2 %s -o %t.err
-# RUN: llvm-readobj --program-headers %t.err 2>&1 | \
-# RUN: FileCheck %s -DFILE=%t.err --check-prefix=WARN-PHENTSIZE
-
-# WARN-PHENTSIZE: ProgramHeaders [
-# WARN-PHENTSIZE-NEXT: warning: '[[FILE]]': unable to dump program headers: invalid e_phentsize: 1
-# WARN-PHENTSIZE-NEXT: ]
-
---- !ELF
-FileHeader:
- Class: ELFCLASS64
- Data: ELFDATA2LSB
- Type: ET_EXEC
- Machine: EM_X86_64
- EPhEntSize: 1
-Sections:
- - Name: .foo
- Type: SHT_PROGBITS
-ProgramHeaders:
- - Type: PT_PHDR
- Sections:
- - Section: .foo
diff --git a/llvm/test/tools/llvm-readobj/ELF/pt-gnu-property.test b/llvm/test/tools/llvm-readobj/ELF/pt-gnu-property.test
deleted file mode 100644
index 31e230433412..000000000000
--- a/llvm/test/tools/llvm-readobj/ELF/pt-gnu-property.test
+++ /dev/null
@@ -1,19 +0,0 @@
-# RUN: yaml2obj %s -o %t
-# RUN: llvm-readelf --program-headers %t | FileCheck %s --check-prefix=GNU
-# RUN: llvm-readobj --program-headers %t | FileCheck %s --check-prefix=LLVM
-
-## TODO: merge this test with program-headers.test.
-
-# GNU: {{ }}GNU_PROPERTY{{ }}
-
-# LLVM: ProgramHeader {
-# LLVM-NEXT: Type: PT_GNU_PROPERTY (0x6474E553)
-
---- !ELF
-FileHeader:
- Class: ELFCLASS64
- Data: ELFDATA2LSB
- Type: ET_EXEC
- Machine: EM_AARCH64
-ProgramHeaders:
- - Type: PT_GNU_PROPERTY
More information about the llvm-commits
mailing list