Skip to content

Avoid accessing optional AArch64 PSTATE bits in macOS #1370

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
Sangho Lee (sangho2) merged 1 commit into from
Sep 13, 2026
Merged

Avoid accessing optional AArch64 PSTATE bits in macOS #1370

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 2 additions & 8 deletions litebox_platform_macos_userland/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1324,10 +1324,6 @@ unsafe extern "C" fn syscall_callback() {
"ldr x0, [sp, #{frame_retaddr}]",
"str x0, [x17, #{regs_pc}]",
"mrs x0, nzcv",
"mrs x1, ssbs",
"orr x0, x0, x1",
"mrs x1, dit",
"orr x0, x0, x1",
"str x0, [x17, #{regs_pstate}]",
"ldr x0, [x17, #0]",
"str x0, [x17, #{regs_orig_x0}]",
Expand Down Expand Up @@ -1511,8 +1507,6 @@ unsafe extern "C" fn switch_to_guest_via_outbound_stub(_: &mut ThreadContext) ->
"msr fpcr, x1",
"ldr x0, [x16, #{regs_pstate}]",
"msr nzcv, x0",
"msr ssbs, x0",
"msr dit, x0",
"ldp x0, x1, [x16, #0]",
"ldp x2, x3, [x16, #16]",
"ldp x4, x5, [x16, #32]",
Expand Down Expand Up @@ -2319,9 +2313,9 @@ mod tests {
..switch_to_guest_via_sigreturn_end as *const () as usize;
let outbound = switch_to_guest_via_outbound_stub_start as *const () as usize
..switch_to_guest_via_outbound_stub_end as *const () as usize;
assert_eq!(syscall_prologue.len(), 76 * size_of::<u32>());
assert_eq!(syscall_prologue.len(), 72 * size_of::<u32>());
assert_eq!(sigreturn.len(), 3 * size_of::<u32>());
assert_eq!(outbound.len(), 53 * size_of::<u32>());
assert_eq!(outbound.len(), 51 * size_of::<u32>());
}

#[test]
Expand Down