LuaJIT
/
LuaJIT
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into v2.1

master
Mike Pall 2013-12-02 09:19:06 +01:00
parent 4593fb5e29 916f09d0a9
commit 5c7db3c4fc
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/vm_arm.dasc
View File

@ -3203,7 +3203,7 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop)
| ins_next
|
|2: // Check if new value is collectable.
| cmn RB, #-(LJ_TISNUM - LJ_TISGCV)
| cmn RB, #-(LJ_TNUMX - LJ_TISGCV)
| ldrbhi RC, GCOBJ:CARG3->gch.marked
| bls <1 // tvisgcv(v)
| sub CARG1, DISPATCH, #-GG_DISP2G

4
src/vm_mips.dasc
View File

@ -2867,12 +2867,12 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop)
| li AT, LJ_GC_BLACK|1
| or TMP3, TMP3, TMP0
| beq TMP3, AT, >2 // Upvalue is closed and black?
|. addiu TMP2, TMP2, -(LJ_TISNUM+1)
|. addiu TMP2, TMP2, -(LJ_TNUMX+1)
|1:
| ins_next
|
|2: // Check if new value is collectable.
| sltiu AT, TMP2, LJ_TISGCV - (LJ_TISNUM+1)
| sltiu AT, TMP2, LJ_TISGCV - (LJ_TNUMX+1)
| beqz AT, <1 // tvisgcv(v)
|. lw TMP1, LO(RD)
| lbu TMP3, GCOBJ:TMP1->gch.marked

4
src/vm_ppc.dasc
View File

@ -3691,13 +3691,13 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop)
| cmplwi cr1, TMP0, 0
| lwz TMP1, 4(RD)
| cror 4*cr0+eq, 4*cr0+eq, 4*cr1+eq
| subi TMP2, TMP2, (LJ_TISNUM+1)
| subi TMP2, TMP2, (LJ_TNUMX+1)
| bne >2 // Upvalue is closed and black?
|1:
| ins_next
|
|2: // Check if new value is collectable.
| cmplwi TMP2, LJ_TISGCV - (LJ_TISNUM+1)
| cmplwi TMP2, LJ_TISGCV - (LJ_TNUMX+1)
| bge <1 // tvisgcv(v)
| lbz TMP3, GCOBJ:TMP1->gch.marked
| andix. TMP3, TMP3, LJ_GC_WHITES // iswhite(v)

2
src/vm_x86.dasc
View File

@ -4169,7 +4169,7 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop)
|
|2: // Upvalue is black. Check if new value is collectable and white.
| sub RD, LJ_TISGCV
| cmp RD, LJ_TISNUM - LJ_TISGCV // tvisgcv(v)
| cmp RD, LJ_TNUMX - LJ_TISGCV // tvisgcv(v)
| jbe <1
| test byte GCOBJ:RA->gch.marked, LJ_GC_WHITES // iswhite(v)
| jz <1