This is an archive of the discontinued LLVM Phabricator instance.

Differential D71835

[llvm-readobj] - Remove an excessive helper for printing dynamic tags.
ClosedPublic

Authored by grimar on Dec 23 2019, 5:18 AM.

Details

Reviewers
jhenderson
MaskRay
• espindola
Commits
rG301cb91428ee: [llvm-readobj] - Remove an excessive helper for printing dynamic tags.
Summary

This removes the getTypeString from readeobj source because it
almost duplicates the existent method: ELFFile<ELFT>::getDynamicTagAsString.

Side effect: now it prints "<unknown:>0xHEXVALUE" instead of "(unknown)" for unknown values.
llvm-readelf before this patch printed:

0x0000000012345678 (unknown) 0x8765432187654321
0x000000006abcdef0 (unknown) 0x9988776655443322
0x0000000076543210 (unknown) 0x5555666677778888

and now it prints:

0x0000000012345678 (<unknown:>0x12345678) 0x8765432187654321
0x000000006abcdef0 (<unknown:>0x6abcdef0) 0x9988776655443322
0x0000000076543210 (<unknown:>0x76543210) 0x5555666677778888

GNU reaedlf prints different thing:

0x0000000012345678 (<unknown>: 12345678) 0x8765432187654321
0x000000006abcdef0 (Operating System specific: 6abcdef0) 0x9988776655443322
0x0000000076543210 (Processor Specific: 76543210) 0x5555666677778888

I am not sure we want to follow GNU here. Even if we do, it should be separate
patch probably. The new output looks better and closer to GNU anyways,
and the code is a bit simpler.

Diff Detail

Event Timeline

grimar created this revision.Dec 23 2019, 5:18 AM
Herald added a reviewer: • espindola. · View Herald TranscriptDec 23 2019, 5:18 AM
Herald added a project: Restricted Project. · View Herald Transcript
Herald added subscribers: rupprecht, hiraditya, emaste. · View Herald Transcript
grimar updated this revision to Diff 235130.Dec 23 2019, 5:22 AM
  • Removed a piece of code that belongs to a different change.
MaskRay accepted this revision.Dec 23 2019, 1:42 PM

std::string ELFFile<ELFT>::getDynamicTagAsString(uint64_t Type) const is used by llvm-objdump -p (private headers). It is indeed almost identical to the llvm-readelf -d function.

Regarding the behavior change (<unknown>) -> (<unknown:>0x12345678), I agree with you that it probably does not matter.

This revision is now accepted and ready to land.Dec 23 2019, 1:42 PM
Closed by commit rG301cb91428ee: [llvm-readobj] - Remove an excessive helper for printing dynamic tags. (authored by grimar). · Explain WhyDec 24 2019, 1:02 AM
This revision was automatically updated to reflect the committed changes.
jhenderson added a comment.Jan 2 2020, 4:03 AM

I am not sure we want to follow GNU here. Even if we do, it should be separate patch probably. The new output looks better and closer to GNU anyways, and the code is a bit simpler.

FWIW, I'm not sure I see a benefit from diverging from GNU here. The only thing I can think of is the lack of '0x' potentially making the value confusing, but the value is actually listed in the first column anyway, so that point isn't exactly an issue.

grimar added a comment.Jan 13 2020, 1:55 AM
In D71835#1801042, @jhenderson wrote:

I am not sure we want to follow GNU here. Even if we do, it should be separate patch probably. The new output looks better and closer to GNU anyways, and the code is a bit simpler.

FWIW, I'm not sure I see a benefit from diverging from GNU here. The only thing I can think of is the lack of '0x' potentially making the value confusing, but the value is actually listed in the first column anyway, so that point isn't exactly an issue.

See:

GNU prints:

0x0000000012345678 (<unknown>: 12345678) 0x8765432187654321
0x000000006abcdef0 (Operating System specific: 6abcdef0) 0x9988776655443322
0x0000000076543210 (Processor Specific: 76543210) 0x5555666677778888

We print:

0x0000000012345678 (<unknown:>0x12345678) 0x8765432187654321
0x000000006abcdef0 (<unknown:>0x6abcdef0) 0x9988776655443322
0x0000000076543210 (<unknown:>0x76543210) 0x5555666677778888

