gh-mirror/mikepaul-LuaJIT
1
0
Fork 0
mirror of https://github.com/LuaJIT/LuaJIT.git synced 2025-02-07 23:24:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

x64/LJ_GC64: Fix upvalue write barrier.

Browse Source
This commit is contained in:
Mike Pall 2015-05-29 16:45:26 +02:00
parent 5de95edf4c
commit 4da1bb66cd
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/vm_x64.dasc
View File

@ -3412,9 +3412,12 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop)
| ins_next | ins_next
| |
|2: // Upvalue is black. Check if new value is collectable and white. |2: // Upvalue is black. Check if new value is collectable and white.
| sub RD, LJ_TISGCV | mov RD, RA
| cmp RD, LJ_TNUMX - LJ_TISGCV // tvisgcv(v) | sar RD, 47
| sub RDd, LJ_TISGCV
| cmp RDd, LJ_TNUMX - LJ_TISGCV // tvisgcv(v)
| jbe <1 | jbe <1
| cleartp GCOBJ:RA
| test byte GCOBJ:RA->gch.marked, LJ_GC_WHITES // iswhite(v) | test byte GCOBJ:RA->gch.marked, LJ_GC_WHITES // iswhite(v)
| jz <1 | jz <1
| // Crossed a write barrier. Move the barrier forward. | // Crossed a write barrier. Move the barrier forward.
@ -3437,8 +3440,8 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop)
| mov UPVAL:RB, [LFUNC:RB+RA*8+offsetof(GCfuncL, uvptr)] | mov UPVAL:RB, [LFUNC:RB+RA*8+offsetof(GCfuncL, uvptr)]
| mov STR:RA, [KBASE+RD*8] | mov STR:RA, [KBASE+RD*8]
| mov RD, UPVAL:RB->v | mov RD, UPVAL:RB->v
| settp STR:RA, LJ_TSTR | settp STR:ITYPE, STR:RA, LJ_TSTR
| mov [RD], STR:RA | mov [RD], STR:ITYPE
| test byte UPVAL:RB->marked, LJ_GC_BLACK // isblack(uv) | test byte UPVAL:RB->marked, LJ_GC_BLACK // isblack(uv)
| jnz >2 | jnz >2
|1: |1:
@ -3824,7 +3827,7 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop)
| mov L:CARG1, SAVE_L | mov L:CARG1, SAVE_L
| mov BASE, L:CARG1->base | mov BASE, L:CARG1->base
| mov TMPR, rax | mov TMPR, rax
| movzx RA, PC_RA | movzx RAd, PC_RA
| jmp <2 // Must check write barrier for value. | jmp <2 // Must check write barrier for value.
| |
|7: // Possible table write barrier for the value. Skip valiswhite check. |7: // Possible table write barrier for the value. Skip valiswhite check.