Skip to content
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.

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

arm_smcc_1_0_*: Load a capability pointer from the stack for purecap. #1749

Merged
merged 1 commit into from
Jul 14, 2023
Merged
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions sys/dev/psci/smccc_arm64.S
Original file line number Diff line number Diff line change
Expand Up @@ -107,10 +107,10 @@ ENTRY(arm_smccc_\insn)
#ifdef __CHERI_PURE_CAPABILITY__
restore_registers
#endif
ldr x4, [PTRN(sp)]
ldr PTR(4), [PTRN(sp)]
cbz x4, 1f
stp x0, x1, [PTR(4), #16 * 0]
stp x2, x3, [PTR(4), #16 * 1]
stp PTR(0), PTR(1), [PTR(4), #(2 * PTR_WIDTH) * 0]
stp PTR(2), PTR(3), [PTR(4), #(2 * PTR_WIDTH) * 1]
1: ret
END(arm_smccc_\insn)
.endm
Expand Down
Loading