Merge branch 'master' into v2.1

2013-12-02 09:19:06 +01:00
parent 4593fb5e29 916f09d0a9
commit 5c7db3c4fc
4 changed files with 6 additions and 6 deletions
--- 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