x64: Use 64 bit slot copies in the interpreter.

src/buildvm_x86.dasc

@@ -449,11 +449,16 @@ static void build_subroutines(BuildCtx *ctx, int cmov, int sse)
   |
   |  sub RD, 1
   |  jz >2
-  |1:
-  |  mov RB, [BASE+RA]			// Move results down.
+  |1:  // Move results down.
+  |.if X64
+  |  mov RBa, [BASE+RA]
+  |  mov [BASE-8], RBa
+  |.else
+  |  mov RB, [BASE+RA]
   |  mov [BASE-8], RB
   |  mov RB, [BASE+RA+4]
   |  mov [BASE-4], RB
+  |.endif
   |  add BASE, 8
   |  sub RD, 1
   |  jnz <1
@@ -769,19 +774,15 @@ static void build_subroutines(BuildCtx *ctx, int cmov, int sse)
   |  mov CARG3d, RA
   |  mov L:CARG1d, SAVE_L
   |  mov L:CARG1d->base, BASE
-  |  mov CARG2d, [RC+4]
-  |  mov RC, [RC]
-  |  mov [RB+4], CARG2d
-  |  mov [RB], RC
+  |  mov RCa, [RC]
+  |  mov [RB], RCa
   |  mov CARG2d, RB
   |.elif X64
   |  mov L:CARG1d, SAVE_L
   |  mov L:CARG1d->base, BASE
   |  mov CARG3d, RA
-  |  mov RA, [RC+4]
-  |  mov RC, [RC]
-  |  mov [RB+4], RA
-  |  mov [RB], RC
+  |  mov RAa, [RC]
+  |  mov [RB], RAa
   |  mov CARG2d, RB
   |.else
   |  mov ARG3, RA
@@ -850,10 +851,15 @@ static void build_subroutines(BuildCtx *ctx, int cmov, int sse)
   |  jz >3
   |->cont_ra:				// BASE = base, RC = result
   |  movzx RA, PC_RA
+  |.if X64
+  |  mov RBa, [RC]
+  |  mov [BASE+RA*8], RBa
+  |.else
   |  mov RB, [RC+4]
   |  mov RC, [RC]
   |  mov [BASE+RA*8+4], RB
   |  mov [BASE+RA*8], RC
+  |.endif
   |  ins_next
   |
   |3:  // Call __index metamethod.
@@ -923,10 +929,15 @@ static void build_subroutines(BuildCtx *ctx, int cmov, int sse)
   |  jz >3
   |  // NOBARRIER: lj_meta_tset ensures the table is not black.
   |  movzx RA, PC_RA
+  |.if X64
+  |  mov RBa, [BASE+RA*8]
+  |  mov [RC], RBa
+  |.else
   |  mov RB, [BASE+RA*8+4]
   |  mov RA, [BASE+RA*8]
   |  mov [RC+4], RB
   |  mov [RC], RA
+  |.endif
   |->cont_nop:				// BASE = base, (RC = result)
   |  ins_next
   |
@@ -935,10 +946,16 @@ static void build_subroutines(BuildCtx *ctx, int cmov, int sse)
   |  mov RA, L:RB->top
   |  mov [RA-12], PC			// [cont|PC]
   |  movzx RC, PC_RA
-  |  mov RB, [BASE+RC*8+4]		// Copy value to third argument.
+  |  // Copy value to third argument.
+  |.if X64
+  |  mov RBa, [BASE+RC*8]
+  |  mov [RA+16], RBa
+  |.else
+  |  mov RB, [BASE+RC*8+4]
   |  mov RC, [BASE+RC*8]
   |  mov [RA+20], RB
   |  mov [RA+16], RC
+  |.endif
   |  lea PC, [RA+FRAME_CONT]
   |  sub PC, BASE
   |  mov LFUNC:RB, [RA-8]		// Guaranteed to be a function here.
@@ -1249,10 +1266,15 @@ static void build_subroutines(BuildCtx *ctx, int cmov, int sse)
   |  mov RA, BASE
   |1:
   |  add RA, 8
+  |.if X64
+  |  mov RBa, [RA]
+  |  mov [RA-8], RBa
+  |.else
   |  mov RB, [RA+4]
   |  mov [RA-4], RB
   |  mov RB, [RA]
   |  mov [RA-8], RB
+  |.endif
   |  sub RD, 1
   |  jnz <1
   |2:
@@ -1377,11 +1399,18 @@ static void build_subroutines(BuildCtx *ctx, int cmov, int sse)
   |  call extern lj_tab_get	// (lua_State *L, GCtab *t, cTValue *key)
   |  // cTValue * returned in eax (RD).
   |  mov BASE, RB			// Restore BASE.
-  |  mov RB, [RD]			// Copy table slot.
+  |  // Copy table slot.
+  |.if X64
+  |  mov RBa, [RD]
+  |  mov PC, [BASE-4]
+  |  mov [BASE-8], RBa
+  |.else
+  |  mov RB, [RD]
   |  mov RD, [RD+4]
   |  mov PC, [BASE-4]
   |  mov [BASE-8], RB
   |  mov [BASE-4], RD
+  |.endif
   |  jmp ->fff_res1
   |
   |//-- Base library: conversions ------------------------------------------
@@ -1453,7 +1482,14 @@ static void build_subroutines(BuildCtx *ctx, int cmov, int sse)
   |  // Flag returned in eax (RD).
   |  mov BASE, L:RB->base
   |  test RD, RD;  jz >3		// End of traversal?
-  |  mov RB, [BASE+8]			// Copy key and value to results.
+  |  // Copy key and value to results.
+  |.if X64
+  |  mov RBa, [BASE+8]
+  |  mov RDa, [BASE+16]
+  |  mov [BASE-8], RBa
+  |  mov [BASE], RDa
+  |.else
+  |  mov RB, [BASE+8]
   |  mov RD, [BASE+12]
   |  mov [BASE-8], RB
   |  mov [BASE-4], RD
@@ -1461,6 +1497,7 @@ static void build_subroutines(BuildCtx *ctx, int cmov, int sse)
   |  mov RD, [BASE+20]
   |  mov [BASE], RB
   |  mov [BASE+4], RD
+  |.endif
   |->fff_res2:
   |  mov RD, 1+2
   |  jmp ->fff_res
@@ -1508,10 +1545,16 @@ static void build_subroutines(BuildCtx *ctx, int cmov, int sse)
   |  add RD, TAB:RB->array
   |1:
   |  cmp dword [RD+4], LJ_TNIL;  je ->fff_res0
-  |  mov RB, [RD]			// Copy array slot.
+  |  // Copy array slot.
+  |.if X64
+  |  mov RBa, [RD]
+  |  mov [BASE], RBa
+  |.else
+  |  mov RB, [RD]
   |  mov RD, [RD+4]
   |  mov [BASE], RB
   |  mov [BASE+4], RD
+  |.endif
   |  jmp ->fff_res2
   |2:  // Check for empty hash part first. Otherwise call C function.
   |  cmp dword TAB:RB->hmask, 0; je ->fff_res0
@@ -1623,10 +1666,15 @@ static void build_subroutines(BuildCtx *ctx, int cmov, int sse)
   |  cmp PC, RA
   |  je >3
   |2:  // Move args to coroutine.
+  |.if X64
+  |  mov RCa, [PC+RB]
+  |  mov [PC-8], RCa
+  |.else
   |  mov RC, [PC+RB+4]
   |  mov [PC-4], RC
   |  mov RC, [PC+RB]
   |  mov [PC-8], RC
+  |.endif
   |  sub PC, 8
   |  cmp PC, RA
   |  jne <2
@@ -1667,10 +1715,15 @@ static void build_subroutines(BuildCtx *ctx, int cmov, int sse)
   |  mov RB, BASE
   |  sub RBa, RAa
   |5:  // Move results from coroutine.
+  |.if X64
+  |  mov RDa, [RA]
+  |  mov [RA+RB], RDa
+  |.else
   |  mov RD, [RA]
   |  mov [RA+RB], RD
   |  mov RD, [RA+4]
   |  mov [RA+RB+4], RD
