This is an archive of the discontinued LLVM Phabricator instance.

Differential D152847

[llvm-objdump/mac] Add support for LC_ATOM_INFO
ClosedPublic

Authored by keith on Jun 13 2023, 11:34 AM.

Details

Reviewers
cishida
alexander-shaposhnikov
jhenderson
thakis
MaskRay
davide
Commits
rGf1017389103b: [llvm-objdump/mac] Add support for LC_ATOM_INFO
Summary

This is a new load command first supported in Xcode 15's tools

Diff Detail

Event Timeline

keith created this revision.Jun 13 2023, 11:34 AM
Herald added a reviewer: MaskRay. · View Herald TranscriptJun 13 2023, 11:34 AM
Herald added a project: Restricted Project. · View Herald Transcript
keith requested review of this revision.Jun 13 2023, 11:34 AM
Herald added a project: Restricted Project. · View Herald TranscriptJun 13 2023, 11:34 AM
Herald added a subscriber: llvm-commits. · View Herald Transcript
davide accepted this revision.Jun 13 2023, 11:42 AM
This revision is now accepted and ready to land.Jun 13 2023, 11:42 AM
Harbormaster completed remote builds in B238574: Diff 531009.Jun 13 2023, 2:18 PM
Closed by commit rGf1017389103b: [llvm-objdump/mac] Add support for LC_ATOM_INFO (authored by keith). · Explain WhyJun 13 2023, 2:29 PM
This revision was automatically updated to reflect the committed changes.
keith added a commit: rGf1017389103b: [llvm-objdump/mac] Add support for LC_ATOM_INFO.

Revision Contents

PathSize
llvm/
include/
llvm/
BinaryFormat/
1 line
test/
tools/
llvm-objdump/
MachO/
184 lines
tools/
llvm-objdump/
5 lines

Diff 531009

llvm/include/llvm/BinaryFormat/MachO.def

Show First 20 Lines • Show All 71 Lines • ▼ Show 20 Lines
HANDLE_LOAD_COMMAND(LC_LINKER_OPTIMIZATION_HINT, 0x0000002Eu, linkedit_data_command) HANDLE_LOAD_COMMAND(LC_LINKER_OPTIMIZATION_HINT, 0x0000002Eu, linkedit_data_command)
HANDLE_LOAD_COMMAND(LC_VERSION_MIN_TVOS, 0x0000002Fu, version_min_command) HANDLE_LOAD_COMMAND(LC_VERSION_MIN_TVOS, 0x0000002Fu, version_min_command)
HANDLE_LOAD_COMMAND(LC_VERSION_MIN_WATCHOS, 0x00000030u, version_min_command) HANDLE_LOAD_COMMAND(LC_VERSION_MIN_WATCHOS, 0x00000030u, version_min_command)
HANDLE_LOAD_COMMAND(LC_NOTE, 0x00000031u, note_command) HANDLE_LOAD_COMMAND(LC_NOTE, 0x00000031u, note_command)
HANDLE_LOAD_COMMAND(LC_BUILD_VERSION, 0x00000032u, build_version_command) HANDLE_LOAD_COMMAND(LC_BUILD_VERSION, 0x00000032u, build_version_command)
HANDLE_LOAD_COMMAND(LC_DYLD_EXPORTS_TRIE, 0x80000033u, linkedit_data_command) HANDLE_LOAD_COMMAND(LC_DYLD_EXPORTS_TRIE, 0x80000033u, linkedit_data_command)
HANDLE_LOAD_COMMAND(LC_DYLD_CHAINED_FIXUPS, 0x80000034u, linkedit_data_command) HANDLE_LOAD_COMMAND(LC_DYLD_CHAINED_FIXUPS, 0x80000034u, linkedit_data_command)
HANDLE_LOAD_COMMAND(LC_FILESET_ENTRY, 0x80000035u, fileset_entry_command) HANDLE_LOAD_COMMAND(LC_FILESET_ENTRY, 0x80000035u, fileset_entry_command)
HANDLE_LOAD_COMMAND(LC_ATOM_INFO, 0x00000036u, linkedit_data_command)
#endif #endif
#ifdef LOAD_COMMAND_STRUCT #ifdef LOAD_COMMAND_STRUCT
LOAD_COMMAND_STRUCT(dyld_info_command) LOAD_COMMAND_STRUCT(dyld_info_command)
LOAD_COMMAND_STRUCT(dylib_command) LOAD_COMMAND_STRUCT(dylib_command)
LOAD_COMMAND_STRUCT(dylinker_command) LOAD_COMMAND_STRUCT(dylinker_command)
Show All 36 Lines

llvm/test/tools/llvm-objdump/MachO/atom-info.yaml

  • This file was added.