The benefit I see is that we do not need to care about printing "Operating System specific" or "Processor Specific" text
and doing actions to align columns after that. I.e. code that prints "<unknown:>" is just a bit simpler.
It is not clear how much useful to say that unknown value is "Operating System specific" or "Processor Specific".
(I am OK to copy GNU's behavior here if we decide we want it, though)

(Seems we need to change "<unknown:>" to "<unknown>: ", btw, it looks like a bug)

The only thing I can think of is the lack of '0x' potentially making the value confusing, but the value is actually listed in the first column anyway, so that point isn't exactly an issue.

I think having "0x" prefix for hex values in the output is always(?) a good thing. I think it is a GNU output bug and we probably should not be bug-compatible with GNU here.

jhenderson added a comment.Jan 13 2020, 2:24 AM
In D71835#1816484, @grimar wrote:

The benefit I see is that we do not need to care about printing "Operating System specific" or "Processor Specific" text
and doing actions to align columns after that. I.e. code that prints "<unknown:>" is just a bit simpler.
It is not clear how much useful to say that unknown value is "Operating System specific" or "Processor Specific".
(I am OK to copy GNU's behavior here if we decide we want it, though)

As someone who works in a system with a lot of one or other of the OS/Processory specific tags, I would much rather see OS/Proc-specific than Unknown for those cases.

The only thing I can think of is the lack of '0x' potentially making the value confusing, but the value is actually listed in the first column anyway, so that point isn't exactly an issue.

I think having "0x" prefix for hex values in the output is always(?) a good thing. I think it is a GNU output bug and we probably should not be bug-compatible with GNU here.

I don't dispute having an 0x prefix is a good thing, but I don't think it's a bug. If you can persuade the GNU guys to change their behaviour, I'd be more than happy to support the 0x being added. However, it's quite common for it not to be present in various GNU tool outputs from my experience.

GNU output style really needs to be compatible with GNU readelf. That was one of my main takeaways having talked to various people at the BoF and round table at last year's Euro LLVM.

MaskRay added a comment.Jan 13 2020, 11:18 AM

I think our goal is to make llvm-readobj -d and llvm-readelf -d consistent. It seems we have a preferable output in mind which is inconsistent with GNU readelf. I agree that omitting the value from the (unknown) column is better.

0x0000000012345678 (unknown) 0x8765432187654321

@grimar Can you send an email to the mailing list binutils@sourceware.org and ask whether they'd like to change?

grimar added a comment.Jan 14 2020, 12:58 AM
In D71835#1817700, @MaskRay wrote:

I think our goal is to make llvm-readobj -d and llvm-readelf -d consistent. It seems we have a preferable output in mind which is inconsistent with GNU readelf. I agree that omitting the value from the (unknown) column is better.

0x0000000012345678 (unknown) 0x8765432187654321

@grimar Can you send an email to the mailing list binutils@sourceware.org and ask whether they'd like to change?

I'd like to clarify. GNU readelf currently prints:

0x0000000012345678 (<unknown>: 12345678) 0x8765432187654321
0x000000006abcdef0 (Operating System specific: 6abcdef0) 0x9988776655443322
0x0000000076543210 (Processor Specific: 76543210) 0x5555666677778888

Do you suggest to start using (unknown) everywhere?

0x0000000012345678 (unknown) 0x8765432187654321
0x000000006abcdef0 (unknown) 0x9988776655443322
0x0000000076543210 (unknown) 0x5555666677778888

Or do you want to keep Operating System specific and Processor Specific text?
(I think James wants to keep them).

0x0000000012345678 (unknown) 0x8765432187654321
0x000000006abcdef0 (Operating System specific) 0x9988776655443322
0x0000000076543210 (Processor Specific) 0x5555666677778888

Assuming we want to keep them, I am thinking about shortening and lower-casing:

0x0000000012345678 (unknown) 0x8765432187654321
0x000000006abcdef0 (OS specific) 0x9988776655443322
0x0000000076543210 (processor specific) 0x5555666677778888
jhenderson added a comment.Jan 14 2020, 1:39 AM
In D71835#1817700, @MaskRay wrote:

I think our goal is to make llvm-readobj -d and llvm-readelf -d consistent.

FWIW, I don't see a massive need for this (we don't make, e.g. symbol output consistent), but I don't oppose attempting it as long as llvm-readelf output is consistent with GNU readelf.

MaskRay added a comment.EditedJan 14 2020, 11:40 AM
In D71835#1818892, @grimar wrote:

Assuming we want to keep them, I am thinking about shortening and lower-casing:

0x0000000012345678 (unknown) 0x8765432187654321
0x000000006abcdef0 (OS specific) 0x9988776655443322
0x0000000076543210 (processor specific) 0x5555666677778888

This looks good.

In D71835#1818970, @jhenderson wrote:
In D71835#1817700, @MaskRay wrote:

I think our goal is to make llvm-readobj -d and llvm-readelf -d consistent.

FWIW, I don't see a massive need for this (we don't make, e.g. symbol output consistent), but I don't oppose attempting it as long as llvm-readelf output is consistent with GNU readelf.

I was postulating the original intention of this patch: make things consistent in places where the exact llvm-readobj -d output does not matter that much / share code. In GNU readelf's output, the second column duplicates some information from the first column, so it is not ideal.

0x0000000012345678 (<unknown>: 12345678) 0x8765432187654321
0x000000006abcdef0 (Operating System specific: 6abcdef0) 0x9988776655443322
0x0000000076543210 (Processor Specific: 76543210) 0x5555666677778888
grimar added a comment.Jan 15 2020, 1:29 AM
In D71835#1820317, @MaskRay wrote:
In D71835#1818892, @grimar wrote:

Assuming we want to keep them, I am thinking about shortening and lower-casing:

