1 files changed, 105 insertions, 106 deletions

diff --git a/src/buildvm_x86.h b/src/buildvm_x86.h
index 10392991..7624330c 100644
--- a/src/buildvm_x86.h
+++ b/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[15235] = {
+static const unsigned char build_actionlist[15227] = {
   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,
@@ -698,57 +698,56 @@ static const unsigned char build_actionlist[15235] = {
   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,139,66,252,248,141,12,202,139,128,233,
-  15,182,128,233,137,124,36,16,141,188,253,194,233,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,
-  255,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,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
+  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 {
@@ -2116,8 +2115,8 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse)
     break;
 
   case BC_VARG:
-    dasm_put(Dst, 14211, Dt7(->pc), PC2PROTO(numparams), (8+FRAME_VARG), LJ_TNIL);
-    dasm_put(Dst, 14355, Dt1(->maxstack), Dt1(->base), Dt1(->top), Dt1(->base), Dt1(->top));
+    dasm_put(Dst, 14211, (8+FRAME_VARG), LJ_TNIL, Dt1(->maxstack));
+    dasm_put(Dst, 14375, Dt1(->base), Dt1(->top), Dt1(->base), Dt1(->top));
     break;
 
   /* -- Returns ----------------------------------------------------------- */
@@ -2128,30 +2127,30 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse)
 
   case BC_RET: case BC_RET0: case BC_RET1:
     if (op != BC_RET0) {
-      dasm_put(Dst, 14454);
+      dasm_put(Dst, 14446);
     }
-    dasm_put(Dst, 14458, FRAME_TYPE);
+    dasm_put(Dst, 14450, FRAME_TYPE);
     switch (op) {
     case BC_RET:
-      dasm_put(Dst, 14477);
+      dasm_put(Dst, 14469);
       break;
     case BC_RET1:
-      dasm_put(Dst, 14535);
+      dasm_put(Dst, 14527);
       /* fallthrough */
     case BC_RET0:
-      dasm_put(Dst, 14551);
+      dasm_put(Dst, 14543);
     default:
       break;
     }
-    dasm_put(Dst, 14562, Dt7(->pc), PC2PROTO(k));
+    dasm_put(Dst, 14554, Dt7(->pc), PC2PROTO(k));
     if (op == BC_RET) {
-      dasm_put(Dst, 14604, LJ_TNIL);
+      dasm_put(Dst, 14596, LJ_TNIL);
     } else {
-      dasm_put(Dst, 14613, LJ_TNIL);
+      dasm_put(Dst, 14605, LJ_TNIL);
     }
-    dasm_put(Dst, 14620, -FRAME_VARG, FRAME_TYPEP);
+    dasm_put(Dst, 14612, -FRAME_VARG, FRAME_TYPEP);
     if (op != BC_RET0) {
-      dasm_put(Dst, 14644);
+      dasm_put(Dst, 14636);
     }
     dasm_put(Dst, 4683);
     break;
@@ -2161,7 +2160,7 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse)
 
   case BC_FORL:
 #if LJ_HASJIT
-    dasm_put(Dst, 14648, HOTCOUNT_PCMASK, GG_DISP2HOT);
+    dasm_put(Dst, 14640, HOTCOUNT_PCMASK, GG_DISP2HOT);
 #endif
     break;
 
@@ -2173,57 +2172,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, 14669);
+    dasm_put(Dst, 14661);
     if (!vk) {
-      dasm_put(Dst, 14673, LJ_TISNUM, LJ_TISNUM);
+      dasm_put(Dst, 14665, LJ_TISNUM, LJ_TISNUM);
     }