+  |.endif
   |  add RA, 8
   |  cmp RA, KBASE
   |  jne <5
@@ -1699,10 +1752,16 @@ static void build_subroutines(BuildCtx *ctx, int cmov, int sse)
   |  mov RA, L:PC->top
   |  sub RA, 8
   |  mov L:PC->top, RA			// Clear error from coroutine stack.
-  |  mov RD, [RA]			// Copy error message.
+  |  // Copy error message.
+  |.if X64
+  |  mov RDa, [RA]
+  |  mov [BASE], RDa
+  |.else
+  |  mov RD, [RA]
   |  mov [BASE], RD
   |  mov RD, [RA+4]
   |  mov [BASE+4], RD
+  |.endif
   |  mov RD, 1+2			// nresults+1 = 1 + false + error.
   |  jmp <7
   |.else
@@ -3525,10 +3584,15 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse)
 
   case BC_MOV:
     |  ins_AD	// RA = dst, RD = src
+    |.if X64
+    |  mov RBa, [BASE+RD*8]
+    |  mov [BASE+RA*8], RBa
+    |.else
     |  mov RB, [BASE+RD*8+4]
-    |  mov RD, [BASE+RD*8]		// Overwrites RD.
+    |  mov RD, [BASE+RD*8]
     |  mov [BASE+RA*8+4], RB
     |  mov [BASE+RA*8], RD
+    |.endif
     |  ins_next_
     break;
   case BC_NOT:
@@ -3702,10 +3766,15 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse)
     |  jnz ->vmeta_binop
     |  movzx RB, PC_RB			// Copy result to Stk[RA] from Stk[RB].
     |  movzx RA, PC_RA
+    |.if X64
+    |  mov RCa, [BASE+RB*8]
+    |  mov [BASE+RA*8], RCa
+    |.else
     |  mov RC, [BASE+RB*8+4]
     |  mov RB, [BASE+RB*8]
     |  mov [BASE+RA*8+4], RC
     |  mov [BASE+RA*8], RB
+    |.endif
     |  ins_next
     break;
 
@@ -3767,10 +3836,15 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse)
     |  mov LFUNC:RB, [BASE-8]
     |  mov UPVAL:RB, [LFUNC:RB+RD*4+offsetof(GCfuncL, uvptr)]
     |  mov RB, UPVAL:RB->v
+    |.if X64
+    |  mov RDa, [RB]
+    |  mov [BASE+RA*8], RDa
+    |.else
     |  mov RD, [RB+4]
     |  mov RB, [RB]
     |  mov [BASE+RA*8+4], RD
     |  mov [BASE+RA*8], RB
+    |.endif
     |  ins_next
     break;
   case BC_USETV:
@@ -4021,20 +4095,28 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse)
     |  add RC, TAB:RB->array
     |  cmp dword [RC+4], LJ_TNIL	// Avoid overwriting RB in fastpath.
     |  je >2
-    |1:
-    |  mov RB, [RC]			// Get array slot.
+    |  // Get array slot.
+    |.if X64
+    |  mov RBa, [RC]
+    |  mov [BASE+RA*8], RBa
+    |.else
+    |  mov RB, [RC]
     |  mov RC, [RC+4]
     |  mov [BASE+RA*8], RB
     |  mov [BASE+RA*8+4], RC
+    |.endif
+    |1:
     |  ins_next
     |
     |2:  // Check for __index if table value is nil.
     |  cmp dword TAB:RB->metatable, 0	// Shouldn't overwrite RA for fastpath.
-    |  jz <1
+    |  jz >3
     |  mov TAB:RA, TAB:RB->metatable
     |  test byte TAB:RA->nomm, 1<<MM_index
     |  jz ->vmeta_tgetv			// 'no __index' flag NOT set: check.
     |  movzx RA, PC_RA			// Restore RA.
+    |3:
+    |  mov dword [BASE+RA*8+4], LJ_TNIL
     |  jmp <1
     |
     |5:  // String key?
@@ -4062,16 +4144,22 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse)
     |  cmp dword [RA+4], LJ_TNIL	// Avoid overwriting RB in fastpath.
     |  je >5				// Key found, but nil value?
     |  movzx RC, PC_RA
-    |  mov RB, [RA]			// Get node value.
+    |  // Get node value.
+    |.if X64
+    |  mov RBa, [RA]
+    |  mov [BASE+RC*8], RBa
+    |.else
+    |  mov RB, [RA]
     |  mov RA, [RA+4]
     |  mov [BASE+RC*8], RB
-    |2:
     |  mov [BASE+RC*8+4], RA
+    |.endif
+    |2:
     |  ins_next
     |
     |3:
     |  movzx RC, PC_RA
-    |  mov RA, LJ_TNIL
+    |  mov dword [BASE+RC*8+4], LJ_TNIL
     |  jmp <2
     |
     |4:  // Follow hash chain.
@@ -4098,20 +4186,28 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse)
     |  add RC, TAB:RB->array
     |  cmp dword [RC+4], LJ_TNIL	// Avoid overwriting RB in fastpath.
     |  je >2
-    |1:
-    |  mov RB, [RC]			// Get array slot.
+    |  // Get array slot.
+    |.if X64
+    |  mov RBa, [RC]
+    |  mov [BASE+RA*8], RBa
+    |.else
+    |  mov RB, [RC]
     |  mov RC, [RC+4]
     |  mov [BASE+RA*8], RB
     |  mov [BASE+RA*8+4], RC
+    |.endif
+    |1:
     |  ins_next
     |
     |2:  // Check for __index if table value is nil.
     |  cmp dword TAB:RB->metatable, 0	// Shouldn't overwrite RA for fastpath.
-    |  jz <1
+    |  jz >3
     |  mov TAB:RA, TAB:RB->metatable
     |  test byte TAB:RA->nomm, 1<<MM_index
     |  jz ->vmeta_tgetb			// 'no __index' flag NOT set: check.
     |  movzx RA, PC_RA			// Restore RA.
+    |3:
+    |  mov dword [BASE+RA*8+4], LJ_TNIL
     |  jmp <1
     break;
 
@@ -4146,11 +4242,16 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse)
     |1:
     |  test byte TAB:RB->marked, LJ_GC_BLACK	// isblack(table)
     |  jnz >7
-    |2:
-    |  mov RB, [BASE+RA*8+4]		// Set array slot.
+    |2:  // Set array slot.
+    |.if X64
+    |  mov RBa, [BASE+RA*8]
+    |  mov [RC], RBa
+    |.else
+    |  mov RB, [BASE+RA*8+4]
     |  mov RA, [BASE+RA*8]
     |  mov [RC+4], RB
     |  mov [RC], RA
+    |.endif
     |  ins_next
     |
     |3:  // Check for __newindex if previous value is nil.
@@ -4195,12 +4296,17 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse)
     |2:
     |  test byte TAB:RB->marked, LJ_GC_BLACK	// isblack(table)
     |  jnz >7
-    |3:
+    |3:  // Set node value.
     |  movzx RC, PC_RA
-    |  mov RB, [BASE+RC*8+4]		// Set node value.
+    |.if X64
+    |  mov RBa, [BASE+RC*8]
+    |  mov [RA], RBa
+    |.else
+    |  mov RB, [BASE+RC*8+4]
     |  mov RC, [BASE+RC*8]
     |  mov [RA+4], RB
     |  mov [RA], RC
+    |.endif
     |  ins_next
     |
     |4:  // Check for __newindex if previous value is nil.
@@ -4268,11 +4374,16 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse)
     |1:
     |  test byte TAB:RB->marked, LJ_GC_BLACK	// isblack(table)
     |  jnz >7
-    |2:
-    |  mov RB, [BASE+RA*8+4]		// Set array slot.
+    |2:	 // Set array slot.
+    |.if X64
+    |  mov RAa, [BASE+RA*8]
+    |  mov [RC], RAa
+    |.else
+    |  mov RB, [BASE+RA*8+4]
     |  mov RA, [BASE+RA*8]
     |  mov [RC+4], RB
     |  mov [RC], RA