0x0000000012345678 (unknown) 0x8765432187654321
0x000000006abcdef0 (OS specific) 0x9988776655443322
0x0000000076543210 (processor specific) 0x5555666677778888

This looks good.

OK. Lets wait a day or two more to see if anyone else has comments/ideas/objections about this and I'll post the suggestion to GNU mail list then.

Revision Contents

PathSize
llvm/
lib/
Object/
2 lines
test/
tools/
llvm-readobj/
ELF/
130 lines
tools/
llvm-readobj/
90 lines

Diff 235130

llvm/lib/Object/ELF.cpp

Show First 20 Lines • Show All 471 Lines • ▼ Show 20 Lines#undef DYNAMIC_TAG
switch (Type) { switch (Type) {
// Now handle all dynamic tags except the architecture specific ones // Now handle all dynamic tags except the architecture specific ones
#define AARCH64_DYNAMIC_TAG(name, value) #define AARCH64_DYNAMIC_TAG(name, value)
#define MIPS_DYNAMIC_TAG(name, value) #define MIPS_DYNAMIC_TAG(name, value)
#define HEXAGON_DYNAMIC_TAG(name, value) #define HEXAGON_DYNAMIC_TAG(name, value)
#define PPC64_DYNAMIC_TAG(name, value) #define PPC64_DYNAMIC_TAG(name, value)
// Also ignore marker tags such as DT_HIOS (maps to DT_VERNEEDNUM), etc. // Also ignore marker tags such as DT_HIOS (maps to DT_VERNEEDNUM), etc.
#define DYNAMIC_TAG_MARKER(name, value) #define DYNAMIC_TAG_MARKER(name, value)
#define DYNAMIC_TAG(name, value) DYNAMIC_STRINGIFY_ENUM(name, value) #define DYNAMIC_TAG(name, value) case value: return #name;
#include "llvm/BinaryFormat/DynamicTags.def" #include "llvm/BinaryFormat/DynamicTags.def"
#undef DYNAMIC_TAG #undef DYNAMIC_TAG
#undef AARCH64_DYNAMIC_TAG #undef AARCH64_DYNAMIC_TAG
#undef MIPS_DYNAMIC_TAG #undef MIPS_DYNAMIC_TAG
#undef HEXAGON_DYNAMIC_TAG #undef HEXAGON_DYNAMIC_TAG
#undef PPC64_DYNAMIC_TAG #undef PPC64_DYNAMIC_TAG
#undef DYNAMIC_TAG_MARKER #undef DYNAMIC_TAG_MARKER
#undef DYNAMIC_STRINGIFY_ENUM #undef DYNAMIC_STRINGIFY_ENUM
▲ Show 20 Lines • Show All 101 Lines • Show Last 20 Lines

llvm/test/tools/llvm-readobj/ELF/dynamic-tags.test

Show First 20 Lines • Show All 60 Lines • ▼ Show 20 Lines
# LLVM-NEXT: 0x000000006FFFFFF0 VERSYM 0x1000 # LLVM-NEXT: 0x000000006FFFFFF0 VERSYM 0x1000
# LLVM-NEXT: 0x000000006FFFFFFC VERDEF 0x1000 # LLVM-NEXT: 0x000000006FFFFFFC VERDEF 0x1000
# LLVM-NEXT: 0x000000006FFFFFFD VERDEFNUM 0 # LLVM-NEXT: 0x000000006FFFFFFD VERDEFNUM 0
# LLVM-NEXT: 0x000000006FFFFFFE VERNEED 0x1000 # LLVM-NEXT: 0x000000006FFFFFFE VERNEED 0x1000
# LLVM-NEXT: 0x000000006FFFFFFF VERNEEDNUM 0 # LLVM-NEXT: 0x000000006FFFFFFF VERNEEDNUM 0
# LLVM-NEXT: 0x000000007FFFFFFD AUXILIARY Auxiliary library: [D] # LLVM-NEXT: 0x000000007FFFFFFD AUXILIARY Auxiliary library: [D]
# LLVM-NEXT: 0x000000007FFFFFFE USED Not needed object: [U] # LLVM-NEXT: 0x000000007FFFFFFE USED Not needed object: [U]
# LLVM-NEXT: 0x000000007FFFFFFF FILTER Filter library: [U] # LLVM-NEXT: 0x000000007FFFFFFF FILTER Filter library: [U]
# LLVM-NEXT: 0x0000000012345678 unknown 0x8765432187654321 # LLVM-NEXT: 0x0000000012345678 <unknown:>0x12345678 0x8765432187654321
# LLVM-NEXT: 0x000000006ABCDEF0 unknown 0x9988776655443322 # LLVM-NEXT: 0x000000006ABCDEF0 <unknown:>0x6abcdef0 0x9988776655443322
# LLVM-NEXT: 0x0000000076543210 unknown 0x5555666677778888 # LLVM-NEXT: 0x0000000076543210 <unknown:>0x76543210 0x5555666677778888
# LLVM-NEXT: 0x0000000000000000 NULL 0x0 # LLVM-NEXT: 0x0000000000000000 NULL 0x0
# LLVM-NEXT: ] # LLVM-NEXT: ]
# GNU: Dynamic section at offset {{.*}} contains 61 entries: # GNU: Dynamic section at offset {{.*}} contains 61 entries:
# GNU-NEXT: Tag Type Name/Value # GNU-NEXT: Tag Type Name/Value
# GNU-NEXT: 0x0000000000000001 (NEEDED) Shared library: [D] # GNU-NEXT: 0x0000000000000001 (NEEDED) Shared library: [D]
# GNU-NEXT: 0x0000000000000002 (PLTRELSZ) 16 (bytes) # GNU-NEXT: 0x0000000000000002 (PLTRELSZ) 16 (bytes)
# GNU-NEXT: 0x0000000000000003 (PLTGOT) 0x1000 # GNU-NEXT: 0x0000000000000003 (PLTGOT) 0x1000
# GNU-NEXT: 0x0000000000000004 (HASH) 0x1000 # GNU-NEXT: 0x0000000000000004 (HASH) 0x1000
# GNU-NEXT: 0x0000000000000005 (STRTAB) 0x1000 # GNU-NEXT: 0x0000000000000005 (STRTAB) 0x1000
# GNU-NEXT: 0x0000000000000006 (SYMTAB) 0x1000 # GNU-NEXT: 0x0000000000000006 (SYMTAB) 0x1000
# GNU-NEXT: 0x0000000000000007 (RELA) 0x1000 # GNU-NEXT: 0x0000000000000007 (RELA) 0x1000
# GNU-NEXT: 0x0000000000000008 (RELASZ) 16 (bytes) # GNU-NEXT: 0x0000000000000008 (RELASZ) 16 (bytes)
# GNU-NEXT: 0x0000000000000009 (RELAENT) 1929 (bytes) # GNU-NEXT: 0x0000000000000009 (RELAENT) 1929 (bytes)
# GNU-NEXT: 0x000000000000000a (STRSZ) 16 (bytes) # GNU-NEXT: 0x000000000000000a (STRSZ) 16 (bytes)
# GNU-NEXT: 0x000000000000000b (SYMENT) 2439 (bytes) # GNU-NEXT: 0x000000000000000b (SYMENT) 2439 (bytes)
# GNU-NEXT: 0x000000000000000c (INIT) 0x1000 # GNU-NEXT: 0x000000000000000c (INIT) 0x1000
# GNU-NEXT: 0x000000000000000d (FINI) 0x1000 # GNU-NEXT: 0x000000000000000d (FINI) 0x1000
# GNU-NEXT: 0x000000000000000e (SONAME) Library soname: [U] # GNU-NEXT: 0x000000000000000e (SONAME) Library soname: [U]
# GNU-NEXT: 0x000000000000000f (RPATH) Library rpath: [f] # GNU-NEXT: 0x000000000000000f (RPATH) Library rpath: [f]
# GNU-NEXT: 0x0000000000000010 (SYMBOLIC) 0x1234567890abcdef # GNU-NEXT: 0x0000000000000010 (SYMBOLIC) 0x1234567890abcdef
# GNU-NEXT: 0x0000000000000011 (REL) 0x1000 # GNU-NEXT: 0x0000000000000011 (REL) 0x1000
# GNU-NEXT: 0x0000000000000012 (RELSZ) 16 (bytes) # GNU-NEXT: 0x0000000000000012 (RELSZ) 16 (bytes)
# GNU-NEXT: 0x0000000000000013 (RELENT) 291 (bytes) # GNU-NEXT: 0x0000000000000013 (RELENT) 291 (bytes)
# GNU-NEXT: 0x0000000000000014 (PLTREL) RELA # GNU-NEXT: 0x0000000000000014 (PLTREL) RELA
# GNU-NEXT: 0x0000000000000015 (DEBUG) 0xfedcba0987654321 # GNU-NEXT: 0x0000000000000015 (DEBUG) 0xfedcba0987654321
# GNU-NEXT: 0x0000000000000016 (TEXTREL) 0x1122334455667788 # GNU-NEXT: 0x0000000000000016 (TEXTREL) 0x1122334455667788
# GNU-NEXT: 0x0000000000000017 (JMPREL) 0x1000 # GNU-NEXT: 0x0000000000000017 (JMPREL) 0x1000
# GNU-NEXT: 0x0000000000000018 (BIND_NOW) 0x8877665544332211 # GNU-NEXT: 0x0000000000000018 (BIND_NOW) 0x8877665544332211
# GNU-NEXT: 0x0000000000000019 (INIT_ARRAY) 0x1000 # GNU-NEXT: 0x0000000000000019 (INIT_ARRAY) 0x1000
# GNU-NEXT: 0x000000000000001a (FINI_ARRAY) 0x1000 # GNU-NEXT: 0x000000000000001a (FINI_ARRAY) 0x1000
# GNU-NEXT: 0x000000000000001b (INIT_ARRAYSZ) 16 (bytes) # GNU-NEXT: 0x000000000000001b (INIT_ARRAYSZ) 16 (bytes)
# GNU-NEXT: 0x000000000000001c (FINI_ARRAYSZ) 16 (bytes) # GNU-NEXT: 0x000000000000001c (FINI_ARRAYSZ) 16 (bytes)
# GNU-NEXT: 0x000000000000001d (RUNPATH) Library runpath: [w] # GNU-NEXT: 0x000000000000001d (RUNPATH) Library runpath: [w]
# GNU-NEXT: 0x000000000000001e (FLAGS) ORIGIN SYMBOLIC TEXTREL BIND_NOW STATIC_TLS {{$}} # GNU-NEXT: 0x000000000000001e (FLAGS) ORIGIN SYMBOLIC TEXTREL BIND_NOW STATIC_TLS {{$}}
# GNU-NEXT: 0x0000000000000020 (PREINIT_ARRAY) 0x1000 # GNU-NEXT: 0x0000000000000020 (PREINIT_ARRAY) 0x1000
# GNU-NEXT: 0x0000000000000021 (PREINIT_ARRAYSZ) 16 (bytes) # GNU-NEXT: 0x0000000000000021 (PREINIT_ARRAYSZ) 16 (bytes)
# GNU-NEXT: 0x0000000000000022 (SYMTAB_SHNDX) 0x1000 # GNU-NEXT: 0x0000000000000022 (SYMTAB_SHNDX) 0x1000
# GNU-NEXT: 0x0000000000000023 (RELRSZ) 0x10 # GNU-NEXT: 0x0000000000000023 (RELRSZ) 0x10
# GNU-NEXT: 0x0000000000000024 (RELR) 0x1000 # GNU-NEXT: 0x0000000000000024 (RELR) 0x1000
# GNU-NEXT: 0x0000000000000025 (RELRENT) 0x4321 # GNU-NEXT: 0x0000000000000025 (RELRENT) 0x4321
# GNU-NEXT: 0x000000006000000f (ANDROID_REL) 0x1000 # GNU-NEXT: 0x000000006000000f (ANDROID_REL) 0x1000
# GNU-NEXT: 0x0000000060000010 (ANDROID_RELSZ) 16 (bytes) # GNU-NEXT: 0x0000000060000010 (ANDROID_RELSZ) 16 (bytes)
# GNU-NEXT: 0x0000000060000011 (ANDROID_RELA) 0x1000 # GNU-NEXT: 0x0000000060000011 (ANDROID_RELA) 0x1000
# GNU-NEXT: 0x0000000060000012 (ANDROID_RELASZ) 16 (bytes) # GNU-NEXT: 0x0000000060000012 (ANDROID_RELASZ) 16 (bytes)
# GNU-NEXT: 0x000000006fffe000 (ANDROID_RELR) 0x1000 # GNU-NEXT: 0x000000006fffe000 (ANDROID_RELR) 0x1000
# GNU-NEXT: 0x000000006fffe001 (ANDROID_RELRSZ) 0x10 # GNU-NEXT: 0x000000006fffe001 (ANDROID_RELRSZ) 0x10
# GNU-NEXT: 0x000000006fffe003 (ANDROID_RELRENT) 0x1234 # GNU-NEXT: 0x000000006fffe003 (ANDROID_RELRENT) 0x1234
# GNU-NEXT: 0x000000006ffffef5 (GNU_HASH) 0x1000 # GNU-NEXT: 0x000000006ffffef5 (GNU_HASH) 0x1000
# GNU-NEXT: 0x000000006ffffef6 (TLSDESC_PLT) 0x1000 # GNU-NEXT: 0x000000006ffffef6 (TLSDESC_PLT) 0x1000
# GNU-NEXT: 0x000000006ffffef7 (TLSDESC_GOT) 0x1000 # GNU-NEXT: 0x000000006ffffef7 (TLSDESC_GOT) 0x1000
# GNU-NEXT: 0x000000006ffffff9 (RELACOUNT) 0 # GNU-NEXT: 0x000000006ffffff9 (RELACOUNT) 0
# GNU-NEXT: 0x000000006ffffffa (RELCOUNT) 0 # GNU-NEXT: 0x000000006ffffffa (RELCOUNT) 0
# GNU-NEXT: 0x000000006ffffffb (FLAGS_1) NOW GLOBAL GROUP NODELETE LOADFLTR INITFIRST NOOPEN ORIGIN DIRECT TRANS INTERPOSE NODEFLIB NODUMP CONFALT ENDFILTEE DISPRELDNE DISPRELPND NODIRECT IGNMULDEF NOKSYMS NOHDR EDITED NORELOC SYMINTPOSE GLOBAUDIT SINGLETON {{$}} # GNU-NEXT: 0x000000006ffffffb (FLAGS_1) NOW GLOBAL GROUP NODELETE LOADFLTR INITFIRST NOOPEN ORIGIN DIRECT TRANS INTERPOSE NODEFLIB NODUMP CONFALT ENDFILTEE DISPRELDNE DISPRELPND NODIRECT IGNMULDEF NOKSYMS NOHDR EDITED NORELOC SYMINTPOSE GLOBAUDIT SINGLETON {{$}}
# GNU-NEXT: 0x000000006ffffff0 (VERSYM) 0x1000 # GNU-NEXT: 0x000000006ffffff0 (VERSYM) 0x1000
# GNU-NEXT: 0x000000006ffffffc (VERDEF) 0x1000 # GNU-NEXT: 0x000000006ffffffc (VERDEF) 0x1000
# GNU-NEXT: 0x000000006ffffffd (VERDEFNUM) 0 # GNU-NEXT: 0x000000006ffffffd (VERDEFNUM) 0
# GNU-NEXT: 0x000000006ffffffe (VERNEED) 0x1000 # GNU-NEXT: 0x000000006ffffffe (VERNEED) 0x1000
# GNU-NEXT: 0x000000006fffffff (VERNEEDNUM) 0 # GNU-NEXT: 0x000000006fffffff (VERNEEDNUM) 0
# GNU-NEXT: 0x000000007ffffffd (AUXILIARY) Auxiliary library: [D] # GNU-NEXT: 0x000000007ffffffd (AUXILIARY) Auxiliary library: [D]
# GNU-NEXT: 0x000000007ffffffe (USED) Not needed object: [U] # GNU-NEXT: 0x000000007ffffffe (USED) Not needed object: [U]
# GNU-NEXT: 0x000000007fffffff (FILTER) Filter library: [U] # GNU-NEXT: 0x000000007fffffff (FILTER) Filter library: [U]
# GNU-NEXT: 0x0000000012345678 (unknown) 0x8765432187654321 # GNU-NEXT: 0x0000000012345678 (<unknown:>0x12345678) 0x8765432187654321
# GNU-NEXT: 0x000000006abcdef0 (unknown) 0x9988776655443322 # GNU-NEXT: 0x000000006abcdef0 (<unknown:>0x6abcdef0) 0x9988776655443322
# GNU-NEXT: 0x0000000076543210 (unknown) 0x5555666677778888 # GNU-NEXT: 0x0000000076543210 (<unknown:>0x76543210) 0x5555666677778888
# GNU-NEXT: 0x0000000000000000 (NULL) 0x0 # GNU-NEXT: 0x0000000000000000 (NULL) 0x0
--- !ELF --- !ELF
FileHeader: FileHeader:
Class: ELFCLASS64 Class: ELFCLASS64
Data: ELFDATA2LSB Data: ELFDATA2LSB
Type: ET_EXEC Type: ET_EXEC
Machine: EM_X86_64 Machine: EM_X86_64
Sections: Sections:
▲ Show 20 Lines • Show All 142 Lines • Show Last 20 Lines

llvm/tools/llvm-readobj/ELFDumper.cpp

Show First 20 Lines • Show All 251 Lines • ▼ Show 20 Linesprivate:
void printAttributes(); void printAttributes();
void printMipsReginfo(); void printMipsReginfo();
void printMipsOptions(); void printMipsOptions();
std::pair<const Elf_Phdr *, const Elf_Shdr *> std::pair<const Elf_Phdr *, const Elf_Shdr *>
findDynamic(const ELFFile<ELFT> *Obj); findDynamic(const ELFFile<ELFT> *Obj);
void loadDynamicTable(const ELFFile<ELFT> *Obj); void loadDynamicTable(const ELFFile<ELFT> *Obj);
void parseDynamicTable(); void parseDynamicTable(const ELFFile<ELFT> *Obj);
Expected<StringRef> getSymbolVersion(const Elf_Sym *symb, Expected<StringRef> getSymbolVersion(const Elf_Sym *symb,
bool &IsDefault) const; bool &IsDefault) const;
Error LoadVersionMap() const; Error LoadVersionMap() const;
const object::ELFObjectFile<ELFT> *ObjF; const object::ELFObjectFile<ELFT> *ObjF;
DynRegionInfo DynRelRegion; DynRegionInfo DynRelRegion;
DynRegionInfo DynRelaRegion; DynRegionInfo DynRelaRegion;
▲ Show 20 Lines • Show All 1,594 Lines • ▼ Show 20 Lines if (DynamicSec) {
IsSecTableValid = !FromSec.getAsArrayRef<Elf_Dyn>().empty(); IsSecTableValid = !FromSec.getAsArrayRef<Elf_Dyn>().empty();
} }
// When we only have information from one of the SHT_DYNAMIC section header or // When we only have information from one of the SHT_DYNAMIC section header or
// PT_DYNAMIC program header, just use that. // PT_DYNAMIC program header, just use that.
if (!DynamicPhdr || !DynamicSec) { if (!DynamicPhdr || !DynamicSec) {
if ((DynamicPhdr && IsPhdrTableValid) || (DynamicSec && IsSecTableValid)) { if ((DynamicPhdr && IsPhdrTableValid) || (DynamicSec && IsSecTableValid)) {
DynamicTable = DynamicPhdr ? FromPhdr : FromSec; DynamicTable = DynamicPhdr ? FromPhdr : FromSec;
parseDynamicTable(); parseDynamicTable(Obj);
} else { } else {
reportWarning(createError("no valid dynamic table was found"), reportWarning(createError("no valid dynamic table was found"),
ObjF->getFileName()); ObjF->getFileName());
} }
return; return;
} }
// At this point we have tables found from the section header and from the // At this point we have tables found from the section header and from the
Show All 24 Linesvoid ELFDumper<ELFT>::loadDynamicTable(const ELFFile<ELFT> *Obj) {
} else { } else {
reportWarning( reportWarning(
createError( createError(
"PT_DYNAMIC dynamic table is invalid: SHT_DYNAMIC will be used"), "PT_DYNAMIC dynamic table is invalid: SHT_DYNAMIC will be used"),
ObjF->getFileName()); ObjF->getFileName());
DynamicTable = FromSec; DynamicTable = FromSec;
} }
parseDynamicTable(); parseDynamicTable(Obj);
} }
template <typename ELFT> template <typename ELFT>
ELFDumper<ELFT>::ELFDumper(const object::ELFObjectFile<ELFT> *ObjF, ELFDumper<ELFT>::ELFDumper(const object::ELFObjectFile<ELFT> *ObjF,
ScopedPrinter &Writer) ScopedPrinter &Writer)
: ObjDumper(Writer), ObjF(ObjF), DynRelRegion(ObjF->getFileName()), : ObjDumper(Writer), ObjF(ObjF), DynRelRegion(ObjF->getFileName()),
DynRelaRegion(ObjF->getFileName()), DynRelrRegion(ObjF->getFileName()), DynRelaRegion(ObjF->getFileName()), DynRelrRegion(ObjF->getFileName()),
DynPLTRelRegion(ObjF->getFileName()), DynSymRegion(ObjF->getFileName()), DynPLTRelRegion(ObjF->getFileName()), DynSymRegion(ObjF->getFileName()),
▲ Show 20 Lines • Show All 49 Lines • ▼ Show 20 LinesELFDumper<ELFT>::ELFDumper(const object::ELFObjectFile<ELFT> *ObjF,
loadDynamicTable(Obj); loadDynamicTable(Obj);
if (opts::Output == opts::GNU) if (opts::Output == opts::GNU)
ELFDumperStyle.reset(new GNUStyle<ELFT>(Writer, this)); ELFDumperStyle.reset(new GNUStyle<ELFT>(Writer, this));
else else
ELFDumperStyle.reset(new LLVMStyle<ELFT>(Writer, this)); ELFDumperStyle.reset(new LLVMStyle<ELFT>(Writer, this));
} }
static const char *getTypeString(unsigned Arch, uint64_t Type) { template <typename ELFT>
#define DYNAMIC_TAG(n, v) void ELFDumper<ELFT>::parseDynamicTable(const ELFFile<ELFT> *Obj) {
switch (Arch) {
case EM_AARCH64:
switch (Type) {
#define AARCH64_DYNAMIC_TAG(name, value) \
case DT_##name: \
return #name;
#include "llvm/BinaryFormat/DynamicTags.def"
#undef AARCH64_DYNAMIC_TAG
}
break;
case EM_HEXAGON:
switch (Type) {
#define HEXAGON_DYNAMIC_TAG(name, value) \
case DT_##name: \
return #name;
#include "llvm/BinaryFormat/DynamicTags.def"
#undef HEXAGON_DYNAMIC_TAG
}
break;
case EM_MIPS:
switch (Type) {
#define MIPS_DYNAMIC_TAG(name, value) \
case DT_##name: \
return #name;
#include "llvm/BinaryFormat/DynamicTags.def"
#undef MIPS_DYNAMIC_TAG
}
break;
case EM_PPC64:
switch (Type) {
#define PPC64_DYNAMIC_TAG(name, value) \
case DT_##name: \
return #name;
#include "llvm/BinaryFormat/DynamicTags.def"
#undef PPC64_DYNAMIC_TAG
}
break;
}
#undef DYNAMIC_TAG
switch (Type) {
// Now handle all dynamic tags except the architecture specific ones
#define AARCH64_DYNAMIC_TAG(name, value)
#define MIPS_DYNAMIC_TAG(name, value)
#define HEXAGON_DYNAMIC_TAG(name, value)
#define PPC64_DYNAMIC_TAG(name, value)
// Also ignore marker tags such as DT_HIOS (maps to DT_VERNEEDNUM), etc.
#define DYNAMIC_TAG_MARKER(name, value)
#define DYNAMIC_TAG(name, value) \
case DT_##name: \
return #name;
#include "llvm/BinaryFormat/DynamicTags.def"
#undef DYNAMIC_TAG
#undef AARCH64_DYNAMIC_TAG
#undef MIPS_DYNAMIC_TAG
#undef HEXAGON_DYNAMIC_TAG
#undef PPC64_DYNAMIC_TAG
#undef DYNAMIC_TAG_MARKER
default:
return "unknown";
}
}
template <typename ELFT> void ELFDumper<ELFT>::parseDynamicTable() {
auto toMappedAddr = [&](uint64_t Tag, uint64_t VAddr) -> const uint8_t * { auto toMappedAddr = [&](uint64_t Tag, uint64_t VAddr) -> const uint8_t * {
auto MappedAddrOrError = ObjF->getELFFile()->toMappedAddr(VAddr); auto MappedAddrOrError = ObjF->getELFFile()->toMappedAddr(VAddr);
if (!MappedAddrOrError) { if (!MappedAddrOrError) {
Error Err = Error Err =
createError("Unable to parse DT_" + createError("Unable to parse DT_" + Obj->getDynamicTagAsString(Tag) +
Twine(getTypeString(
ObjF->getELFFile()->getHeader()->e_machine, Tag)) +
": " + llvm::toString(MappedAddrOrError.takeError())); ": " + llvm::toString(MappedAddrOrError.takeError()));
reportWarning(std::move(Err), ObjF->getFileName()); reportWarning(std::move(Err), ObjF->getFileName());
return nullptr; return nullptr;
} }
return MappedAddrOrError.get(); return MappedAddrOrError.get();
}; };
▲ Show 20 Lines • Show All 1,994 Lines • ▼ Show 20 Linestemplate <class ELFT> void GNUStyle<ELFT>::printDynamic(const ELFO *Obj) {
bool Is64 = ELFT::Is64Bits; bool Is64 = ELFT::Is64Bits;
if (Is64) if (Is64)
OS << " Tag Type Name/Value\n"; OS << " Tag Type Name/Value\n";
else else
OS << " Tag Type Name/Value\n"; OS << " Tag Type Name/Value\n";
for (auto Entry : Table) { for (auto Entry : Table) {
uintX_t Tag = Entry.getTag(); uintX_t Tag = Entry.getTag();
std::string TypeString = std::string("(") + std::string TypeString =
getTypeString(Obj->getHeader()->e_machine, Tag) + std::string("(") + Obj->getDynamicTagAsString(Tag).c_str() + ")";
")";
OS << " " << format_hex(Tag, Is64 ? 18 : 10) OS << " " << format_hex(Tag, Is64 ? 18 : 10)
<< format(" %-20s ", TypeString.c_str()); << format(" %-20s ", TypeString.c_str());
this->dumper()->printDynamicEntry(OS, Tag, Entry.getVal()); this->dumper()->printDynamicEntry(OS, Tag, Entry.getVal());
OS << "\n"; OS << "\n";
} }
} }
template <class ELFT> template <class ELFT>
▲ Show 20 Lines • Show All 1,786 Lines • ▼ Show 20 Linestemplate <class ELFT> void LLVMStyle<ELFT>::printDynamic(const ELFFile<ELFT> *Obj) {
bool Is64 = ELFT::Is64Bits; bool Is64 = ELFT::Is64Bits;
if (Is64) if (Is64)
W.startLine() << " Tag Type Name/Value\n"; W.startLine() << " Tag Type Name/Value\n";
else else
W.startLine() << " Tag Type Name/Value\n"; W.startLine() << " Tag Type Name/Value\n";
for (auto Entry : Table) { for (auto Entry : Table) {
uintX_t Tag = Entry.getTag(); uintX_t Tag = Entry.getTag();
W.startLine() << " " << format_hex(Tag, Is64 ? 18 : 10, true) << " " W.startLine() << " " << format_hex(Tag, Is64 ? 18 : 10, true) << " "
<< format("%-21s", << format("%-21s", Obj->getDynamicTagAsString(Tag).c_str());
getTypeString(Obj->getHeader()->e_machine, Tag));
this->dumper()->printDynamicEntry(OS, Tag, Entry.getVal()); this->dumper()->printDynamicEntry(OS, Tag, Entry.getVal());
OS << "\n"; OS << "\n";
} }
W.startLine() << "]\n"; W.startLine() << "]\n";
} }
template <class ELFT> template <class ELFT>
void LLVMStyle<ELFT>::printDynamicRelocations(const ELFO *Obj) { void LLVMStyle<ELFT>::printDynamicRelocations(const ELFO *Obj) {
const DynRegionInfo &DynRelRegion = this->dumper()->getDynRelRegion(); const DynRegionInfo &DynRelRegion = this->dumper()->getDynRelRegion();
const DynRegionInfo &DynRelaRegion = this->dumper()->getDynRelaRegion(); const DynRegionInfo &DynRelaRegion = this->dumper()->getDynRelaRegion();
const DynRegionInfo &DynRelrRegion = this->dumper()->getDynRelrRegion(); const DynRegionInfo &DynRelrRegion = this->dumper()->getDynRelrRegion();
▲ Show 20 Lines • Show All 609 Lines • Show Last 20 Lines