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.

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

psci: Make the assembly code match the structure defined in C #1378

Closed
wants to merge 1 commit into from
Closed

psci: Make the assembly code match the structure defined in C #1378

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
12 changes: 6 additions & 6 deletions sys/dev/psci/smccc_arm64.S
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,10 +77,10 @@ ENTRY(arm_smccc_hvc)
#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), #__SIZEOF_POINTER__ * 0]
stp PTR(2), PTR(3), [PTR(4), #__SIZEOF_POINTER__ * 2]
1: ret
END(arm_smccc_hvc)

Expand All @@ -97,10 +97,10 @@ ENTRY(arm_smccc_smc)
#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), #__SIZEOF_POINTER__ * 0]
stp PTR(2), PTR(3), [PTR(4), #__SIZEOF_POINTER__ * 2]
1: ret
END(arm_smccc_smc)
// CHERI CHANGES START
Expand Down