+    |.endif
     |  ins_next
     |
     |3:  // Check for __newindex if previous value is nil.
@@ -4310,11 +4421,17 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse)
     |  shl KBASE, 3
     |  add KBASE, TAB:RB->array
     |3:  // Copy result slots to table.
+    |.if X64
+    |  mov RBa, [RA]
+    |  add RA, 8
+    |  mov [KBASE], RBa
+    |.else
     |  mov RB, [RA]
     |  mov [KBASE], RB
     |  mov RB, [RA+4]
     |  add RA, 8
     |  mov [KBASE+4], RB
+    |.endif
     |  add KBASE, 8
     |  sub RD, 1
     |  jnz <3
@@ -4382,13 +4499,19 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse)
     |  mov MULTRES, NARGS:RD
     |  sub NARGS:RD, 1
     |  jz >3
-    |2:
-    |  mov RB, [RA]			// Move args down.
+    |2:  // Move args down.
+    |.if X64
+    |  mov RBa, [RA]
+    |  add RA, 8
+    |  mov [KBASE], RBa
+    |.else
+    |  mov RB, [RA]
     |  mov [KBASE], RB
     |  mov RB, [RA+4]
+    |  add RA, 8
     |  mov [KBASE+4], RB
+    |.endif
     |  add KBASE, 8
-    |  add RA, 8
     |  sub NARGS:RD, 1
     |  jnz <2
     |
@@ -4427,6 +4550,12 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse)
   case BC_ITERC:
     |  ins_A	// RA = base, (RB = nresults+1,) RC = nargs+1 (2+1)
     |  lea RA, [BASE+RA*8+8]		// fb = base+1
+    |.if X64
+    |  mov RBa, [RA-24]			// Copy state. fb[0] = fb[-3].
+    |  mov RCa, [RA-16]			// Copy control var. fb[1] = fb[-2].
+    |  mov [RA], RBa
+    |  mov [RA+8], RCa
+    |.else
     |  mov RB, [RA-24]			// Copy state. fb[0] = fb[-3].
     |  mov RC, [RA-20]
     |  mov [RA], RB
@@ -4435,6 +4564,7 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse)
     |  mov RC, [RA-12]
     |  mov [RA+8], RB
     |  mov [RA+12], RC
+    |.endif
     |  mov LFUNC:RB, [RA-32]		// Copy callable. fb[-1] = fb[-4]
     |  mov RC, [RA-28]
     |  mov [RA-8], LFUNC:RB
@@ -4459,11 +4589,17 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse)
     |  cmp KBASE, BASE			// No vararg slots?
     |  jnb >2
     |1:  // Copy vararg slots to destination slots.
+    |.if X64
+    |  mov RCa, [KBASE-8]
+    |  add KBASE, 8
+    |  mov [RA], RCa
+    |.else
     |  mov RC, [KBASE-8]
     |  mov [RA], RC
     |  mov RC, [KBASE-4]
     |  add KBASE, 8
     |  mov [RA+4], RC
+    |.endif
     |  add RA, 8
     |  cmp RA, RB			// All destination slots filled?
     |  jnb >3
@@ -4492,11 +4628,17 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse)
     |  cmp RC, L:RB->maxstack
     |  ja >7				// Need to grow stack?
     |6:  // Copy all vararg slots.
+    |.if X64
+    |  mov RCa, [KBASE-8]
+    |  add KBASE, 8
+    |  mov [RA], RCa
+    |.else
     |  mov RC, [KBASE-8]
     |  mov [RA], RC
     |  mov RC, [KBASE-4]
     |  add KBASE, 8
     |  mov [RA+4], RC
+    |.endif
     |  add RA, 8
     |  cmp KBASE, BASE			// No more vararg slots?
     |  jb <6
@@ -4541,11 +4683,16 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse)
       |  mov KBASE, BASE		// Use KBASE for result move.
       |  sub RD, 1
       |  jz >3
-      |2:
-      |  mov RB, [KBASE+RA]		// Move results down.
+      |2:  // Move results down.
+      |.if X64
+      |  mov RBa, [KBASE+RA]
+      |  mov [KBASE-8], RBa
+      |.else
+      |  mov RB, [KBASE+RA]
       |  mov [KBASE-8], RB
       |  mov RB, [KBASE+RA+4]
       |  mov [KBASE-4], RB
+      |.endif
       |  add KBASE, 8
       |  sub RD, 1
       |  jnz <2
@@ -4557,10 +4704,15 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse)
       |  ja >6
       break;
     case BC_RET1:
+      |.if X64
+      |  mov RBa, [BASE+RA]
+      |  mov [BASE-8], RBa
+      |.else
       |  mov RB, [BASE+RA+4]
       |  mov [BASE-4], RB
       |  mov RB, [BASE+RA]
       |  mov [BASE-8], RB
+      |.endif
       /* fallthrough */
     case BC_RET0:
       |5:

src/buildvm_x86.h

@@ -12,7 +12,7 @@
 #define DASM_SECTION_CODE_OP	0
 #define DASM_SECTION_CODE_SUB	1
 #define DASM_MAXSECTION		2
