Skip to content
This repository has been archived by the owner on Jan 23, 2023. It is now read-only.

ARM64: Fix WriteBarrier #5821

Merged
merged 1 commit into from
Jun 16, 2016
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: 2 additions & 1 deletion src/vm/arm64/asmhelpers.asm
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,7 @@ NotInHeap
;
WRITE_BARRIER_ENTRY JIT_WriteBarrier
dmb ST
str x15, [x14], 8
str x15, [x14]

; Branch to Exit if the reference is not in the Gen0 heap
;
Expand Down Expand Up @@ -332,6 +332,7 @@ UpdateCardTable
mov x12, 0xFF
strb w12, [x15]
Exit
add x14, x14, 8
ret lr
WRITE_BARRIER_END JIT_WriteBarrier

Expand Down
6 changes: 3 additions & 3 deletions tests/arm64/Tests.lst
Original file line number Diff line number Diff line change
Expand Up @@ -2412,7 +2412,7 @@ RelativePath=baseservices\threading\interlocked\compareexchange\CompareExchangeT
WorkingDir=baseservices\threading\interlocked\compareexchange\CompareExchangeTClass
Expected=0
MaxAllowedDurationSeconds=600
Categories=NEW;EXPECTED_FAIL;UNSTABLE
Categories=NEW;EXPECTED_PASS
HostStyle=0
[CompareExchangeTClass_1.cmd_345]
RelativePath=baseservices\threading\interlocked\compareexchange\CompareExchangeTClass_1\CompareExchangeTClass_1.cmd
Expand Down Expand Up @@ -20850,14 +20850,14 @@ RelativePath=GC\Scenarios\BinTree\thdtreegrowingobj\thdtreegrowingobj.cmd
WorkingDir=GC\Scenarios\BinTree\thdtreegrowingobj
Expected=0
MaxAllowedDurationSeconds=600
Categories=NEW;EXPECTED_FAIL;UNSTABLE
Categories=NEW;EXPECTED_PASS
HostStyle=0
[thdtreelivingobj.cmd_2992]
RelativePath=GC\Scenarios\BinTree\thdtreelivingobj\thdtreelivingobj.cmd
WorkingDir=GC\Scenarios\BinTree\thdtreelivingobj
Expected=0
MaxAllowedDurationSeconds=600
Categories=NEW;EXPECTED_FAIL
Categories=NEW;EXPECTED_PASS
HostStyle=0
[arrcpy.cmd_2993]
RelativePath=GC\Scenarios\Boxing\arrcpy\arrcpy.cmd
Expand Down