# RUN: yaml2obj %s -o %t
# RUN: llvm-objdump -p %t | FileCheck %s
# RUN: llvm-otool -l %t | FileCheck %s
#
# CHECK: LC_ATOM_INFO
#
# Created with:
# echo 'void foo() {}' > foo.c
# clang -dynamiclib foo.c -Wl,-make_mergeable -Wl,-no_adhoc_codesign
--- !mach-o
FileHeader:
magic: 0xFEEDFACF
cputype: 0x100000C
cpusubtype: 0x0
filetype: 0x6
ncmds: 14
sizeofcmds: 648
flags: 0x100085
reserved: 0x0
LoadCommands:
- cmd: LC_SEGMENT_64
cmdsize: 232
segname: __TEXT
vmaddr: 0
vmsize: 16384
fileoff: 0
filesize: 16384
maxprot: 5
initprot: 5
nsects: 2
flags: 0
Sections:
- sectname: __text
segname: __TEXT
addr: 0x3FB8
size: 4
offset: 0x3FB8
align: 2
reloff: 0x0
nreloc: 0
flags: 0x80000400
reserved1: 0x0
reserved2: 0x0
reserved3: 0x0
content: C0035FD6
- sectname: __unwind_info
segname: __TEXT
addr: 0x3FBC
size: 68
offset: 0x3FBC
align: 2
reloff: 0x0
nreloc: 0
flags: 0x0
reserved1: 0x0
reserved2: 0x0
reserved3: 0x0
content: 010000001C000000000000001C000000000000001C00000002000000B83F00003400000034000000BD3F000000000000340000000200000008000100B83F000000000002
- cmd: LC_SEGMENT_64
cmdsize: 72
segname: __LINKEDIT
vmaddr: 16384
vmsize: 16384
fileoff: 16384
filesize: 592
maxprot: 1
initprot: 1
nsects: 0
flags: 0
- cmd: LC_ID_DYLIB
cmdsize: 32
dylib:
name: 24
timestamp: 1
current_version: 0
compatibility_version: 0
Content: obj
ZeroPadBytes: 5
- cmd: LC_DYLD_CHAINED_FIXUPS
cmdsize: 16
dataoff: 16384
datasize: 56
- cmd: LC_DYLD_EXPORTS_TRIE
cmdsize: 16
dataoff: 16440
datasize: 24
- cmd: LC_SYMTAB
cmdsize: 24
symoff: 16952
nsyms: 1
stroff: 16968
strsize: 8
- cmd: LC_DYSYMTAB
cmdsize: 80
ilocalsym: 0
nlocalsym: 0
iextdefsym: 0
nextdefsym: 1
iundefsym: 1
nundefsym: 0
tocoff: 0
ntoc: 0
modtaboff: 0
nmodtab: 0
extrefsymoff: 0
nextrefsyms: 0
indirectsymoff: 0
nindirectsyms: 0
extreloff: 0
nextrel: 0
locreloff: 0
nlocrel: 0
- cmd: LC_UUID
cmdsize: 24
uuid: F30F2ED6-99E3-3BF0-B9A9-A4DAEEF9EA65
- cmd: LC_BUILD_VERSION
cmdsize: 32
platform: 1
minos: 851968
sdk: 917504
ntools: 1
Tools:
- tool: 3
version: 66062080
- cmd: LC_SOURCE_VERSION
cmdsize: 16
version: 0
- cmd: LC_LOAD_DYLIB
cmdsize: 56
dylib:
name: 24
timestamp: 2
current_version: 87556096
compatibility_version: 65536
Content: '/usr/lib/libSystem.B.dylib'
ZeroPadBytes: 6
- cmd: LC_FUNCTION_STARTS
cmdsize: 16
dataoff: 16464
datasize: 8
- cmd: LC_DATA_IN_CODE
cmdsize: 16
dataoff: 16472
datasize: 0
- cmd: LC_ATOM_INFO
cmdsize: 16
dataoff: 16472
datasize: 480
LinkEditData:
ExportTrie:
TerminalSize: 0
NodeOffset: 0
Name: ''
Flags: 0x0
Address: 0x0
Other: 0x0
ImportName: ''
Children:
- TerminalSize: 0
NodeOffset: 12
Name: _foo
Flags: 0x0
Address: 0x0
Other: 0x0
ImportName: ''
NameList:
- n_strx: 2
n_type: 0xF
n_sect: 1
n_desc: 0
n_value: 16312
StringTable:
- ' '
- _foo
- ''
FunctionStarts: [ 0x3FB8 ]
ChainedFixups: [ 0x0, 0x0, 0x0, 0x0, 0x20, 0x0, 0x0, 0x0, 0x30, 0x0,
0x0, 0x0, 0x30, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
0x0, 0x0, 0x2, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
0x0, 0x0, 0x0, 0x0, 0x0, 0x0 ]
...

llvm/tools/llvm-objdump/MachODump.cpp

  • This file is larger than 256 KB, so syntax highlighting is disabled by default.