-static const unsigned char build_actionlist[15233] = {
+static const unsigned char build_actionlist[15260] = {
   254,1,248,10,252,247,198,237,15,132,244,11,131,230,252,248,41,252,242,141,
   76,49,252,248,139,114,252,252,199,68,10,4,237,248,12,131,192,1,137,68,36,
   20,252,247,198,237,15,132,244,13,248,14,129,252,246,239,252,247,198,237,15,
@@ -630,124 +630,125 @@ static const unsigned char build_actionlist[15233] = {
   252,234,129,124,253,194,4,239,15,135,244,251,255,252,242,15,16,4,194,252,
   242,15,45,192,252,242,15,42,200,102,15,46,193,255,221,4,194,219,20,36,219,
   4,36,255,15,133,244,36,59,133,233,15,131,244,36,193,224,3,3,133,233,129,120,
-  253,4,239,15,132,244,248,248,1,139,40,139,64,4,137,44,202,137,68,202,4,139,
+  253,4,239,15,132,244,248,139,40,139,64,4,137,44,202,137,68,202,4,248,1,139,
   6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,171,248,2,131,189,
-  233,0,15,132,244,1,139,141,233,252,246,129,233,235,15,132,244,36,15,182,78,
-  252,253,252,233,244,1,248,5,255,129,124,253,194,4,239,15,133,244,36,139,4,
-  194,252,233,244,157,255,15,182,252,236,15,182,192,252,247,208,139,4,135,129,
-  124,253,252,234,4,239,15,133,244,34,139,44,252,234,248,157,139,141,233,35,
-  136,233,105,201,239,3,141,233,248,1,129,185,233,239,15,133,244,250,57,129,
-  233,15,133,244,250,129,121,253,4,239,15,132,244,251,15,182,70,252,253,139,
-  41,139,73,4,137,44,194,248,2,255,137,76,194,4,139,6,15,182,204,15,182,232,
-  131,198,4,193,232,16,252,255,36,171,248,3,15,182,70,252,253,185,237,252,233,
-  244,2,248,4,139,137,233,133,201,15,133,244,1,248,5,139,141,233,133,201,15,
-  132,244,3,252,246,129,233,235,15,133,244,3,252,233,244,34,255,15,182,252,
-  236,15,182,192,129,124,253,252,234,4,239,15,133,244,35,139,44,252,234,59,
-  133,233,15,131,244,35,193,224,3,3,133,233,129,120,253,4,239,15,132,244,248,
-  248,1,139,40,139,64,4,137,44,202,137,68,202,4,139,6,15,182,204,15,182,232,
-  131,198,4,193,232,16,252,255,36,171,248,2,131,189,233,0,15,132,244,1,139,
-  141,233,252,246,129,233,235,15,132,244,35,255,15,182,252,236,15,182,192,129,
-  124,253,252,234,4,239,15,133,244,39,139,44,252,234,129,124,253,194,4,239,
-  15,135,244,251,255,15,133,244,39,59,133,233,15,131,244,39,193,224,3,3,133,
+  233,0,15,132,244,249,139,141,233,252,246,129,233,235,15,132,244,36,15,182,
+  78,252,253,248,3,255,199,68,202,4,237,252,233,244,1,248,5,129,124,253,194,
+  4,239,15,133,244,36,139,4,194,252,233,244,157,255,15,182,252,236,15,182,192,
+  252,247,208,139,4,135,129,124,253,252,234,4,239,15,133,244,34,139,44,252,
+  234,248,157,139,141,233,35,136,233,105,201,239,3,141,233,248,1,129,185,233,
+  239,15,133,244,250,57,129,233,15,133,244,250,129,121,253,4,239,15,132,244,
+  251,15,182,70,252,253,139,41,139,73,4,137,44,194,137,76,194,4,248,2,255,139,
+  6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,171,248,3,15,182,
+  70,252,253,199,68,194,4,237,252,233,244,2,248,4,139,137,233,133,201,15,133,
+  244,1,248,5,139,141,233,133,201,15,132,244,3,252,246,129,233,235,15,133,244,
+  3,252,233,244,34,255,15,182,252,236,15,182,192,129,124,253,252,234,4,239,
+  15,133,244,35,139,44,252,234,59,133,233,15,131,244,35,193,224,3,3,133,233,
+  129,120,253,4,239,15,132,244,248,139,40,139,64,4,137,44,202,137,68,202,4,
+  248,1,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,171,248,
+  2,131,189,233,0,15,132,244,249,139,141,233,252,246,129,233,235,15,132,244,
+  35,255,15,182,78,252,253,248,3,199,68,202,4,237,252,233,244,1,255,15,182,
+  252,236,15,182,192,129,124,253,252,234,4,239,15,133,244,39,139,44,252,234,
+  129,124,253,194,4,239,15,135,244,251,255,15,133,244,39,59,133,233,15,131,
+  244,39,193,224,3,3,133,233,129,120,253,4,239,15,132,244,249,248,1,252,246,
+  133,233,235,15,133,244,253,248,2,139,108,202,4,139,12,202,137,104,4,137,8,
+  139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,171,248,3,131,
+  189,233,0,15,132,244,1,139,141,233,255,252,246,129,233,235,15,132,244,39,
+  15,182,78,252,253,252,233,244,1,248,5,129,124,253,194,4,239,15,133,244,39,
+  139,4,194,252,233,244,158,248,7,128,165,233,235,139,139,233,137,171,233,137,
+  141,233,15,182,78,252,253,252,233,244,2,255,15,182,252,236,15,182,192,252,
+  247,208,139,4,135,129,124,253,252,234,4,239,15,133,244,37,139,44,252,234,
+  248,158,139,141,233,35,136,233,105,201,239,198,133,233,0,3,141,233,248,1,
+  129,185,233,239,15,133,244,251,57,129,233,15,133,244,251,129,121,253,4,239,
+  15,132,244,250,248,2,255,252,246,133,233,235,15,133,244,253,248,3,15,182,
+  70,252,253,139,108,194,4,139,4,194,137,105,4,137,1,139,6,15,182,204,15,182,
+  232,131,198,4,193,232,16,252,255,36,171,248,4,131,189,233,0,15,132,244,2,
+  137,76,36,16,139,141,233,252,246,129,233,235,15,132,244,37,139,76,36,16,252,
+  233,244,2,248,5,139,137,233,133,201,15,133,244,1,255,139,141,233,133,201,
+  15,132,244,252,252,246,129,233,235,15,132,244,37,248,6,137,68,36,16,199,68,
+  36,20,237,137,108,36,12,141,68,36,16,137,108,36,4,139,108,36,48,137,68,36,
+  8,137,44,36,137,149,233,137,116,36,24,232,251,1,32,139,149,233,139,108,36,
+  12,137,193,252,233,244,2,248,7,128,165,233,235,139,131,233,137,171,233,137,
+  133,233,252,233,244,3,255,15,182,252,236,15,182,192,129,124,253,252,234,4,
+  239,15,133,244,38,139,44,252,234,59,133,233,15,131,244,38,193,224,3,3,133,
   233,129,120,253,4,239,15,132,244,249,248,1,252,246,133,233,235,15,133,244,
   253,248,2,139,108,202,4,139,12,202,137,104,4,137,8,139,6,15,182,204,15,182,
   232,131,198,4,193,232,16,252,255,36,171,248,3,131,189,233,0,15,132,244,1,
-  139,141,233,255,252,246,129,233,235,15,132,244,39,15,182,78,252,253,252,233,
-  244,1,248,5,129,124,253,194,4,239,15,133,244,39,139,4,194,252,233,244,158,
-  248,7,128,165,233,235,139,139,233,137,171,233,137,141,233,15,182,78,252,253,
-  252,233,244,2,255,15,182,252,236,15,182,192,252,247,208,139,4,135,129,124,
-  253,252,234,4,239,15,133,244,37,139,44,252,234,248,158,139,141,233,35,136,
-  233,105,201,239,198,133,233,0,3,141,233,248,1,129,185,233,239,15,133,244,
-  251,57,129,233,15,133,244,251,129,121,253,4,239,15,132,244,250,248,2,255,
-  252,246,133,233,235,15,133,244,253,248,3,15,182,70,252,253,139,108,194,4,
-  139,4,194,137,105,4,137,1,139,6,15,182,204,15,182,232,131,198,4,193,232,16,
-  252,255,36,171,248,4,131,189,233,0,15,132,244,2,137,76,36,16,139,141,233,
-  252,246,129,233,235,15,132,244,37,139,76,36,16,252,233,244,2,248,5,139,137,
-  233,133,201,15,133,244,1,255,139,141,233,133,201,15,132,244,252,252,246,129,
-  233,235,15,132,244,37,248,6,137,68,36,16,199,68,36,20,237,137,108,36,12,141,
-  68,36,16,137,108,36,4,139,108,36,48,137,68,36,8,137,44,36,137,149,233,137,
-  116,36,24,232,251,1,32,139,149,233,139,108,36,12,137,193,252,233,244,2,248,
-  7,128,165,233,235,139,131,233,137,171,233,137,133,233,252,233,244,3,255,15,
-  182,252,236,15,182,192,129,124,253,252,234,4,239,15,133,244,38,139,44,252,
-  234,59,133,233,15,131,244,38,193,224,3,3,133,233,129,120,253,4,239,15,132,
-  244,249,248,1,252,246,133,233,235,15,133,244,253,248,2,139,108,202,4,139,
-  12,202,137,104,4,137,8,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,
-  255,36,171,248,3,131,189,233,0,15,132,244,1,255,139,141,233,252,246,129,233,
-  235,15,132,244,38,15,182,78,252,253,252,233,244,1,248,7,128,165,233,235,139,
-  139,233,137,171,233,137,141,233,15,182,78,252,253,252,233,244,2,255,137,124,
-  36,16,139,60,199,248,1,141,12,202,139,105,252,248,252,246,133,233,235,15,
-  133,244,253,248,2,139,68,36,20,131,232,1,15,132,244,250,1,252,248,59,133,
-  233,15,135,244,251,41,252,248,193,231,3,3,189,233,248,3,139,41,137,47,139,
-  105,4,131,193,8,137,111,4,131,199,8,131,232,1,15,133,244,3,248,4,139,124,
-  36,16,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,171,248,
-  5,137,108,36,4,139,108,36,48,137,149,233,137,68,36,8,137,44,36,137,116,36,
-  24,232,251,1,33,139,149,233,15,182,78,252,253,252,233,244,1,248,7,255,128,
-  165,233,235,139,131,233,137,171,233,137,133,233,252,233,244,2,255,3,68,36,
-  20,255,129,124,253,202,4,239,139,44,202,15,133,244,51,141,84,202,8,137,114,
-  252,252,139,181,233,139,14,15,182,252,233,15,182,205,131,198,4,252,255,36,
-  171,255,141,76,202,8,137,215,139,105,252,248,129,121,253,252,252,239,15,133,
-  244,28,248,52,139,114,252,252,252,247,198,237,15,133,244,253,248,1,137,106,
-  252,248,137,68,36,20,131,232,1,15,132,244,249,248,2,139,41,137,47,139,105,
-  4,137,111,4,131,199,8,131,193,8,131,232,1,15,133,244,2,139,106,252,248,248,
-  3,139,68,36,20,128,189,233,1,15,135,244,251,248,4,139,181,233,139,14,15,182,
-  252,233,15,182,205,131,198,4,252,255,36,171,248,5,255,252,247,198,237,15,
-  133,244,4,15,182,78,252,253,252,247,209,141,12,202,139,121,252,248,139,191,
-  233,139,191,233,252,233,244,4,248,7,129,252,238,239,252,247,198,237,15,133,
-  244,254,41,252,242,137,215,139,114,252,252,252,233,244,1,248,8,129,198,239,
-  252,233,244,1,255,141,76,202,8,139,105,232,139,65,252,236,137,41,137,65,4,
-  139,105,252,240,139,65,252,244,137,105,8,137,65,12,139,105,224,139,65,228,
-  137,105,252,248,137,65,252,252,129,252,248,239,184,237,15,133,244,28,137,
-  202,137,114,252,252,139,181,233,139,14,15,182,252,233,15,182,205,131,198,
-  4,252,255,36,171,255,15,182,252,236,15,182,192,137,124,36,16,141,188,253,
-  194,233,141,12,202,43,122,252,252,133,252,237,15,132,244,251,141,108,252,
-  233,252,248,57,215,15,131,244,248,248,1,139,71,252,248,137,1,139,71,252,252,
-  131,199,8,137,65,4,131,193,8,57,252,233,15,131,244,249,57,215,15,130,244,
-  1,248,2,199,65,4,237,131,193,8,57,252,233,15,130,244,2,248,3,139,124,36,16,
-  139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,171,248,5,199,
-  68,36,20,1,0,0,0,137,208,41,252,248,15,134,244,3,137,197,193,252,237,3,131,
-  197,1,137,108,36,20,139,108,36,48,1,200,59,133,233,15,135,244,253,248,6,255,
-  139,71,252,248,137,1,139,71,252,252,131,199,8,137,65,4,131,193,8,57,215,15,
-  130,244,6,252,233,244,3,248,7,137,149,233,137,141,233,137,116,36,24,41,215,
-  139,84,36,20,131,252,234,1,137,252,233,232,251,1,0,139,149,233,139,141,233,
-  1,215,252,233,244,6,255,193,225,3,255,248,1,139,114,252,252,137,68,36,20,
-  252,247,198,237,15,133,244,253,255,248,13,137,215,131,232,1,15,132,244,249,
-  248,2,139,44,15,137,111,252,248,139,108,15,4,137,111,252,252,131,199,8,131,
-  232,1,15,133,244,2,248,3,139,68,36,20,15,182,110,252,255,248,5,57,197,15,
-  135,244,252,255,139,108,10,4,137,106,252,252,139,44,10,137,106,252,248,255,
-  248,5,56,70,252,255,15,135,244,252,255,15,182,78,252,253,252,247,209,141,
-  20,202,139,122,252,248,139,191,233,139,191,233,139,6,15,182,204,15,182,232,
-  131,198,4,193,232,16,252,255,36,171,248,6,255,199,71,252,252,237,131,199,
-  8,255,199,68,194,252,244,237,255,131,192,1,252,233,244,5,248,7,141,174,233,
-  252,247,197,237,15,133,244,14,41,252,234,255,1,252,233,255,137,252,245,209,
-  252,237,129,229,239,102,131,172,253,43,233,1,15,132,244,140,255,141,12,202,
-  255,129,121,253,4,239,15,135,244,53,129,121,253,12,239,15,135,244,53,255,
-  139,105,20,255,129,252,253,239,15,135,244,53,255,252,242,15,16,1,252,242,
-  15,16,73,8,255,252,242,15,88,65,16,252,242,15,17,1,133,252,237,15,136,244,
-  249,255,15,140,244,249,255,102,15,46,200,248,1,252,242,15,17,65,24,255,221,
-  65,8,221,1,255,220,65,16,221,17,221,81,24,133,252,237,15,136,244,247,255,
-  221,81,24,15,140,244,247,255,217,201,248,1,255,15,183,70,252,254,255,15,131,
-  244,248,141,180,253,134,233,255,141,180,253,134,233,15,183,70,252,254,15,
-  131,245,255,15,130,244,248,141,180,253,134,233,255,248,3,102,15,46,193,252,
-  233,244,1,255,141,12,202,139,105,4,129,252,253,239,15,132,244,247,255,137,
-  105,252,252,139,41,137,105,252,248,252,233,245,255,141,180,253,134,233,139,
-  1,137,105,252,252,137,65,252,248,255,139,139,233,139,4,129,139,128,233,139,
-  108,36,48,137,147,233,137,171,233,252,255,224,255,141,180,253,134,233,139,
-  6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,171,255,137,252,245,
-  209,252,237,129,229,239,102,131,172,253,43,233,1,15,132,244,142,255,139,190,
-  233,139,108,36,48,141,12,202,59,141,233,15,135,244,23,15,182,142,233,57,200,
-  15,134,244,249,248,2,255,15,183,70,252,254,252,233,245,255,248,3,199,68,194,
-  252,252,237,131,192,1,57,200,15,134,244,3,252,233,244,2,255,141,44,197,237,
-  141,4,194,139,122,252,248,137,104,252,252,137,120,252,248,139,108,36,48,141,
-  12,200,59,141,233,15,135,244,22,137,209,137,194,15,182,174,233,133,252,237,
-  15,132,244,248,248,1,131,193,8,57,209,15,131,244,249,139,121,252,248,137,
-  56,139,121,252,252,137,120,4,131,192,8,199,65,252,252,237,131,252,237,1,15,
-  133,244,1,248,2,255,139,190,233,139,6,15,182,204,15,182,232,131,198,4,193,
-  232,16,252,255,36,171,255,248,3,199,64,4,237,131,192,8,131,252,237,1,15,133,
-  244,3,252,233,244,2,255,139,106,252,248,139,189,233,139,108,36,48,141,68,
-  194,252,248,137,149,233,141,136,233,59,141,233,137,133,233,255,137,44,36,
-  255,137,124,36,4,137,44,36,255,15,135,244,21,199,131,233,237,255,252,255,
-  215,255,252,255,147,233,255,199,131,233,237,139,149,233,141,12,194,252,247,
-  217,3,141,233,139,114,252,252,252,233,244,12,255,254,0
+  255,139,141,233,252,246,129,233,235,15,132,244,38,15,182,78,252,253,252,233,
+  244,1,248,7,128,165,233,235,139,139,233,137,171,233,137,141,233,15,182,78,
+  252,253,252,233,244,2,255,137,124,36,16,139,60,199,248,1,141,12,202,139,105,
+  252,248,252,246,133,233,235,15,133,244,253,248,2,139,68,36,20,131,232,1,15,
+  132,244,250,1,252,248,59,133,233,15,135,244,251,41,252,248,193,231,3,3,189,
+  233,248,3,139,41,137,47,139,105,4,131,193,8,137,111,4,131,199,8,131,232,1,
+  15,133,244,3,248,4,139,124,36,16,139,6,15,182,204,15,182,232,131,198,4,193,
+  232,16,252,255,36,171,248,5,137,108,36,4,139,108,36,48,137,149,233,137,68,
+  36,8,137,44,36,137,116,36,24,232,251,1,33,139,149,233,15,182,78,252,253,252,
+  233,244,1,248,7,255,128,165,233,235,139,131,233,137,171,233,137,133,233,252,
+  233,244,2,255,3,68,36,20,255,129,124,253,202,4,239,139,44,202,15,133,244,
+  51,141,84,202,8,137,114,252,252,139,181,233,139,14,15,182,252,233,15,182,
+  205,131,198,4,252,255,36,171,255,141,76,202,8,137,215,139,105,252,248,129,
+  121,253,252,252,239,15,133,244,28,248,52,139,114,252,252,252,247,198,237,
+  15,133,244,253,248,1,137,106,252,248,137,68,36,20,131,232,1,15,132,244,249,
+  248,2,139,41,137,47,139,105,4,131,193,8,137,111,4,131,199,8,131,232,1,15,
+  133,244,2,139,106,252,248,248,3,139,68,36,20,128,189,233,1,15,135,244,251,
+  248,4,139,181,233,139,14,15,182,252,233,15,182,205,131,198,4,252,255,36,171,
+  248,5,255,252,247,198,237,15,133,244,4,15,182,78,252,253,252,247,209,141,
+  12,202,139,121,252,248,139,191,233,139,191,233,252,233,244,4,248,7,129,252,
+  238,239,252,247,198,237,15,133,244,254,41,252,242,137,215,139,114,252,252,
+  252,233,244,1,248,8,129,198,239,252,233,244,1,255,141,76,202,8,139,105,232,
+  139,65,252,236,137,41,137,65,4,139,105,252,240,139,65,252,244,137,105,8,137,
+  65,12,139,105,224,139,65,228,137,105,252,248,137,65,252,252,129,252,248,239,
+  184,237,15,133,244,28,137,202,137,114,252,252,139,181,233,139,14,15,182,252,
+  233,15,182,205,131,198,4,252,255,36,171,255,15,182,252,236,15,182,192,137,
+  124,36,16,141,188,253,194,233,141,12,202,43,122,252,252,133,252,237,15,132,
+  244,251,141,108,252,233,252,248,57,215,15,131,244,248,248,1,139,71,252,248,
+  137,1,139,71,252,252,131,199,8,137,65,4,131,193,8,57,252,233,15,131,244,249,
+  57,215,15,130,244,1,248,2,199,65,4,237,131,193,8,57,252,233,15,130,244,2,
+  248,3,139,124,36,16,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,
+  255,36,171,248,5,199,68,36,20,1,0,0,0,137,208,41,252,248,15,134,244,3,137,
+  197,193,252,237,3,131,197,1,137,108,36,20,139,108,36,48,1,200,59,133,233,
+  15,135,244,253,248,6,255,139,71,252,248,137,1,139,71,252,252,131,199,8,137,
+  65,4,131,193,8,57,215,15,130,244,6,252,233,244,3,248,7,137,149,233,137,141,
+  233,137,116,36,24,41,215,139,84,36,20,131,252,234,1,137,252,233,232,251,1,
+  0,139,149,233,139,141,233,1,215,252,233,244,6,255,193,225,3,255,248,1,139,
+  114,252,252,137,68,36,20,252,247,198,237,15,133,244,253,255,248,13,137,215,
+  131,232,1,15,132,244,249,248,2,139,44,15,137,111,252,248,139,108,15,4,137,
+  111,252,252,131,199,8,131,232,1,15,133,244,2,248,3,139,68,36,20,15,182,110,
+  252,255,248,5,57,197,15,135,244,252,255,139,108,10,4,137,106,252,252,139,
+  44,10,137,106,252,248,255,248,5,56,70,252,255,15,135,244,252,255,15,182,78,
+  252,253,252,247,209,141,20,202,139,122,252,248,139,191,233,139,191,233,139,
+  6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,171,248,6,255,199,
+  71,252,252,237,131,199,8,255,199,68,194,252,244,237,255,131,192,1,252,233,
+  244,5,248,7,141,174,233,252,247,197,237,15,133,244,14,41,252,234,255,1,252,
+  233,255,137,252,245,209,252,237,129,229,239,102,131,172,253,43,233,1,15,132,
+  244,140,255,141,12,202,255,129,121,253,4,239,15,135,244,53,129,121,253,12,
+  239,15,135,244,53,255,139,105,20,255,129,252,253,239,15,135,244,53,255,252,
+  242,15,16,1,252,242,15,16,73,8,255,252,242,15,88,65,16,252,242,15,17,1,133,
+  252,237,15,136,244,249,255,15,140,244,249,255,102,15,46,200,248,1,252,242,
+  15,17,65,24,255,221,65,8,221,1,255,220,65,16,221,17,221,81,24,133,252,237,
+  15,136,244,247,255,221,81,24,15,140,244,247,255,217,201,248,1,255,15,183,
+  70,252,254,255,15,131,244,248,141,180,253,134,233,255,141,180,253,134,233,
+  15,183,70,252,254,15,131,245,255,15,130,244,248,141,180,253,134,233,255,248,
+  3,102,15,46,193,252,233,244,1,255,141,12,202,139,105,4,129,252,253,239,15,
+  132,244,247,255,137,105,252,252,139,41,137,105,252,248,252,233,245,255,141,
+  180,253,134,233,139,1,137,105,252,252,137,65,252,248,255,139,139,233,139,
+  4,129,139,128,233,139,108,36,48,137,147,233,137,171,233,252,255,224,255,141,
+  180,253,134,233,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,
+  36,171,255,137,252,245,209,252,237,129,229,239,102,131,172,253,43,233,1,15,
+  132,244,142,255,139,190,233,139,108,36,48,141,12,202,59,141,233,15,135,244,
+  23,15,182,142,233,57,200,15,134,244,249,248,2,255,15,183,70,252,254,252,233,
+  245,255,248,3,199,68,194,252,252,237,131,192,1,57,200,15,134,244,3,252,233,
+  244,2,255,141,44,197,237,141,4,194,139,122,252,248,137,104,252,252,137,120,
+  252,248,139,108,36,48,141,12,200,59,141,233,15,135,244,22,137,209,137,194,
+  15,182,174,233,133,252,237,15,132,244,248,248,1,131,193,8,57,209,15,131,244,
+  249,139,121,252,248,137,56,139,121,252,252,137,120,4,131,192,8,199,65,252,
+  252,237,131,252,237,1,15,133,244,1,248,2,255,139,190,233,139,6,15,182,204,
+  15,182,232,131,198,4,193,232,16,252,255,36,171,255,248,3,199,64,4,237,131,
+  192,8,131,252,237,1,15,133,244,3,252,233,244,2,255,139,106,252,248,139,189,
+  233,139,108,36,48,141,68,194,252,248,137,149,233,141,136,233,59,141,233,137,
+  133,233,255,137,44,36,255,137,124,36,4,137,44,36,255,15,135,244,21,199,131,
+  233,237,255,252,255,215,255,252,255,147,233,255,199,131,233,237,139,149,233,
+  141,12,194,252,247,217,3,141,233,139,114,252,252,252,233,244,12,255,254,0
 };
 
 enum {
@@ -2050,19 +2051,19 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse)
       dasm_put(Dst, 2527);
     }
     dasm_put(Dst, 12787, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<<MM_index);
-    dasm_put(Dst, 12879, LJ_TSTR);
+    dasm_put(Dst, 12875, LJ_TNIL, LJ_TSTR);
     break;
   case BC_TGETS:
-    dasm_put(Dst, 12897, LJ_TTAB, Dt6(->hmask), Dt5(->hash), sizeof(Node), Dt6(->node), DtB(->key.it), LJ_TSTR, DtB(->key.gcr), LJ_TNIL);
-    dasm_put(Dst, 12981, LJ_TNIL, DtB(->next), Dt6(->metatable), Dt6(->nomm), 1<<MM_index);
+    dasm_put(Dst, 12904, LJ_TTAB, Dt6(->hmask), Dt5(->hash), sizeof(Node), Dt6(->node), DtB(->key.it), LJ_TSTR, DtB(->key.gcr), LJ_TNIL);
+    dasm_put(Dst, 12992, LJ_TNIL, DtB(->next), Dt6(->metatable), Dt6(->nomm), 1<<MM_index);
     break;
   case BC_TGETB:
-    dasm_put(Dst, 13052, LJ_TTAB, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<<MM_index);
-    dasm_put(Dst, 11389);
+    dasm_put(Dst, 13062, LJ_TTAB, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<<MM_index);
+    dasm_put(Dst, 13161, LJ_TNIL);
     break;
 
   case BC_TSETV:
-    dasm_put(Dst, 13151, LJ_TTAB, LJ_TISNUM);
+    dasm_put(Dst, 13178, LJ_TTAB, LJ_TISNUM);
     if (sse) {
       dasm_put(Dst, 12756);
     } else {
@@ -2074,22 +2075,22 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse)
       }
       dasm_put(Dst, 2527);
     }
