Skip to content

[llvm-readobj][ELF] Implement JSON output for --dynamic-table #95976

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jun 24, 2024
Merged

[llvm-readobj][ELF] Implement JSON output for --dynamic-table #95976

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
972e1ba
[llvm-readobj][ELF] Fix broken JSON output with --dynamic-table
feg208 Jun 18, 2024
8b91b7a
cleanup spacing on lit test
feg208 Jun 20, 2024
4bc593c
reformats output along the lines of comment from lines 7377 to 7379
feg208 Jun 20, 2024
1369bc3
breaks flags to a list and makes NEEDED et. al. singly valued
feg208 Jun 21, 2024
899ebf5
Addresses some small changes
feg208 Jun 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
357 changes: 357 additions & 0 deletions llvm/test/tools/llvm-readobj/ELF/dynamic-tags.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
# RUN: llvm-readelf --dynamic-table %t1 \
# RUN: | FileCheck %s --strict-whitespace --match-full-lines --check-prefix=GNU64
# RUN: llvm-readelf -d %t1 | FileCheck %s --check-prefix=GNU64
# RUN: llvm-readelf --dynamic-table --pretty-print --elf-output-style=JSON %t1 \
# RUN: | FileCheck %s --strict-whitespace --check-prefix=JSON64

# LLVM64:DynamicSection [ (61 entries)
# LLVM64-NEXT: Tag Type Name/Value
Expand Down Expand Up @@ -138,6 +140,361 @@
# GNU64-NEXT: 0x0000000076543210 (<unknown:>0x76543210) 0x5555666677778888
# GNU64-NEXT: 0x0000000000000000 (NULL) 0x0

# JSON64:"DynamicSection": [
# JSON64-NEXT: {
# JSON64-NEXT: "Tag": 1,
# JSON64-NEXT: "Type": "NEEDED",
# JSON64-NEXT: "Value": 1,
# JSON64-NEXT: "Library": "D"
# JSON64-NEXT: },
# JSON64-NEXT: {
# JSON64-NEXT: "Tag": 2,
# JSON64-NEXT: "Type": "PLTRELSZ",
# JSON64-NEXT: "Value": 16
# JSON64-NEXT: },
# JSON64-NEXT: {
# JSON64-NEXT: "Tag": 3,
# JSON64-NEXT: "Type": "PLTGOT",
# JSON64-NEXT: "Value": 4096
# JSON64-NEXT: },
# JSON64-NEXT: {
# JSON64-NEXT: "Tag": 4,
# JSON64-NEXT: "Type": "HASH",
# JSON64-NEXT: "Value": 4096
# JSON64-NEXT: },
# JSON64-NEXT: {
# JSON64-NEXT: "Tag": 5,
# JSON64-NEXT: "Type": "STRTAB",
# JSON64-NEXT: "Value": 4096
# JSON64-NEXT: },
# JSON64-NEXT: {
# JSON64-NEXT: "Tag": 6,
# JSON64-NEXT: "Type": "SYMTAB",
# JSON64-NEXT: "Value": 4096
# JSON64-NEXT: },
# JSON64-NEXT: {
# JSON64-NEXT: "Tag": 7,
# JSON64-NEXT: "Type": "RELA",
# JSON64-NEXT: "Value": 4096
# JSON64-NEXT: },
# JSON64-NEXT: {
# JSON64-NEXT: "Tag": 8,
# JSON64-NEXT: "Type": "RELASZ",
# JSON64-NEXT: "Value": 16
# JSON64-NEXT: },
# JSON64-NEXT: {
# JSON64-NEXT: "Tag": 9,
# JSON64-NEXT: "Type": "RELAENT",
# JSON64-NEXT: "Value": 1929
# JSON64-NEXT: },
# JSON64-NEXT: {
# JSON64-NEXT: "Tag": 10,
# JSON64-NEXT: "Type": "STRSZ",
# JSON64-NEXT: "Value": 16
# JSON64-NEXT: },
# JSON64-NEXT: {
# JSON64-NEXT: "Tag": 11,
# JSON64-NEXT: "Type": "SYMENT",
# JSON64-NEXT: "Value": 2439
# JSON64-NEXT: },
# JSON64-NEXT: {
# JSON64-NEXT: "Tag": 12,
# JSON64-NEXT: "Type": "INIT",
# JSON64-NEXT: "Value": 4096
# JSON64-NEXT: },
# JSON64-NEXT: {
# JSON64-NEXT: "Tag": 13,
# JSON64-NEXT: "Type": "FINI",
# JSON64-NEXT: "Value": 4096
# JSON64-NEXT: },
# JSON64-NEXT: {
# JSON64-NEXT: "Tag": 14,
# JSON64-NEXT: "Type": "SONAME",
# JSON64-NEXT: "Value": 3,
# JSON64-NEXT: "Name": "U"
# JSON64-NEXT: },
# JSON64-NEXT: {
# JSON64-NEXT: "Tag": 15,
# JSON64-NEXT: "Type": "RPATH",
# JSON64-NEXT: "Value": 5,
# JSON64-NEXT: "Path": [
# JSON64-NEXT: "f"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here and for RUNPATH, you should probably have multiple elements in the path string. That will impact the output of the other test cases in this file, so I'm okay if you want to defer it to the follow-up patch I mention in the out-of-line comment, if you prefer.

