Skip to content
Merged
Show file tree
Hide file tree
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: 3 additions & 0 deletions src/coreclr/nativeaot/Runtime/arm/WriteBarriers.S
Original file line number Diff line number Diff line change
Expand Up @@ -323,6 +323,9 @@ LEAF_END RhpCheckedXchg, _TEXT
// r2, r3: trashed
//
LEAF_ENTRY RhpByRefAssignRef, _TEXT
// See comment in RhpAssignRef
dmb

ldr r2, [r1]
str r2, [r0]

Expand Down
8 changes: 4 additions & 4 deletions src/coreclr/nativeaot/Runtime/arm64/WriteBarriers.S
Original file line number Diff line number Diff line change
Expand Up @@ -361,13 +361,13 @@ LEAF_END RhpCheckedAssignRefArm64, _TEXT
// x17 : trashed (ip1) if FEATURE_USE_SOFTWARE_WRITE_WATCH_FOR_GC_HEAP
//
LEAF_ENTRY RhpByRefAssignRefArm64, _TEXT
ldr x15, [x13]
str x15, [x14]
ldr x15, [x13]
stlr x15, [x14]

INSERT_CHECKED_WRITE_BARRIER_CORE x14, x15, 12, X15

add X13, x13, #8
add x14, x14, #8
add X13, x13, #8
add x14, x14, #8

ret
LEAF_END RhpByRefAssignRefArm64, _TEXT