-    dasm_put(Dst, 13184, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->metatable));
-    dasm_put(Dst, 13267, Dt6(->nomm), 1<<MM_newindex, LJ_TSTR, Dt6(->marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist));
+    dasm_put(Dst, 13211, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->metatable));
+    dasm_put(Dst, 13294, Dt6(->nomm), 1<<MM_newindex, LJ_TSTR, Dt6(->marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist));
     break;
   case BC_TSETS:
-    dasm_put(Dst, 13329, LJ_TTAB, Dt6(->hmask), Dt5(->hash), sizeof(Node), Dt6(->nomm), Dt6(->node), DtB(->key.it), LJ_TSTR, DtB(->key.gcr), LJ_TNIL);
-    dasm_put(Dst, 13404, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<<MM_newindex, DtB(->next));
-    dasm_put(Dst, 13496, Dt6(->metatable), Dt6(->nomm), 1<<MM_newindex, LJ_TSTR, Dt1(->base), Dt1(->base), Dt6(->marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist));
+    dasm_put(Dst, 13356, LJ_TTAB, Dt6(->hmask), Dt5(->hash), sizeof(Node), Dt6(->nomm), Dt6(->node), DtB(->key.it), LJ_TSTR, DtB(->key.gcr), LJ_TNIL);
+    dasm_put(Dst, 13431, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<<MM_newindex, DtB(->next));
+    dasm_put(Dst, 13523, Dt6(->metatable), Dt6(->nomm), 1<<MM_newindex, LJ_TSTR, Dt1(->base), Dt1(->base), Dt6(->marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist));
     break;
   case BC_TSETB:
