Skip to content

[release/6.0] Fix Unix ARM64 RtlRestoreContext implementation #59849

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
jeffschwMSFT merged 1 commit into from
Oct 4, 2021
Merged

[release/6.0] Fix Unix ARM64 RtlRestoreContext implementation #59849

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
7 changes: 3 additions & 4 deletions src/coreclr/pal/src/arch/arm64/context2.S
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,12 +204,11 @@ LOCAL_LABEL(No_Restore_CONTEXT_INTEGER):
ldr w17, [x16, CONTEXT_Cpsr]
msr nzcv, x17
ldp fp, lr, [x16, CONTEXT_Fp]
ldr x17, [x16, CONTEXT_Sp]
mov sp, x17
ldr x17, [x16, CONTEXT_Pc]
ldp x16, x17, [x16, CONTEXT_Sp] // Context_Pc is right after Context_Sp
mov sp, x16
br x17

LOCAL_LABEL(No_Restore_CONTEXT_CONTROL):
ret
ret

LEAF_END RtlRestoreContext, _TEXT