Merge branch 'master' into v2.1

4 files changed, 6 insertions, 6 deletions

diff --git a/src/vm_arm.dasc b/src/vm_arm.dasc
index 0bd929fd..b728d52f 100644
--- a/src/vm_arm.dasc
+++ b/src/vm_arm.dasc
@@ -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
diff --git a/src/vm_mips.dasc b/src/vm_mips.dasc
index e7d01dc4..7d69c7db 100644
--- a/src/vm_mips.dasc
+++ b/src/vm_mips.dasc
@@ -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
diff --git a/src/vm_ppc.dasc b/src/vm_ppc.dasc
index 5e89a2d9..91de682d 100644
--- a/src/vm_ppc.dasc
+++ b/src/vm_ppc.dasc
@@ -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)
diff --git a/src/vm_x86.dasc b/src/vm_x86.dasc
index eaa99740..8ed6efd1 100644
--- a/src/vm_x86.dasc
+++ b/src/vm_x86.dasc
@@ -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