-    dasm_put(Dst, 13592, LJ_TTAB, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable));
-    dasm_put(Dst, 13690, Dt6(->metatable), Dt6(->nomm), 1<<MM_newindex, Dt6(->marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist));
+    dasm_put(Dst, 13619, LJ_TTAB, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable));
+    dasm_put(Dst, 13717, Dt6(->metatable), Dt6(->nomm), 1<<MM_newindex, Dt6(->marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist));
     break;
 
   case BC_TSETM:
-    dasm_put(Dst, 13736, Dt6(->marked), LJ_GC_BLACK, Dt6(->asize), Dt6(->array), Dt1(->base), Dt1(->base));
-    dasm_put(Dst, 13885, Dt6(->marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist));
+    dasm_put(Dst, 13763, Dt6(->marked), LJ_GC_BLACK, Dt6(->asize), Dt6(->array), Dt1(->base), Dt1(->base));
+    dasm_put(Dst, 13912, Dt6(->marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist));
     break;
 
   /* -- Calls and vararg handling ----------------------------------------- */
@@ -2097,60 +2098,60 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse)
   case BC_CALL: case BC_CALLM:
     dasm_put(Dst, 11403);
     if (op == BC_CALLM) {
-      dasm_put(Dst, 13903);
+      dasm_put(Dst, 13930);
     }