-    dasm_put(Dst, 14692);
+    dasm_put(Dst, 14684);
     if (!vk) {
-      dasm_put(Dst, 14696, LJ_TISNUM);
+      dasm_put(Dst, 14688, LJ_TISNUM);
     }
     if (sse) {
-      dasm_put(Dst, 14705);
+      dasm_put(Dst, 14697);
       if (vk) {
-        dasm_put(Dst, 14717);
+        dasm_put(Dst, 14709);
       } else {
-        dasm_put(Dst, 14736);
+        dasm_put(Dst, 14728);
       }
-      dasm_put(Dst, 14741);
+      dasm_put(Dst, 14733);
     } else {
-      dasm_put(Dst, 14754);
+      dasm_put(Dst, 14746);
       if (vk) {
-        dasm_put(Dst, 14760);
+        dasm_put(Dst, 14752);
       } else {
-        dasm_put(Dst, 14776);
+        dasm_put(Dst, 14768);
       }
-      dasm_put(Dst, 14784);
+      dasm_put(Dst, 14776);
       if (cmov) {
       dasm_put(Dst, 10812);
       } else {
       dasm_put(Dst, 10818);
       }
       if (!cmov) {
-        dasm_put(Dst, 14789);
+        dasm_put(Dst, 14781);
       }
     }
     if (op == BC_FORI) {
-      dasm_put(Dst, 14795, -BCBIAS_J*4);
+      dasm_put(Dst, 14787, -BCBIAS_J*4);
     } else if (op == BC_JFORI) {
-      dasm_put(Dst, 14805, -BCBIAS_J*4, BC_JLOOP);
+      dasm_put(Dst, 14797, -BCBIAS_J*4, BC_JLOOP);
     } else if (op == BC_IFORL) {
-      dasm_put(Dst, 14819, -BCBIAS_J*4);
+      dasm_put(Dst, 14811, -BCBIAS_J*4);
     } else {
-      dasm_put(Dst, 14815, BC_JLOOP);
+      dasm_put(Dst, 14807, BC_JLOOP);
     }
     dasm_put(Dst, 10847);
     if (sse) {
-      dasm_put(Dst, 14829);
+      dasm_put(Dst, 14821);
     }
     break;
 
   case BC_ITERL:
 #if LJ_HASJIT
-    dasm_put(Dst, 14648, HOTCOUNT_PCMASK, GG_DISP2HOT);
+    dasm_put(Dst, 14640, HOTCOUNT_PCMASK, GG_DISP2HOT);
 #endif
     break;
 
@@ -2232,18 +2231,18 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse)
     break;
 #endif
   case BC_IITERL:
-    dasm_put(Dst, 14840, LJ_TNIL);
+    dasm_put(Dst, 14832, LJ_TNIL);
     if (op == BC_JITERL) {
-      dasm_put(Dst, 14855, BC_JLOOP);
+      dasm_put(Dst, 14847, BC_JLOOP);
     } else {
-      dasm_put(Dst, 14869, -BCBIAS_J*4);
+      dasm_put(Dst, 14861, -BCBIAS_J*4);
     }
     dasm_put(Dst, 11144);
     break;
 
   case BC_LOOP:
 #if LJ_HASJIT
-    dasm_put(Dst, 14648, HOTCOUNT_PCMASK, GG_DISP2HOT);
+    dasm_put(Dst, 14640, HOTCOUNT_PCMASK, GG_DISP2HOT);
 #endif
     break;
 
@@ -2253,12 +2252,12 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse)
 
   case BC_JLOOP:
 #if LJ_HASJIT
-    dasm_put(Dst, 14885, DISPATCH_J(trace), DtD(->mcode), DISPATCH_GL(jit_base), DISPATCH_GL(jit_L));
+    dasm_put(Dst, 14877, DISPATCH_J(trace), DtD(->mcode), DISPATCH_GL(jit_base), DISPATCH_GL(jit_L));
 #endif
     break;
 
   case BC_JMP:
-    dasm_put(Dst, 14908, -BCBIAS_J*4);
+    dasm_put(Dst, 14900, -BCBIAS_J*4);
     break;
 
   /* -- Function headers -------------------------------------------------- */
