Skip to content

[llvm-readobj][MachO] Add support for CPU_TYPE_ARM64_32 #170193

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
jh7370 merged 3 commits into from
Dec 4, 2025
+94 −144
Merged

[llvm-readobj][MachO] Add support for CPU_TYPE_ARM64_32 #170193

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ab4a1b8
[llvm-readobj][MachO] Add support for CPU_TYPE_ARM64_32
rjmansfield Dec 1, 2025
4fc2145
Address reviewer feedback.
rjmansfield Dec 2, 2025
073643c
Consolidate yaml docs.
rjmansfield Dec 3, 2025
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
31 changes: 31 additions & 0 deletions llvm/test/tools/llvm-readobj/MachO/file-headers.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,3 +158,34 @@ FileHeader:
ncmds: 0
sizeofcmds: 0
flags: 0x00002000

# RUN: yaml2obj %s --docnum=6 -o %t.arm64_32
# RUN: llvm-readobj -h %t.arm64_32 \
# RUN: | FileCheck %s --strict-whitespace --match-full-lines -DFILE=%t.arm64_32 --check-prefix ARM64_32

# ARM64_32:File: [[FILE]]
# ARM64_32-NEXT:Format: Mach-O arm64 (ILP32)
# ARM64_32-NEXT:Arch: aarch64_32
# ARM64_32-NEXT:AddressSize: 32bit
# ARM64_32-NEXT:MachHeader {
# ARM64_32-NEXT: Magic: Magic (0xFEEDFACE)
# ARM64_32-NEXT: CpuType: Arm64 (ILP32) (0x200000C)
# ARM64_32-NEXT: CpuSubType: CPU_SUBTYPE_ARM64_32_V8 (0x1)
# ARM64_32-NEXT: FileType: Relocatable (0x1)
# ARM64_32-NEXT: NumOfLoadCommands: 0
# ARM64_32-NEXT: SizeOfLoadCommands: 0
# ARM64_32-NEXT: Flags [ (0x2000)
# ARM64_32-NEXT: MH_SUBSECTIONS_VIA_SYMBOLS (0x2000)
# ARM64_32-NEXT: ]
# ARM64_32-NEXT:}
# ARM64_32-NOT:{{.}}

--- !mach-o
FileHeader:
magic: 0xFEEDFACE
cputype: 0x0200000C
cpusubtype: 0x00000001
filetype: 0x00000001
ncmds: 0
sizeofcmds: 0
flags: 0x00002000
27 changes: 18 additions & 9 deletions llvm/tools/llvm-readobj/MachODumper.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,15 +111,16 @@ const EnumEntry<uint32_t> MachOHeaderFileTypes[] = {
};

const EnumEntry<uint32_t> MachOHeaderCpuTypes[] = {
{ "Any" , static_cast<uint32_t>(MachO::CPU_TYPE_ANY) },
{ "X86" , MachO::CPU_TYPE_X86 },
{ "X86-64" , MachO::CPU_TYPE_X86_64 },
{ "Mc98000" , MachO::CPU_TYPE_MC98000 },
{ "Arm" , MachO::CPU_TYPE_ARM },
{ "Arm64" , MachO::CPU_TYPE_ARM64 },
{ "Sparc" , MachO::CPU_TYPE_SPARC },
{ "PowerPC" , MachO::CPU_TYPE_POWERPC },
{ "PowerPC64" , MachO::CPU_TYPE_POWERPC64 },
{"Any", static_cast<uint32_t>(MachO::CPU_TYPE_ANY)},
{"X86", MachO::CPU_TYPE_X86},
{"X86-64", MachO::CPU_TYPE_X86_64},
{"Mc98000", MachO::CPU_TYPE_MC98000},
{"Arm", MachO::CPU_TYPE_ARM},
{"Arm64", MachO::CPU_TYPE_ARM64},
{"Arm64 (ILP32)", MachO::CPU_TYPE_ARM64_32},
{"Sparc", MachO::CPU_TYPE_SPARC},
{"PowerPC", MachO::CPU_TYPE_POWERPC},
{"PowerPC64", MachO::CPU_TYPE_POWERPC64},
};

const EnumEntry<uint32_t> MachOHeaderCpuSubtypesX86[] = {
Expand Down Expand Up @@ -166,6 +167,10 @@ const EnumEntry<uint32_t> MachOHeaderCpuSubtypesARM[] = {
LLVM_READOBJ_ENUM_ENT(MachO, CPU_SUBTYPE_ARM_V7EM),
};

const EnumEntry<uint32_t> MachOHeaderCpuSubtypesARM64_32[] = {
LLVM_READOBJ_ENUM_ENT(MachO, CPU_SUBTYPE_ARM64_32_V8),
};

const EnumEntry<uint32_t> MachOHeaderCpuSubtypesARM64[] = {
LLVM_READOBJ_ENUM_ENT(MachO, CPU_SUBTYPE_ARM64_ALL),
LLVM_READOBJ_ENUM_ENT(MachO, CPU_SUBTYPE_ARM64_V8),
Expand Down Expand Up @@ -453,6 +458,10 @@ void MachODumper::printFileHeaders(const MachHeader &Header) {
case MachO::CPU_TYPE_ARM64:
W.printEnum("CpuSubType", subtype, ArrayRef(MachOHeaderCpuSubtypesARM64));
break;
case MachO::CPU_TYPE_ARM64_32:
W.printEnum("CpuSubType", subtype,
ArrayRef(MachOHeaderCpuSubtypesARM64_32));
break;
case MachO::CPU_TYPE_POWERPC64:
default:
W.printHex("CpuSubtype", subtype);
Expand Down