-    dasm_put(Dst, 13908, LJ_TFUNC, Dt7(->pc));
+    dasm_put(Dst, 13935, LJ_TFUNC, Dt7(->pc));
     break;
 
   case BC_CALLMT:
-    dasm_put(Dst, 13903);
+    dasm_put(Dst, 13930);
     break;
   case BC_CALLT:
-    dasm_put(Dst, 13949, LJ_TFUNC, FRAME_TYPE, Dt7(->ffid), Dt7(->pc));
-    dasm_put(Dst, 14067, FRAME_TYPE, Dt7(->pc), PC2PROTO(k), FRAME_VARG, FRAME_TYPEP, FRAME_VARG);
+    dasm_put(Dst, 13976, LJ_TFUNC, FRAME_TYPE, Dt7(->ffid), Dt7(->pc));
+    dasm_put(Dst, 14094, FRAME_TYPE, Dt7(->pc), PC2PROTO(k), FRAME_VARG, FRAME_TYPEP, FRAME_VARG);
     break;
 
   case BC_ITERC:
-    dasm_put(Dst, 14137, LJ_TFUNC, 2+1, Dt7(->pc));
+    dasm_put(Dst, 14164, LJ_TFUNC, 2+1, Dt7(->pc));
     break;
 
   case BC_VARG:
-    dasm_put(Dst, 14217, (8+FRAME_VARG), LJ_TNIL, Dt1(->maxstack));
-    dasm_put(Dst, 14381, Dt1(->base), Dt1(->top), Dt1(->base), Dt1(->top));
+    dasm_put(Dst, 14244, (8+FRAME_VARG), LJ_TNIL, Dt1(->maxstack));
+    dasm_put(Dst, 14408, Dt1(->base), Dt1(->top), Dt1(->base), Dt1(->top));
     break;
 
   /* -- Returns ----------------------------------------------------------- */
 
   case BC_RETM:
-    dasm_put(Dst, 13903);
+    dasm_put(Dst, 13930);
     break;
 
   case BC_RET: case BC_RET0: case BC_RET1:
     if (op != BC_RET0) {
-      dasm_put(Dst, 14452);
+      dasm_put(Dst, 14479);
     }
-    dasm_put(Dst, 14456, FRAME_TYPE);
+    dasm_put(Dst, 14483, FRAME_TYPE);
     switch (op) {
     case BC_RET:
-      dasm_put(Dst, 14475);
+      dasm_put(Dst, 14502);
       break;
     case BC_RET1:
-      dasm_put(Dst, 14533);
+      dasm_put(Dst, 14560);
       /* fallthrough */
     case BC_RET0:
-      dasm_put(Dst, 14549);
+      dasm_put(Dst, 14576);
     default:
       break;
     }
-    dasm_put(Dst, 14560, Dt7(->pc), PC2PROTO(k));
+    dasm_put(Dst, 14587, Dt7(->pc), PC2PROTO(k));
     if (op == BC_RET) {
-      dasm_put(Dst, 14602, LJ_TNIL);
+      dasm_put(Dst, 14629, LJ_TNIL);
     } else {
-      dasm_put(Dst, 14611, LJ_TNIL);
+      dasm_put(Dst, 14638, LJ_TNIL);
     }
-    dasm_put(Dst, 14618, -FRAME_VARG, FRAME_TYPEP);
+    dasm_put(Dst, 14645, -FRAME_VARG, FRAME_TYPEP);
     if (op != BC_RET0) {
-      dasm_put(Dst, 14642);
+      dasm_put(Dst, 14669);
     }
     dasm_put(Dst, 4689);
     break;
@@ -2160,7 +2161,7 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse)
 
   case BC_FORL:
 #if LJ_HASJIT
-    dasm_put(Dst, 14646, HOTCOUNT_PCMASK, GG_DISP2HOT);
+    dasm_put(Dst, 14673, HOTCOUNT_PCMASK, GG_DISP2HOT);
 #endif
     break;
 
@@ -2172,57 +2173,57 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse)
   case BC_FORI:
   case BC_IFORL:
     vk = (op == BC_IFORL || op == BC_JFORL);
-    dasm_put(Dst, 14667);
+    dasm_put(Dst, 14694);
     if (!vk) {
-      dasm_put(Dst, 14671, LJ_TISNUM, LJ_TISNUM);
+      dasm_put(Dst, 14698, LJ_TISNUM, LJ_TISNUM);
     }
