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

[NativeAOT/ARM] Fix RhpLockCmpXchg16 #97743

Merged
merged 1 commit into from
Jan 31, 2024
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
3 changes: 2 additions & 1 deletion src/coreclr/nativeaot/Runtime/arm/Interlocked.S
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ LEAF_END RhpLockCmpXchg8, _TEXT
// r1 = value
// r2 = comparand
LEAF_ENTRY RhpLockCmpXchg16, _TEXT
uxth r2, r2
dmb
ALTERNATE_ENTRY RhpLockCmpXchg16AVLocation
LOCAL_LABEL(CmpXchg16Retry):
Expand All @@ -46,7 +47,7 @@ LOCAL_LABEL(CmpXchg16Retry):
cmp r12, #0
bne LOCAL_LABEL(CmpXchg16Retry)
LOCAL_LABEL(CmpXchg16Exit):
mov r0, r3
sxth r0, r3
dmb
bx lr
LEAF_END RhpLockCmpXchg16, _TEXT
Expand Down
Loading