# JSON64-NEXT: ]
# JSON64-NEXT: },
# JSON64-NEXT: {
# JSON64-NEXT: "Tag": 16,
# JSON64-NEXT: "Type": "SYMBOLIC",
# JSON64-NEXT: "Value": 1311768467294899695
# JSON64-NEXT: },
# JSON64-NEXT: {
# JSON64-NEXT: "Tag": 17,
# JSON64-NEXT: "Type": "REL",
# JSON64-NEXT: "Value": 4096
# JSON64-NEXT: },
# JSON64-NEXT: {
# JSON64-NEXT: "Tag": 18,
# JSON64-NEXT: "Type": "RELSZ",
# JSON64-NEXT: "Value": 16
# JSON64-NEXT: },
# JSON64-NEXT: {
# JSON64-NEXT: "Tag": 19,
# JSON64-NEXT: "Type": "RELENT",
# JSON64-NEXT: "Value": 291
# JSON64-NEXT: },
# JSON64-NEXT: {
# JSON64-NEXT: "Tag": 20,
# JSON64-NEXT: "Type": "PLTREL",
# JSON64-NEXT: "Value": 7
# JSON64-NEXT: },
# JSON64-NEXT: {
# JSON64-NEXT: "Tag": 21,
# JSON64-NEXT: "Type": "DEBUG",
# JSON64-NEXT: "Value": 18364757930599072545
# JSON64-NEXT: },
# JSON64-NEXT: {
# JSON64-NEXT: "Tag": 22,
# JSON64-NEXT: "Type": "TEXTREL",
# JSON64-NEXT: "Value": 1234605616436508552
# JSON64-NEXT: },
# JSON64-NEXT: {
# JSON64-NEXT: "Tag": 23,
# JSON64-NEXT: "Type": "JMPREL",
# JSON64-NEXT: "Value": 4096
# JSON64-NEXT: },
# JSON64-NEXT: {
# JSON64-NEXT: "Tag": 24,
# JSON64-NEXT: "Type": "BIND_NOW",
# JSON64-NEXT: "Value": 9833440827789222417
# JSON64-NEXT: },
# JSON64-NEXT: {
# JSON64-NEXT: "Tag": 25,
# JSON64-NEXT: "Type": "INIT_ARRAY",
# JSON64-NEXT: "Value": 4096
# JSON64-NEXT: },
# JSON64-NEXT: {
# JSON64-NEXT: "Tag": 26,
# JSON64-NEXT: "Type": "FINI_ARRAY",
# JSON64-NEXT: "Value": 4096
# JSON64-NEXT: },
# JSON64-NEXT: {
# JSON64-NEXT: "Tag": 27,
# JSON64-NEXT: "Type": "INIT_ARRAYSZ",
# JSON64-NEXT: "Value": 16
# JSON64-NEXT: },
# JSON64-NEXT: {
# JSON64-NEXT: "Tag": 28,
# JSON64-NEXT: "Type": "FINI_ARRAYSZ",
# JSON64-NEXT: "Value": 16
# JSON64-NEXT: },
# JSON64-NEXT: {
# JSON64-NEXT: "Tag": 29,
# JSON64-NEXT: "Type": "RUNPATH",
# JSON64-NEXT: "Value": 7,
# JSON64-NEXT: "Path": [
# JSON64-NEXT: "w"
# JSON64-NEXT: ]
# JSON64-NEXT: },
# JSON64-NEXT: {
# JSON64-NEXT: "Tag": 30,
# JSON64-NEXT: "Type": "FLAGS",
# JSON64-NEXT: "Value": 18446744073709551615,
# JSON64-NEXT: "Flags": [
# JSON64-NEXT: "ORIGIN",
# JSON64-NEXT: "SYMBOLIC",
# JSON64-NEXT: "TEXTREL",
# JSON64-NEXT: "BIND_NOW",
# JSON64-NEXT: "STATIC_TLS"
# JSON64-NEXT: ]
# JSON64-NEXT: },
# JSON64-NEXT: {
# JSON64-NEXT: "Tag": 32,
# JSON64-NEXT: "Type": "PREINIT_ARRAY",
# JSON64-NEXT: "Value": 4096
# JSON64-NEXT: },
# JSON64-NEXT: {
# JSON64-NEXT: "Tag": 33,
# JSON64-NEXT: "Type": "PREINIT_ARRAYSZ",
# JSON64-NEXT: "Value": 16
# JSON64-NEXT: },
# JSON64-NEXT: {
# JSON64-NEXT: "Tag": 34,
# JSON64-NEXT: "Type": "SYMTAB_SHNDX",
# JSON64-NEXT: "Value": 4096
# JSON64-NEXT: },
# JSON64-NEXT: {
# JSON64-NEXT: "Tag": 35,
# JSON64-NEXT: "Type": "RELRSZ",
# JSON64-NEXT: "Value": 16
# JSON64-NEXT: },
# JSON64-NEXT: {
# JSON64-NEXT: "Tag": 36,
# JSON64-NEXT: "Type": "RELR",
# JSON64-NEXT: "Value": 4096
# JSON64-NEXT: },
# JSON64-NEXT: {
# JSON64-NEXT: "Tag": 37,
# JSON64-NEXT: "Type": "RELRENT",
# JSON64-NEXT: "Value": 17185
# JSON64-NEXT: },
# JSON64-NEXT: {
# JSON64-NEXT: "Tag": 1610612751,
# JSON64-NEXT: "Type": "ANDROID_REL",
# JSON64-NEXT: "Value": 4096
# JSON64-NEXT: },
# JSON64-NEXT: {
# JSON64-NEXT: "Tag": 1610612752,
# JSON64-NEXT: "Type": "ANDROID_RELSZ",
# JSON64-NEXT: "Value": 16
# JSON64-NEXT: },
# JSON64-NEXT: {
# JSON64-NEXT: "Tag": 1610612753,
# JSON64-NEXT: "Type": "ANDROID_RELA",
# JSON64-NEXT: "Value": 4096
# JSON64-NEXT: },
# JSON64-NEXT: {
# JSON64-NEXT: "Tag": 1610612754,
# JSON64-NEXT: "Type": "ANDROID_RELASZ",
# JSON64-NEXT: "Value": 16
# JSON64-NEXT: },
# JSON64-NEXT: {
# JSON64-NEXT: "Tag": 1879040000,
# JSON64-NEXT: "Type": "ANDROID_RELR",
# JSON64-NEXT: "Value": 4096
# JSON64-NEXT: },
# JSON64-NEXT: {
# JSON64-NEXT: "Tag": 1879040001,
# JSON64-NEXT: "Type": "ANDROID_RELRSZ",
# JSON64-NEXT: "Value": 16
# JSON64-NEXT: },
# JSON64-NEXT: {
# JSON64-NEXT: "Tag": 1879040003,
# JSON64-NEXT: "Type": "ANDROID_RELRENT",
# JSON64-NEXT: "Value": 4660
# JSON64-NEXT: },
# JSON64-NEXT: {
# JSON64-NEXT: "Tag": 1879047925,
# JSON64-NEXT: "Type": "GNU_HASH",
# JSON64-NEXT: "Value": 4096
# JSON64-NEXT: },
# JSON64-NEXT: {
# JSON64-NEXT: "Tag": 1879047926,
# JSON64-NEXT: "Type": "TLSDESC_PLT",
# JSON64-NEXT: "Value": 4096
# JSON64-NEXT: },
# JSON64-NEXT: {
# JSON64-NEXT: "Tag": 1879047927,
# JSON64-NEXT: "Type": "TLSDESC_GOT",
# JSON64-NEXT: "Value": 4096
# JSON64-NEXT: },
# JSON64-NEXT: {
# JSON64-NEXT: "Tag": 1879048185,
# JSON64-NEXT: "Type": "RELACOUNT",
# JSON64-NEXT: "Value": 0
# JSON64-NEXT: },
# JSON64-NEXT: {
# JSON64-NEXT: "Tag": 1879048186,
# JSON64-NEXT: "Type": "RELCOUNT",
# JSON64-NEXT: "Value": 0
# JSON64-NEXT: },
# JSON64-NEXT: {
# JSON64-NEXT: "Tag": 1879048187,
# JSON64-NEXT: "Type": "FLAGS_1"
# JSON64-NEXT: "Value": 18446744073709551615,
# JSON64-NEXT: "Flags": [
# JSON64-NEXT: "NOW",
# JSON64-NEXT: "GLOBAL",
# JSON64-NEXT: "GROUP",
# JSON64-NEXT: "NODELETE",
# JSON64-NEXT: "LOADFLTR",
# JSON64-NEXT: "INITFIRST",
# JSON64-NEXT: "NOOPEN",
# JSON64-NEXT: "ORIGIN",
# JSON64-NEXT: "DIRECT",
# JSON64-NEXT: "TRANS",
# JSON64-NEXT: "INTERPOSE",
# JSON64-NEXT: "NODEFLIB",
# JSON64-NEXT: "NODUMP",
# JSON64-NEXT: "CONFALT",
# JSON64-NEXT: "ENDFILTEE",
# JSON64-NEXT: "DISPRELDNE",
# JSON64-NEXT: "DISPRELPND",
# JSON64-NEXT: "NODIRECT",
# JSON64-NEXT: "IGNMULDEF",
# JSON64-NEXT: "NOKSYMS",
# JSON64-NEXT: "NOHDR",
# JSON64-NEXT: "EDITED",
# JSON64-NEXT: "NORELOC",
# JSON64-NEXT: "SYMINTPOSE",
# JSON64-NEXT: "GLOBAUDIT",
# JSON64-NEXT: "SINGLETON",
# JSON64-NEXT: "PIE"
# JSON64-NEXT: ]
# JSON64-NEXT: },
# JSON64-NEXT: {
# JSON64-NEXT: "Tag": 1879048176,
# JSON64-NEXT: "Type": "VERSYM",
# JSON64-NEXT: "Value": 4096
# JSON64-NEXT: },
# JSON64-NEXT: {
# JSON64-NEXT: "Tag": 1879048188,
# JSON64-NEXT: "Type": "VERDEF",
# JSON64-NEXT: "Value": 4096
# JSON64-NEXT: },
# JSON64-NEXT: {
# JSON64-NEXT: "Tag": 1879048189,
# JSON64-NEXT: "Type": "VERDEFNUM",
# JSON64-NEXT: "Value": 0
# JSON64-NEXT: },
# JSON64-NEXT: {
# JSON64-NEXT: "Tag": 1879048190,
# JSON64-NEXT: "Type": "VERNEED",
# JSON64-NEXT: "Value": 4096
# JSON64-NEXT: },
# JSON64-NEXT: {
# JSON64-NEXT: "Tag": 1879048191,
# JSON64-NEXT: "Type": "VERNEEDNUM",
# JSON64-NEXT: "Value": 0
# JSON64-NEXT: },
# JSON64-NEXT: {
# JSON64-NEXT: "Tag": 2147483645,
# JSON64-NEXT: "Type": "AUXILIARY"
# JSON64-NEXT: "Value": 1,
# JSON64-NEXT: "Library": "D"
# JSON64-NEXT: },
# JSON64-NEXT: {
# JSON64-NEXT: "Tag": 2147483646,
# JSON64-NEXT: "Type": "USED",
# JSON64-NEXT: "Value": 3,
# JSON64-NEXT: "Object": "U"
# JSON64-NEXT: },
# JSON64-NEXT: {
# JSON64-NEXT: "Tag": 2147483647,
# JSON64-NEXT: "Type": "FILTER",
# JSON64-NEXT: "Value": 3,
# JSON64-NEXT: "Library": "U"
# JSON64-NEXT: },
# JSON64-NEXT: {
# JSON64-NEXT: "Tag": 305419896,
# JSON64-NEXT: "Type": "<unknown:>0x12345678",
# JSON64-NEXT: "Value": 9756277979052589857
# JSON64-NEXT: },
# JSON64-NEXT: {
# JSON64-NEXT: "Tag": 1790762736,
# JSON64-NEXT: "Type": "<unknown:>0x6abcdef0",
# JSON64-NEXT: "Value": 11063223766036525858
# JSON64-NEXT: },
# JSON64-NEXT: {
# JSON64-NEXT: "Tag": 1985229328,
# JSON64-NEXT: "Type": "<unknown:>0x76543210",
# JSON64-NEXT: "Value": 6148933456521300104
# JSON64-NEXT: },
# JSON64-NEXT: {
# JSON64-NEXT: "Tag": 0,
# JSON64-NEXT: "Type": "NULL",
# JSON64-NEXT: "Value": 0
# JSON64-NEXT: }
# JSON64-NEXT:]

--- !ELF
FileHeader:
Class: ELFCLASS[[BITS=64]]
Expand Down
Loading
Loading