@@ -2272,7 +2271,7 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse)
 
   case BC_FUNCF:
 #if LJ_HASJIT
-    dasm_put(Dst, 14932, HOTCOUNT_PCMASK, GG_DISP2HOT);
+    dasm_put(Dst, 14924, HOTCOUNT_PCMASK, GG_DISP2HOT);
 #endif
   case BC_FUNCV:  /* NYI: compiled vararg functions. */
     break;
@@ -2282,13 +2281,13 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse)
     break;
 #endif
   case BC_IFUNCF:
-    dasm_put(Dst, 14953, -4+PC2PROTO(k), Dt1(->maxstack), -4+PC2PROTO(numparams));
+    dasm_put(Dst, 14945, -4+PC2PROTO(k), Dt1(->maxstack), -4+PC2PROTO(numparams));
     if (op == BC_JFUNCF) {
-      dasm_put(Dst, 14983, BC_JLOOP);
+      dasm_put(Dst, 14975, BC_JLOOP);
     } else {
       dasm_put(Dst, 10849);
     }
-    dasm_put(Dst, 14992, LJ_TNIL);
+    dasm_put(Dst, 14984, LJ_TNIL);
     break;
 
   case BC_JFUNCV:
@@ -2299,30 +2298,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, 15014, FRAME_VARG, Dt1(->maxstack), -4+PC2PROTO(numparams), LJ_TNIL);
+    dasm_put(Dst, 15006, FRAME_VARG, Dt1(->maxstack), -4+PC2PROTO(numparams), LJ_TNIL);
     if (op == BC_JFUNCV) {
-      dasm_put(Dst, 14983, BC_JLOOP);
+      dasm_put(Dst, 14975, BC_JLOOP);
     } else {
-      dasm_put(Dst, 15105, -4+PC2PROTO(k));
+      dasm_put(Dst, 15097, -4+PC2PROTO(k));
     }
-    dasm_put(Dst, 15127, LJ_TNIL);
+    dasm_put(Dst, 15119, LJ_TNIL);
     break;
 
   case BC_FUNCC:
   case BC_FUNCCW:
-    dasm_put(Dst, 15149, Dt8(->f), Dt1(->base), 8*LUA_MINSTACK, Dt1(->maxstack), Dt1(->top));
+    dasm_put(Dst, 15141, Dt8(->f), Dt1(->base), 8*LUA_MINSTACK, Dt1(->maxstack), Dt1(->top));
     if (op == BC_FUNCC) {
-      dasm_put(Dst, 15178);
+      dasm_put(Dst, 15170);
     } else {
-      dasm_put(Dst, 15182);
+      dasm_put(Dst, 15174);
     }
-    dasm_put(Dst, 15190, DISPATCH_GL(vmstate), ~LJ_VMST_C);
+    dasm_put(Dst, 15182, DISPATCH_GL(vmstate), ~LJ_VMST_C);
     if (op == BC_FUNCC) {
-      dasm_put(Dst, 15199);
+      dasm_put(Dst, 15191);
     } else {
-      dasm_put(Dst, 15203, DISPATCH_GL(wrapf));
+      dasm_put(Dst, 15195, DISPATCH_GL(wrapf));
     }
-    dasm_put(Dst, 15208, DISPATCH_GL(vmstate), ~LJ_VMST_INTERP, Dt1(->base), Dt1(->top));
+    dasm_put(Dst, 15200, DISPATCH_GL(vmstate), ~LJ_VMST_INTERP, Dt1(->base), Dt1(->top));
     break;
 
   /* ---------------------------------------------------------------------- */
@@ -2350,7 +2349,7 @@ static int build_backend(BuildCtx *ctx)
 
   build_subroutines(ctx, cmov, sse);
 
-  dasm_put(Dst, 15233);
+  dasm_put(Dst, 15225);
   for (op = 0; op < BC__MAX; op++)
     build_ins(ctx, (BCOp)op, op, cmov, sse);