Show First 20 Lines • Show All 10,352 Lines • ▼ Show 20 Linesstatic void PrintLinkEditDataCommand(MachO::linkedit_data_command ld,
else if (ld.cmd == MachO::LC_DYLIB_CODE_SIGN_DRS) else if (ld.cmd == MachO::LC_DYLIB_CODE_SIGN_DRS)
outs() << " cmd LC_DYLIB_CODE_SIGN_DRS\n"; outs() << " cmd LC_DYLIB_CODE_SIGN_DRS\n";
else if (ld.cmd == MachO::LC_LINKER_OPTIMIZATION_HINT) else if (ld.cmd == MachO::LC_LINKER_OPTIMIZATION_HINT)
outs() << " cmd LC_LINKER_OPTIMIZATION_HINT\n"; outs() << " cmd LC_LINKER_OPTIMIZATION_HINT\n";
else if (ld.cmd == MachO::LC_DYLD_EXPORTS_TRIE) else if (ld.cmd == MachO::LC_DYLD_EXPORTS_TRIE)
outs() << " cmd LC_DYLD_EXPORTS_TRIE\n"; outs() << " cmd LC_DYLD_EXPORTS_TRIE\n";
else if (ld.cmd == MachO::LC_DYLD_CHAINED_FIXUPS) else if (ld.cmd == MachO::LC_DYLD_CHAINED_FIXUPS)
outs() << " cmd LC_DYLD_CHAINED_FIXUPS\n"; outs() << " cmd LC_DYLD_CHAINED_FIXUPS\n";
else if (ld.cmd == MachO::LC_ATOM_INFO)
outs() << " cmd LC_ATOM_INFO\n";
else else
outs() << " cmd " << ld.cmd << " (?)\n"; outs() << " cmd " << ld.cmd << " (?)\n";
outs() << " cmdsize " << ld.cmdsize; outs() << " cmdsize " << ld.cmdsize;
if (ld.cmdsize != sizeof(struct MachO::linkedit_data_command)) if (ld.cmdsize != sizeof(struct MachO::linkedit_data_command))
outs() << " Incorrect size\n"; outs() << " Incorrect size\n";
else else
outs() << "\n"; outs() << "\n";
outs() << " dataoff " << ld.dataoff; outs() << " dataoff " << ld.dataoff;
▲ Show 20 Lines • Show All 129 Lines • ▼ Show 20 Lines if (Command.C.cmd == MachO::LC_SEGMENT) {
PrintDylibCommand(Dl, Command.Ptr); PrintDylibCommand(Dl, Command.Ptr);
} else if (Command.C.cmd == MachO::LC_CODE_SIGNATURE || } else if (Command.C.cmd == MachO::LC_CODE_SIGNATURE ||
Command.C.cmd == MachO::LC_SEGMENT_SPLIT_INFO || Command.C.cmd == MachO::LC_SEGMENT_SPLIT_INFO ||
Command.C.cmd == MachO::LC_FUNCTION_STARTS || Command.C.cmd == MachO::LC_FUNCTION_STARTS ||
Command.C.cmd == MachO::LC_DATA_IN_CODE || Command.C.cmd == MachO::LC_DATA_IN_CODE ||
Command.C.cmd == MachO::LC_DYLIB_CODE_SIGN_DRS || Command.C.cmd == MachO::LC_DYLIB_CODE_SIGN_DRS ||
Command.C.cmd == MachO::LC_LINKER_OPTIMIZATION_HINT || Command.C.cmd == MachO::LC_LINKER_OPTIMIZATION_HINT ||
Command.C.cmd == MachO::LC_DYLD_EXPORTS_TRIE || Command.C.cmd == MachO::LC_DYLD_EXPORTS_TRIE ||
Command.C.cmd == MachO::LC_DYLD_CHAINED_FIXUPS) { Command.C.cmd == MachO::LC_DYLD_CHAINED_FIXUPS ||
Command.C.cmd == MachO::LC_ATOM_INFO) {
MachO::linkedit_data_command Ld = MachO::linkedit_data_command Ld =
Obj->getLinkeditDataLoadCommand(Command); Obj->getLinkeditDataLoadCommand(Command);
PrintLinkEditDataCommand(Ld, Buf.size()); PrintLinkEditDataCommand(Ld, Buf.size());
} else { } else {
outs() << " cmd ?(" << format("0x%08" PRIx32, Command.C.cmd) outs() << " cmd ?(" << format("0x%08" PRIx32, Command.C.cmd)
<< ")\n"; << ")\n";
outs() << " cmdsize " << Command.C.cmdsize << "\n"; outs() << " cmdsize " << Command.C.cmdsize << "\n";
// TODO: get and print the raw bytes of the load command. // TODO: get and print the raw bytes of the load command.
▲ Show 20 Lines • Show All 310 Lines • Show Last 20 Lines