-    dasm_put(Dst, 14690);
+    dasm_put(Dst, 14717);
     if (!vk) {
-      dasm_put(Dst, 14694, LJ_TISNUM);
+      dasm_put(Dst, 14721, LJ_TISNUM);
     }
     if (sse) {
-      dasm_put(Dst, 14703);
+      dasm_put(Dst, 14730);
       if (vk) {
-	dasm_put(Dst, 14715);
+	dasm_put(Dst, 14742);
       } else {
-	dasm_put(Dst, 14734);
+	dasm_put(Dst, 14761);
       }
-      dasm_put(Dst, 14739);
+      dasm_put(Dst, 14766);
     } else {
-      dasm_put(Dst, 14752);
+      dasm_put(Dst, 14779);
       if (vk) {
-	dasm_put(Dst, 14758);
+	dasm_put(Dst, 14785);
       } else {
-	dasm_put(Dst, 14774);
+	dasm_put(Dst, 14801);
       }
-      dasm_put(Dst, 14782);
+      dasm_put(Dst, 14809);
       if (cmov) {
       dasm_put(Dst, 10818);
       } else {
       dasm_put(Dst, 10824);
       }
       if (!cmov) {
-	dasm_put(Dst, 14787);
+	dasm_put(Dst, 14814);
       }
     }
     if (op == BC_FORI) {
-      dasm_put(Dst, 14793, -BCBIAS_J*4);
+      dasm_put(Dst, 14820, -BCBIAS_J*4);
     } else if (op == BC_JFORI) {
-      dasm_put(Dst, 14803, -BCBIAS_J*4, BC_JLOOP);
+      dasm_put(Dst, 14830, -BCBIAS_J*4, BC_JLOOP);
     } else if (op == BC_IFORL) {
-      dasm_put(Dst, 14817, -BCBIAS_J*4);
+      dasm_put(Dst, 14844, -BCBIAS_J*4);
     } else {
-      dasm_put(Dst, 14813, BC_JLOOP);
+      dasm_put(Dst, 14840, BC_JLOOP);
     }
     dasm_put(Dst, 10853);
     if (sse) {
-      dasm_put(Dst, 14827);
+      dasm_put(Dst, 14854);
     }
     break;
 
   case BC_ITERL:
 #if LJ_HASJIT
-    dasm_put(Dst, 14646, HOTCOUNT_PCMASK, GG_DISP2HOT);
+    dasm_put(Dst, 14673, HOTCOUNT_PCMASK, GG_DISP2HOT);
 #endif
     break;
 
@@ -2231,18 +2232,18 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse)
     break;
 #endif
   case BC_IITERL:
-    dasm_put(Dst, 14838, LJ_TNIL);
+    dasm_put(Dst, 14865, LJ_TNIL);
     if (op == BC_JITERL) {
-      dasm_put(Dst, 14853, BC_JLOOP);
+      dasm_put(Dst, 14880, BC_JLOOP);
     } else {
-      dasm_put(Dst, 14867, -BCBIAS_J*4);
+      dasm_put(Dst, 14894, -BCBIAS_J*4);
     }
     dasm_put(Dst, 11150);
     break;
 
   case BC_LOOP:
 #if LJ_HASJIT
-    dasm_put(Dst, 14646, HOTCOUNT_PCMASK, GG_DISP2HOT);
+    dasm_put(Dst, 14673, HOTCOUNT_PCMASK, GG_DISP2HOT);
 #endif
     break;
 
@@ -2252,12 +2253,12 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse)
 
   case BC_JLOOP:
 #if LJ_HASJIT
-    dasm_put(Dst, 14883, DISPATCH_J(trace), DtD(->mcode), DISPATCH_GL(jit_base), DISPATCH_GL(jit_L));
+    dasm_put(Dst, 14910, DISPATCH_J(trace), DtD(->mcode), DISPATCH_GL(jit_base), DISPATCH_GL(jit_L));
 #endif
     break;
 
   case BC_JMP:
-    dasm_put(Dst, 14906, -BCBIAS_J*4);
+    dasm_put(Dst, 14933, -BCBIAS_J*4);
     break;
 
   /* -- Function headers -------------------------------------------------- */
@@ -2271,7 +2272,7 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse)
 
   case BC_FUNCF:
 #if LJ_HASJIT
-    dasm_put(Dst, 14930, HOTCOUNT_PCMASK, GG_DISP2HOT);
+    dasm_put(Dst, 14957, HOTCOUNT_PCMASK, GG_DISP2HOT);
 #endif
   case BC_FUNCV:  /* NYI: compiled vararg functions. */
     break;
@@ -2281,13 +2282,13 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse)
     break;
 #endif
   case BC_IFUNCF:
-    dasm_put(Dst, 14951, -4+PC2PROTO(k), Dt1(->maxstack), -4+PC2PROTO(numparams));
+    dasm_put(Dst, 14978, -4+PC2PROTO(k), Dt1(->maxstack), -4+PC2PROTO(numparams));
     if (op == BC_JFUNCF) {
-      dasm_put(Dst, 14981, BC_JLOOP);
+      dasm_put(Dst, 15008, BC_JLOOP);
     } else {
       dasm_put(Dst, 10855);
     }
-    dasm_put(Dst, 14990, LJ_TNIL);
+    dasm_put(Dst, 15017, LJ_TNIL);
     break;
 
   case BC_JFUNCV:
@@ -2298,30 +2299,30 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse)
     break;  /* NYI: compiled vararg functions. */
 
   case BC_IFUNCV:
-    dasm_put(Dst, 15012, FRAME_VARG, Dt1(->maxstack), -4+PC2PROTO(numparams), LJ_TNIL);
+    dasm_put(Dst, 15039, FRAME_VARG, Dt1(->maxstack), -4+PC2PROTO(numparams), LJ_TNIL);
     if (op == BC_JFUNCV) {
-      dasm_put(Dst, 14981, BC_JLOOP);
+      dasm_put(Dst, 15008, BC_JLOOP);
     } else {
-      dasm_put(Dst, 15103, -4+PC2PROTO(k));
+      dasm_put(Dst, 15130, -4+PC2PROTO(k));
     }
-    dasm_put(Dst, 15125, LJ_TNIL);
+    dasm_put(Dst, 15152, LJ_TNIL);
     break;
 
   case BC_FUNCC:
   case BC_FUNCCW:
-    dasm_put(Dst, 15147, Dt8(->f), Dt1(->base), 8*LUA_MINSTACK, Dt1(->maxstack), Dt1(->top));
+    dasm_put(Dst, 15174, Dt8(->f), Dt1(->base), 8*LUA_MINSTACK, Dt1(->maxstack), Dt1(->top));
     if (op == BC_FUNCC) {
-      dasm_put(Dst, 15176);
+      dasm_put(Dst, 15203);
     } else {
-      dasm_put(Dst, 15180);
+      dasm_put(Dst, 15207);
     }
-    dasm_put(Dst, 15188, DISPATCH_GL(vmstate), ~LJ_VMST_C);
+    dasm_put(Dst, 15215, DISPATCH_GL(vmstate), ~LJ_VMST_C);
     if (op == BC_FUNCC) {
-      dasm_put(Dst, 15197);
+      dasm_put(Dst, 15224);
     } else {
-      dasm_put(Dst, 15201, DISPATCH_GL(wrapf));
+      dasm_put(Dst, 15228, DISPATCH_GL(wrapf));
     }
-    dasm_put(Dst, 15206, DISPATCH_GL(vmstate), ~LJ_VMST_INTERP, Dt1(->base), Dt1(->top));
+    dasm_put(Dst, 15233, DISPATCH_GL(vmstate), ~LJ_VMST_INTERP, Dt1(->base), Dt1(->top));
     break;
 
   /* ---------------------------------------------------------------------- */
@@ -2349,7 +2350,7 @@ static int build_backend(BuildCtx *ctx)
 
   build_subroutines(ctx, cmov, sse);
 
-  dasm_put(Dst, 15231);
+  dasm_put(Dst, 15258);
   for (op = 0; op < BC__MAX; op++)
     build_ins(ctx, (BCOp)op, op, cmov, sse);