mirror of
https://github.com/morluto/rea.git
synced 2026-10-31 20:06:14 +00:00
96fc84f1fb
* fix(native): select one slice when universal Mach-O slices share a CPU type On macOS 27 most system binaries are universal files whose slices share CPU_TYPE_ARM64: arm64e + arm64e.x1 (Calculator, TextEdit), x86_64 + arm64e + arm64e.x1 (/bin/ls), or arm64 + arm64e.x1 (ShortcutDroplet). Target admission names slices by CPU family, so these targets have availableArchitectures ["arm64"] while the file holds two arm64 slices. inspect_macho read that family count as a slice count and ran otool, nm, dyld_info, dwarfdump and vtool without -arch. ShortcutDroplet failed with "Malformed otool load-command output" (40 load commands against ncmds 20). Calculator reported both slices' imports (4138 instead of 2069), nm's "(for architecture ...)" header lines as exports, and no selected slice. selectArchitecture now also filters when lipo lists more than one slice. Its preference is unchanged: the family name, then arm64e, then the first arm64e.<variant>. inspect_native_dispatch_metadata matched FAT slices by CPU type only and refused /bin/ls and TextEdit as "Ambiguous FAT architecture slice". selectMachoSlice now ranks slices of the requested CPU type by base subtype in the same order: arm64 (0, then 1) or x86_64 (3), then arm64e (2), then other variants such as arm64e.x1 in FAT table order. It reports ambiguity only when the top-ranked slices share a subtype. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * fix(native): share Mach-O slice preference across inspections * chore: preserve upstream process capture test during merge --------- Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: morluto <76467478+morluto@users.noreply.github.com>
20 lines
897 B
Markdown
20 lines
897 B
Markdown
# Universal Mach-O captures whose slices share one CPU type
|
|
|
|
Captured on macOS 27.0.1 (26A434), arm64, from two system executables whose
|
|
FAT slices all use `CPU_TYPE_ARM64`:
|
|
|
|
```sh
|
|
lipo -detailed_info /System/Applications/Calculator.app/Contents/MacOS/Calculator > calculator.txt
|
|
lipo -detailed_info /System/Library/CoreServices/ShortcutDroplet.app/Contents/MacOS/ShortcutDroplet > shortcut-droplet.txt
|
|
```
|
|
|
|
Calculator holds `arm64e` (subtype `0x80000002`) and `arm64e.x1` (subtype
|
|
`0x8000000c`); ShortcutDroplet holds `arm64` (subtype `0`) and `arm64e.x1`.
|
|
Target admission names both files by the single CPU family `arm64`, while lipo
|
|
lists two slices.
|
|
|
|
The executable path on the `Fat header in:` line was replaced with `fixture`,
|
|
and trailing whitespace (lipo prints `capabilities ` for a slice without
|
|
capabilities) and the final blank line were removed. Tool fields are otherwise
|
|
unchanged.
|