1 files changed, 397 insertions, 393 deletions

diff --git a/src/buildvm_x64win.h b/src/buildvm_x64win.h
index 093b5fa0..742cf19b 100644
--- a/src/buildvm_x64win.h
+++ b/src/buildvm_x64win.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[13494] = {
+static const unsigned char build_actionlist[13490] = {
   254,1,248,10,252,247,198,237,15,132,244,11,131,230,252,248,41,252,242,72,
   141,76,49,252,248,139,114,252,252,199,68,10,4,237,248,12,131,192,1,137,68,
   36,84,252,247,198,237,15,132,244,13,248,14,252,247,198,237,15,132,244,10,
@@ -359,106 +359,106 @@ static const unsigned char build_actionlist[13494] = {
   235,15,132,244,251,248,1,255,139,108,36,96,137,149,233,137,252,242,137,252,
   233,232,251,1,20,248,3,139,149,233,248,4,15,182,78,252,253,248,5,15,182,110,
   252,252,15,183,70,252,254,252,255,164,253,252,235,233,248,139,131,198,4,139,
-  77,232,137,76,36,84,252,233,244,4,248,140,255,204,255,248,141,255,72,199,
-  131,233,0,0,0,0,252,233,244,247,255,248,142,255,72,137,171,233,248,1,255,
-  141,68,194,252,248,139,108,36,96,137,149,233,137,133,233,137,252,242,137,
-  252,233,137,116,36,100,232,251,1,21,199,68,36,100,0,0,0,0,139,149,233,72,
-  137,193,139,133,233,41,208,72,137,205,15,182,78,252,253,193,232,3,131,192,
-  1,252,255,229,248,143,255,248,144,255,139,122,252,248,139,191,233,139,191,
-  233,199,131,233,0,0,0,0,199,131,233,237,139,6,15,182,204,15,182,232,131,198,
-  4,193,232,16,252,255,36,252,235,255,248,82,255,217,124,36,4,137,68,36,8,102,
-  184,0,4,102,11,68,36,4,102,37,252,255,252,247,102,137,68,36,6,217,108,36,
-  6,217,252,252,217,108,36,4,139,68,36,8,195,255,248,145,72,184,237,237,102,
-  72,15,110,208,72,184,237,237,102,72,15,110,216,15,40,200,102,15,84,202,102,
-  15,46,217,15,134,244,247,102,15,85,208,252,242,15,88,203,252,242,15,92,203,
-  102,15,86,202,72,184,237,237,102,72,15,110,208,252,242,15,194,193,1,102,15,
-  84,194,252,242,15,92,200,15,40,193,248,1,195,248,84,255,217,124,36,4,137,
-  68,36,8,102,184,0,8,102,11,68,36,4,102,37,252,255,252,251,102,137,68,36,6,
-  217,108,36,6,217,252,252,217,108,36,4,139,68,36,8,195,255,248,146,72,184,
-  237,237,102,72,15,110,208,72,184,237,237,102,72,15,110,216,15,40,200,102,
-  15,84,202,102,15,46,217,15,134,244,247,102,15,85,208,252,242,15,88,203,252,
-  242,15,92,203,102,15,86,202,72,184,237,237,102,72,15,110,208,252,242,15,194,
-  193,6,102,15,84,194,252,242,15,92,200,15,40,193,248,1,195,248,104,255,217,
-  124,36,4,137,68,36,8,102,184,0,12,102,11,68,36,4,102,137,68,36,6,217,108,
-  36,6,217,252,252,217,108,36,4,139,68,36,8,195,255,248,147,72,184,237,237,
-  102,72,15,110,208,72,184,237,237,102,72,15,110,216,15,40,200,102,15,84,202,
-  102,15,46,217,15,134,244,247,102,15,85,208,15,40,193,252,242,15,88,203,252,
-  242,15,92,203,72,184,237,237,102,72,15,110,216,252,242,15,194,193,1,102,15,
-  84,195,252,242,15,92,200,102,15,86,202,15,40,193,248,1,195,248,148,255,15,
-  40,232,252,242,15,94,193,72,184,237,237,102,72,15,110,208,72,184,237,237,
-  102,72,15,110,216,15,40,224,102,15,84,226,102,15,46,220,15,134,244,247,102,
-  15,85,208,252,242,15,88,227,252,242,15,92,227,102,15,86,226,72,184,237,237,
-  102,72,15,110,208,252,242,15,194,196,1,102,15,84,194,252,242,15,92,224,15,
-  40,197,252,242,15,89,204,252,242,15,92,193,195,248,1,252,242,15,89,200,15,
-  40,197,252,242,15,92,193,195,255,217,193,216,252,241,217,124,36,4,102,184,
-  0,4,102,11,68,36,4,102,37,252,255,252,247,102,137,68,36,6,217,108,36,6,217,
-  252,252,217,108,36,4,222,201,222,252,233,195,255,248,88,217,252,234,222,201,
-  248,149,217,84,36,8,129,124,36,8,0,0,128,127,15,132,244,247,129,124,36,8,
-  0,0,128,252,255,15,132,244,248,248,150,217,192,217,252,252,220,252,233,217,
-  201,217,252,240,217,232,222,193,217,252,253,221,217,248,1,195,248,2,221,216,
-  217,252,238,195,255,248,107,255,248,151,252,242,15,45,193,252,242,15,42,208,
-  102,15,46,202,15,133,244,254,15,138,244,255,248,152,131,252,248,1,15,142,
-  244,252,248,1,169,1,0,0,0,15,133,244,248,252,242,15,89,192,209,232,252,233,
-  244,1,248,2,209,232,15,132,244,251,15,40,200,248,3,252,242,15,89,192,209,
-  232,15,132,244,250,15,131,244,3,255,252,242,15,89,200,252,233,244,3,248,4,
-  252,242,15,89,193,248,5,195,248,6,15,132,244,5,15,130,244,253,80,72,184,237,
-  237,102,72,15,110,200,252,242,15,94,200,88,15,40,193,252,247,216,131,252,
-  248,1,15,132,244,5,252,233,244,1,248,7,72,184,237,237,102,72,15,110,192,195,
-  248,8,102,72,15,126,200,72,209,224,72,193,192,12,72,61,252,254,15,0,0,15,
-  132,244,248,255,102,72,15,126,192,72,209,224,15,132,244,250,72,193,192,12,
-  72,61,252,254,15,0,0,15,132,244,251,252,242,15,17,76,36,16,252,242,15,17,
-  68,36,8,221,68,36,16,221,68,36,8,217,252,241,217,192,217,252,252,220,252,
-  233,217,201,217,252,240,217,232,222,193,217,252,253,221,217,221,92,36,8,252,
-  242,15,16,68,36,8,195,248,9,72,184,237,237,102,72,15,110,208,102,15,46,194,
-  15,132,244,247,15,40,193,248,1,195,248,2,72,184,237,237,102,72,15,110,208,
-  102,15,84,194,72,184,237,237,102,72,15,110,208,102,15,46,194,15,132,244,1,
-  102,15,80,193,15,87,192,136,196,15,146,208,48,224,15,133,244,1,248,3,72,184,
-  237,237,255,102,72,15,110,192,195,248,4,102,15,80,193,133,192,15,133,244,
-  3,15,87,192,195,248,5,102,15,80,193,133,192,15,132,244,3,15,87,192,195,248,
-  153,255,131,252,250,1,15,130,244,82,15,132,244,84,131,252,250,3,15,130,244,
-  104,15,135,244,248,252,242,15,81,192,195,248,2,252,242,15,17,68,36,8,221,
-  68,36,8,131,252,250,5,15,135,244,248,88,15,132,244,247,232,244,88,80,252,
-  233,244,253,248,1,232,244,149,255,80,252,233,244,253,248,2,131,252,250,7,
-  15,132,244,247,15,135,244,248,217,252,237,217,201,217,252,241,252,233,244,
-  253,248,1,217,232,217,201,217,252,241,252,233,244,253,248,2,131,252,250,9,
-  15,132,244,247,15,135,244,248,217,252,236,217,201,217,252,241,252,233,244,
-  253,248,1,255,217,252,254,252,233,244,253,248,2,131,252,250,11,15,132,244,
-  247,15,135,244,255,217,252,255,252,233,244,253,248,1,217,252,242,221,216,
-  248,7,221,92,36,8,252,242,15,16,68,36,8,195,255,139,84,36,12,221,68,36,4,
+  77,232,137,76,36,84,252,233,244,4,248,140,255,204,255,248,141,137,116,36,
+  100,255,248,142,255,137,116,36,100,131,206,1,248,1,255,141,68,194,252,248,
+  139,108,36,96,137,149,233,137,133,233,137,252,242,137,252,233,232,251,1,21,
+  199,68,36,100,0,0,0,0,255,131,230,252,254,255,139,149,233,72,137,193,139,
+  133,233,41,208,72,137,205,15,182,78,252,253,193,232,3,131,192,1,252,255,229,
+  248,143,255,248,144,255,139,122,252,248,139,191,233,139,191,233,199,131,233,
+  0,0,0,0,199,131,233,237,139,6,15,182,204,15,182,232,131,198,4,193,232,16,
+  252,255,36,252,235,255,248,82,255,217,124,36,4,137,68,36,8,102,184,0,4,102,
+  11,68,36,4,102,37,252,255,252,247,102,137,68,36,6,217,108,36,6,217,252,252,
+  217,108,36,4,139,68,36,8,195,255,248,145,72,184,237,237,102,72,15,110,208,
+  72,184,237,237,102,72,15,110,216,15,40,200,102,15,84,202,102,15,46,217,15,
+  134,244,247,102,15,85,208,252,242,15,88,203,252,242,15,92,203,102,15,86,202,
+  72,184,237,237,102,72,15,110,208,252,242,15,194,193,1,102,15,84,194,252,242,
+  15,92,200,15,40,193,248,1,195,248,84,255,217,124,36,4,137,68,36,8,102,184,
+  0,8,102,11,68,36,4,102,37,252,255,252,251,102,137,68,36,6,217,108,36,6,217,
+  252,252,217,108,36,4,139,68,36,8,195,255,248,146,72,184,237,237,102,72,15,
+  110,208,72,184,237,237,102,72,15,110,216,15,40,200,102,15,84,202,102,15,46,
+  217,15,134,244,247,102,15,85,208,252,242,15,88,203,252,242,15,92,203,102,
+  15,86,202,72,184,237,237,102,72,15,110,208,252,242,15,194,193,6,102,15,84,
+  194,252,242,15,92,200,15,40,193,248,1,195,248,104,255,217,124,36,4,137,68,
+  36,8,102,184,0,12,102,11,68,36,4,102,137,68,36,6,217,108,36,6,217,252,252,
+  217,108,36,4,139,68,36,8,195,255,248,147,72,184,237,237,102,72,15,110,208,
+  72,184,237,237,102,72,15,110,216,15,40,200,102,15,84,202,102,15,46,217,15,
+  134,244,247,102,15,85,208,15,40,193,252,242,15,88,203,252,242,15,92,203,72,
+  184,237,237,102,72,15,110,216,252,242,15,194,193,1,102,15,84,195,252,242,
+  15,92,200,102,15,86,202,15,40,193,248,1,195,248,148,255,15,40,232,252,242,
+  15,94,193,72,184,237,237,102,72,15,110,208,72,184,237,237,102,72,15,110,216,
+  15,40,224,102,15,84,226,102,15,46,220,15,134,244,247,102,15,85,208,252,242,
+  15,88,227,252,242,15,92,227,102,15,86,226,72,184,237,237,102,72,15,110,208,
+  252,242,15,194,196,1,102,15,84,194,252,242,15,92,224,15,40,197,252,242,15,
+  89,204,252,242,15,92,193,195,248,1,252,242,15,89,200,15,40,197,252,242,15,
+  92,193,195,255,217,193,216,252,241,217,124,36,4,102,184,0,4,102,11,68,36,
+  4,102,37,252,255,252,247,102,137,68,36,6,217,108,36,6,217,252,252,217,108,
+  36,4,222,201,222,252,233,195,255,248,88,217,252,234,222,201,248,149,217,84,
+  36,8,129,124,36,8,0,0,128,127,15,132,244,247,129,124,36,8,0,0,128,252,255,
+  15,132,244,248,248,150,217,192,217,252,252,220,252,233,217,201,217,252,240,
+  217,232,222,193,217,252,253,221,217,248,1,195,248,2,221,216,217,252,238,195,
+  255,248,107,255,248,151,252,242,15,45,193,252,242,15,42,208,102,15,46,202,
+  15,133,244,254,15,138,244,255,248,152,131,252,248,1,15,142,244,252,248,1,
+  169,1,0,0,0,15,133,244,248,252,242,15,89,192,209,232,252,233,244,1,248,2,
+  209,232,15,132,244,251,15,40,200,248,3,252,242,15,89,192,209,232,15,132,244,
+  250,15,131,244,3,255,252,242,15,89,200,252,233,244,3,248,4,252,242,15,89,
+  193,248,5,195,248,6,15,132,244,5,15,130,244,253,80,72,184,237,237,102,72,
+  15,110,200,252,242,15,94,200,88,15,40,193,252,247,216,131,252,248,1,15,132,
+  244,5,252,233,244,1,248,7,72,184,237,237,102,72,15,110,192,195,248,8,102,
+  72,15,126,200,72,209,224,72,193,192,12,72,61,252,254,15,0,0,15,132,244,248,
+  255,102,72,15,126,192,72,209,224,15,132,244,250,72,193,192,12,72,61,252,254,
+  15,0,0,15,132,244,251,252,242,15,17,76,36,16,252,242,15,17,68,36,8,221,68,
+  36,16,221,68,36,8,217,252,241,217,192,217,252,252,220,252,233,217,201,217,
+  252,240,217,232,222,193,217,252,253,221,217,221,92,36,8,252,242,15,16,68,
+  36,8,195,248,9,72,184,237,237,102,72,15,110,208,102,15,46,194,15,132,244,
+  247,15,40,193,248,1,195,248,2,72,184,237,237,102,72,15,110,208,102,15,84,
+  194,72,184,237,237,102,72,15,110,208,102,15,46,194,15,132,244,1,102,15,80,
+  193,15,87,192,136,196,15,146,208,48,224,15,133,244,1,248,3,72,184,237,237,
+  255,102,72,15,110,192,195,248,4,102,15,80,193,133,192,15,133,244,3,15,87,
+  192,195,248,5,102,15,80,193,133,192,15,132,244,3,15,87,192,195,248,153,255,
   131,252,250,1,15,130,244,82,15,132,244,84,131,252,250,3,15,130,244,104,15,
-  135,244,248,217,252,250,195,248,2,131,252,250,5,15,130,244,88,15,132,244,
-  149,131,252,250,7,15,132,244,247,15,135,244,248,217,252,237,217,201,217,252,
-  241,195,248,1,217,232,217,201,217,252,241,195,248,2,131,252,250,9,15,132,
-  244,247,255,15,135,244,248,217,252,236,217,201,217,252,241,195,248,1,217,
-  252,254,195,248,2,131,252,250,11,15,132,244,247,15,135,244,255,217,252,255,
-  195,248,1,217,252,242,221,216,195,255,248,9,204,248,154,255,65,131,252,248,
-  1,15,132,244,247,15,135,244,248,252,242,15,88,193,195,248,1,252,242,15,92,
-  193,195,248,2,65,131,252,248,3,15,132,244,247,15,135,244,248,252,242,15,89,
-  193,195,248,1,252,242,15,94,193,195,248,2,65,131,252,248,5,15,130,244,148,
-  15,132,244,107,65,131,252,248,7,15,132,244,247,15,135,244,248,72,184,237,
-  237,255,102,72,15,110,200,15,87,193,195,248,1,72,184,237,237,102,72,15,110,
-  200,15,84,193,195,248,2,65,131,252,248,9,15,135,244,248,252,242,15,17,68,
-  36,8,252,242,15,17,76,36,16,221,68,36,8,221,68,36,16,15,132,244,247,217,252,
-  243,248,7,221,92,36,8,252,242,15,16,68,36,8,195,248,1,217,201,217,252,253,
-  221,217,252,233,244,7,248,2,65,131,252,248,11,15,132,244,247,15,135,244,255,
-  252,242,15,93,193,195,248,1,252,242,15,95,193,195,248,9,204,255,139,68,36,
-  20,221,68,36,4,221,68,36,12,131,252,248,1,15,132,244,247,15,135,244,248,222,
-  193,195,248,1,222,252,233,195,248,2,131,252,248,3,15,132,244,247,15,135,244,
-  248,222,201,195,248,1,222,252,249,195,248,2,131,252,248,5,15,130,244,148,
-  15,132,244,107,131,252,248,7,15,132,244,247,15,135,244,248,255,221,216,217,
-  224,195,248,1,221,216,217,225,195,248,2,131,252,248,9,15,132,244,247,15,135,
-  244,248,217,252,243,195,248,1,217,201,217,252,253,221,217,195,248,2,131,252,
-  248,11,15,132,244,247,15,135,244,255,255,219,252,233,219,209,221,217,195,
-  248,1,219,252,233,218,209,221,217,195,255,221,225,223,224,252,246,196,1,15,
-  132,244,248,217,201,248,2,221,216,195,248,1,221,225,223,224,252,246,196,1,
-  15,133,244,248,217,201,248,2,221,216,195,255,248,155,137,200,86,72,137,214,
-  83,15,162,137,6,137,94,4,137,78,8,137,86,12,91,94,195,255,249,255,129,124,
-  253,202,4,239,15,135,244,41,129,124,253,194,4,239,15,135,244,41,255,252,242,
-  15,16,4,194,131,198,4,102,15,46,4,202,255,221,4,202,221,4,194,131,198,4,255,
-  223,252,233,221,216,255,218,252,233,223,224,158,255,15,134,244,248,255,15,
-  131,244,248,255,248,1,15,183,70,252,254,141,180,253,134,233,248,2,139,6,15,
-  182,204,15,182,232,131,198,4,193,232,16,252,255,36,252,235,255,139,108,194,
-  4,131,198,4,129,252,253,239,15,135,244,251,129,124,253,202,4,239,15,135,244,
+  135,244,248,252,242,15,81,192,195,248,2,252,242,15,17,68,36,8,221,68,36,8,
+  131,252,250,5,15,135,244,248,88,15,132,244,247,232,244,88,80,252,233,244,
+  253,248,1,232,244,149,255,80,252,233,244,253,248,2,131,252,250,7,15,132,244,
+  247,15,135,244,248,217,252,237,217,201,217,252,241,252,233,244,253,248,1,
+  217,232,217,201,217,252,241,252,233,244,253,248,2,131,252,250,9,15,132,244,
+  247,15,135,244,248,217,252,236,217,201,217,252,241,252,233,244,253,248,1,
+  255,217,252,254,252,233,244,253,248,2,131,252,250,11,15,132,244,247,15,135,
+  244,255,217,252,255,252,233,244,253,248,1,217,252,242,221,216,248,7,221,92,
+  36,8,252,242,15,16,68,36,8,195,255,139,84,36,12,221,68,36,4,131,252,250,1,
+  15,130,244,82,15,132,244,84,131,252,250,3,15,130,244,104,15,135,244,248,217,
+  252,250,195,248,2,131,252,250,5,15,130,244,88,15,132,244,149,131,252,250,
+  7,15,132,244,247,15,135,244,248,217,252,237,217,201,217,252,241,195,248,1,
+  217,232,217,201,217,252,241,195,248,2,131,252,250,9,15,132,244,247,255,15,
+  135,244,248,217,252,236,217,201,217,252,241,195,248,1,217,252,254,195,248,
+  2,131,252,250,11,15,132,244,247,15,135,244,255,217,252,255,195,248,1,217,
+  252,242,221,216,195,255,248,9,204,248,154,255,65,131,252,248,1,15,132,244,
+  247,15,135,244,248,252,242,15,88,193,195,248,1,252,242,15,92,193,195,248,
+  2,65,131,252,248,3,15,132,244,247,15,135,244,248,252,242,15,89,193,195,248,
+  1,252,242,15,94,193,195,248,2,65,131,252,248,5,15,130,244,148,15,132,244,
+  107,65,131,252,248,7,15,132,244,247,15,135,244,248,72,184,237,237,255,102,
+  72,15,110,200,15,87,193,195,248,1,72,184,237,237,102,72,15,110,200,15,84,
+  193,195,248,2,65,131,252,248,9,15,135,244,248,252,242,15,17,68,36,8,252,242,
+  15,17,76,36,16,221,68,36,8,221,68,36,16,15,132,244,247,217,252,243,248,7,
+  221,92,36,8,252,242,15,16,68,36,8,195,248,1,217,201,217,252,253,221,217,252,
+  233,244,7,248,2,65,131,252,248,11,15,132,244,247,15,135,244,255,252,242,15,
+  93,193,195,248,1,252,242,15,95,193,195,248,9,204,255,139,68,36,20,221,68,
+  36,4,221,68,36,12,131,252,248,1,15,132,244,247,15,135,244,248,222,193,195,
+  248,1,222,252,233,195,248,2,131,252,248,3,15,132,244,247,15,135,244,248,222,
+  201,195,248,1,222,252,249,195,248,2,131,252,248,5,15,130,244,148,15,132,244,
+  107,131,252,248,7,15,132,244,247,15,135,244,248,255,221,216,217,224,195,248,
+  1,221,216,217,225,195,248,2,131,252,248,9,15,132,244,247,15,135,244,248,217,
+  252,243,195,248,1,217,201,217,252,253,221,217,195,248,2,131,252,248,11,15,
+  132,244,247,15,135,244,255,255,219,252,233,219,209,221,217,195,248,1,219,
+  252,233,218,209,221,217,195,255,221,225,223,224,252,246,196,1,15,132,244,
+  248,217,201,248,2,221,216,195,248,1,221,225,223,224,252,246,196,1,15,133,
+  244,248,217,201,248,2,221,216,195,255,248,155,137,200,86,72,137,214,83,15,
+  162,137,6,137,94,4,137,78,8,137,86,12,91,94,195,255,249,255,129,124,253,202,
+  4,239,15,135,244,41,129,124,253,194,4,239,15,135,244,41,255,252,242,15,16,
+  4,194,131,198,4,102,15,46,4,202,255,221,4,202,221,4,194,131,198,4,255,223,
+  252,233,221,216,255,218,252,233,223,224,158,255,15,134,244,248,255,15,131,
+  244,248,255,248,1,15,183,70,252,254,141,180,253,134,233,248,2,139,6,15,182,
+  204,15,182,232,131,198,4,193,232,16,252,255,36,252,235,255,139,108,194,4,
+  131,198,4,129,252,253,239,15,135,244,251,129,124,253,202,4,239,15,135,244,
   251,255,252,242,15,16,4,194,102,15,46,4,202,255,221,4,202,221,4,194,255,15,
   138,244,248,15,133,244,248,255,15,138,244,248,15,132,244,247,255,248,1,15,
   183,70,252,254,141,180,253,134,233,248,2,255,248,2,15,183,70,252,254,141,
@@ -1325,77 +1325,81 @@ static void build_subroutines(BuildCtx *ctx, int cmov, int sse)
 #endif
   dasm_put(Dst, 7119);
 #if LJ_HASJIT
-  dasm_put(Dst, 7122, DISPATCH_J(L));
+  dasm_put(Dst, 6994);
 #endif
-  dasm_put(Dst, 7135);
+  dasm_put(Dst, 7126);
 #if LJ_HASJIT
-  dasm_put(Dst, 7138, DISPATCH_J(L));
+  dasm_put(Dst, 7129);
 #endif
-  dasm_put(Dst, 7145, Dt1(->base), Dt1(->top), Dt1(->base), Dt1(->top));
+  dasm_put(Dst, 7139, Dt1(->base), Dt1(->top));
+#if LJ_HASJIT
+  dasm_put(Dst, 7173);
+#endif
+  dasm_put(Dst, 7178, Dt1(->base), Dt1(->top));
 #if LJ_HASJIT
   dasm_put(Dst, 7117);
 #endif
-  dasm_put(Dst, 7213);
+  dasm_put(Dst, 7209);
 #if LJ_HASJIT
-  dasm_put(Dst, 7216, Dt7(->pc), PC2PROTO(k), DISPATCH_GL(jit_L), DISPATCH_GL(vmstate), ~LJ_VMST_INTERP);
+  dasm_put(Dst, 7212, Dt7(->pc), PC2PROTO(k), DISPATCH_GL(jit_L), DISPATCH_GL(vmstate), ~LJ_VMST_INTERP);
 #endif
-  dasm_put(Dst, 7257);
+  dasm_put(Dst, 7253);
   if (!sse) {
-  dasm_put(Dst, 7260);
+  dasm_put(Dst, 7256);
   }
-  dasm_put(Dst, 7305, (unsigned int)(U64x(7fffffff,ffffffff)), (unsigned int)((U64x(7fffffff,ffffffff))>>32), (unsigned int)(U64x(43300000,00000000)), (unsigned int)((U64x(43300000,00000000))>>32), (unsigned int)(U64x(3ff00000,00000000)), (unsigned int)((U64x(3ff00000,00000000))>>32));
+  dasm_put(Dst, 7301, (unsigned int)(U64x(7fffffff,ffffffff)), (unsigned int)((U64x(7fffffff,ffffffff))>>32), (unsigned int)(U64x(43300000,00000000)), (unsigned int)((U64x(43300000,00000000))>>32), (unsigned int)(U64x(3ff00000,00000000)), (unsigned int)((U64x(3ff00000,00000000))>>32));
   if (!sse) {
-  dasm_put(Dst, 7391);
+  dasm_put(Dst, 7387);
   }
-  dasm_put(Dst, 7436, (unsigned int)(U64x(7fffffff,ffffffff)), (unsigned int)((U64x(7fffffff,ffffffff))>>32), (unsigned int)(U64x(43300000,00000000)), (unsigned int)((U64x(43300000,00000000))>>32), (unsigned int)(U64x(bff00000,00000000)), (unsigned int)((U64x(bff00000,00000000))>>32));
+  dasm_put(Dst, 7432, (unsigned int)(U64x(7fffffff,ffffffff)), (unsigned int)((U64x(7fffffff,ffffffff))>>32), (unsigned int)(U64x(43300000,00000000)), (unsigned int)((U64x(43300000,00000000))>>32), (unsigned int)(U64x(bff00000,00000000)), (unsigned int)((U64x(bff00000,00000000))>>32));
   if (!sse) {
-  dasm_put(Dst, 7522);
+  dasm_put(Dst, 7518);
   }
-  dasm_put(Dst, 7561, (unsigned int)(U64x(7fffffff,ffffffff)), (unsigned int)((U64x(7fffffff,ffffffff))>>32), (unsigned int)(U64x(43300000,00000000)), (unsigned int)((U64x(43300000,00000000))>>32), (unsigned int)(U64x(3ff00000,00000000)), (unsigned int)((U64x(3ff00000,00000000))>>32));
+  dasm_put(Dst, 7557, (unsigned int)(U64x(7fffffff,ffffffff)), (unsigned int)((U64x(7fffffff,ffffffff))>>32), (unsigned int)(U64x(43300000,00000000)), (unsigned int)((U64x(43300000,00000000))>>32), (unsigned int)(U64x(3ff00000,00000000)), (unsigned int)((U64x(3ff00000,00000000))>>32));
   if (sse) {
-    dasm_put(Dst, 7650, (unsigned int)(U64x(7fffffff,ffffffff)), (unsigned int)((U64x(7fffffff,ffffffff))>>32), (unsigned int)(U64x(43300000,00000000)), (unsigned int)((U64x(43300000,00000000))>>32), (unsigned int)(U64x(3ff00000,00000000)), (unsigned int)((U64x(3ff00000,00000000))>>32));
+    dasm_put(Dst, 7646, (unsigned int)(U64x(7fffffff,ffffffff)), (unsigned int)((U64x(7fffffff,ffffffff))>>32), (unsigned int)(U64x(43300000,00000000)), (unsigned int)((U64x(43300000,00000000))>>32), (unsigned int)(U64x(3ff00000,00000000)), (unsigned int)((U64x(3ff00000,00000000))>>32));
   } else {
-    dasm_put(Dst, 7764);
+    dasm_put(Dst, 7760);
   }
-  dasm_put(Dst, 7811);
+  dasm_put(Dst, 7807);
   if (!sse) {
   } else {
-    dasm_put(Dst, 7885);
+    dasm_put(Dst, 7881);
   }
-  dasm_put(Dst, 7888);
-  dasm_put(Dst, 7973, (unsigned int)(U64x(3ff00000,00000000)), (unsigned int)((U64x(3ff00000,00000000))>>32), (unsigned int)(U64x(3ff00000,00000000)), (unsigned int)((U64x(3ff00000,00000000))>>32));
-  dasm_put(Dst, 8074, (unsigned int)(U64x(3ff00000,00000000)), (unsigned int)((U64x(3ff00000,00000000))>>32), (unsigned int)(U64x(7fffffff,ffffffff)), (unsigned int)((U64x(7fffffff,ffffffff))>>32), (unsigned int)(U64x(3ff00000,00000000)), (unsigned int)((U64x(3ff00000,00000000))>>32), (unsigned int)(U64x(7ff00000,00000000)), (unsigned int)((U64x(7ff00000,00000000))>>32));
-  dasm_put(Dst, 8242);
+  dasm_put(Dst, 7884);
+  dasm_put(Dst, 7969, (unsigned int)(U64x(3ff00000,00000000)), (unsigned int)((U64x(3ff00000,00000000))>>32), (unsigned int)(U64x(3ff00000,00000000)), (unsigned int)((U64x(3ff00000,00000000))>>32));
+  dasm_put(Dst, 8070, (unsigned int)(U64x(3ff00000,00000000)), (unsigned int)((U64x(3ff00000,00000000))>>32), (unsigned int)(U64x(7fffffff,ffffffff)), (unsigned int)((U64x(7fffffff,ffffffff))>>32), (unsigned int)(U64x(3ff00000,00000000)), (unsigned int)((U64x(3ff00000,00000000))>>32), (unsigned int)(U64x(7ff00000,00000000)), (unsigned int)((U64x(7ff00000,00000000))>>32));
+  dasm_put(Dst, 8238);
   if (sse) {
-    dasm_put(Dst, 8283);
-    dasm_put(Dst, 8353);
-    dasm_put(Dst, 8426);
+    dasm_put(Dst, 8279);
+    dasm_put(Dst, 8349);
+    dasm_put(Dst, 8422);
   } else {
-    dasm_put(Dst, 8476);
-    dasm_put(Dst, 8568);
+    dasm_put(Dst, 8472);
+    dasm_put(Dst, 8564);
   }
-  dasm_put(Dst, 8614);
+  dasm_put(Dst, 8610);
   if (sse) {
-    dasm_put(Dst, 8620, (unsigned int)(U64x(80000000,00000000)), (unsigned int)((U64x(80000000,00000000))>>32));
-    dasm_put(Dst, 8709, (unsigned int)(U64x(7fffffff,ffffffff)), (unsigned int)((U64x(7fffffff,ffffffff))>>32));
+    dasm_put(Dst, 8616, (unsigned int)(U64x(80000000,00000000)), (unsigned int)((U64x(80000000,00000000))>>32));
+    dasm_put(Dst, 8705, (unsigned int)(U64x(7fffffff,ffffffff)), (unsigned int)((U64x(7fffffff,ffffffff))>>32));
   } else {
-    dasm_put(Dst, 8833);
-    dasm_put(Dst, 8916);
+    dasm_put(Dst, 8829);
+    dasm_put(Dst, 8912);
     if (cmov) {
-    dasm_put(Dst, 8971);
+    dasm_put(Dst, 8967);
     } else {
-    dasm_put(Dst, 8990);
+    dasm_put(Dst, 8986);
     }
-    dasm_put(Dst, 8829);
+    dasm_put(Dst, 8825);
   }
-  dasm_put(Dst, 9031);
+  dasm_put(Dst, 9027);
 }
 
 /* Generate the code for a single instruction. */
 static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse)
 {
   int vk = 0;
-  dasm_put(Dst, 9057, defop);
+  dasm_put(Dst, 9053, defop);
 
   switch (op) {
 
@@ -1404,600 +1408,600 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse)
   /* Remember: all ops branch for a true comparison, fall through otherwise. */
 
   case BC_ISLT: case BC_ISGE: case BC_ISLE: case BC_ISGT:
-    dasm_put(Dst, 9059, LJ_TISNUM, LJ_TISNUM);
+    dasm_put(Dst, 9055, LJ_TISNUM, LJ_TISNUM);
     if (sse) {
-      dasm_put(Dst, 9080);
+      dasm_put(Dst, 9076);
     } else {
-      dasm_put(Dst, 9095);
+      dasm_put(Dst, 9091);
       if (cmov) {
-      dasm_put(Dst, 9105);
+      dasm_put(Dst, 9101);
       } else {
-      dasm_put(Dst, 9111);
+      dasm_put(Dst, 9107);
       }
     }
     switch (op) {
     case BC_ISLT:
-      dasm_put(Dst, 9118);
+      dasm_put(Dst, 9114);
       break;
     case BC_ISGE:
-      dasm_put(Dst, 8911);
+      dasm_put(Dst, 8907);
       break;
     case BC_ISLE:
       dasm_put(Dst, 5872);
       break;
     case BC_ISGT:
-      dasm_put(Dst, 9123);
+      dasm_put(Dst, 9119);
       break;
     default: break;  /* Shut up GCC. */
     }
-    dasm_put(Dst, 9128, -BCBIAS_J*4);
+    dasm_put(Dst, 9124, -BCBIAS_J*4);
     break;
 
   case BC_ISEQV: case BC_ISNEV:
     vk = op == BC_ISEQV;
-    dasm_put(Dst, 9162, LJ_TISNUM, LJ_TISNUM);
+    dasm_put(Dst, 9158, LJ_TISNUM, LJ_TISNUM);
     if (sse) {
-      dasm_put(Dst, 9188);
+      dasm_put(Dst, 9184);
     } else {
-      dasm_put(Dst, 9200);
+      dasm_put(Dst, 9196);
       if (cmov) {
-      dasm_put(Dst, 9105);
+      dasm_put(Dst, 9101);
       } else {
-      dasm_put(Dst, 9111);
+      dasm_put(Dst, 9107);
       }
     }
   iseqne_fp:
     if (vk) {
-      dasm_put(Dst, 9207);
+      dasm_put(Dst, 9203);
     } else {
-      dasm_put(Dst, 9216);
+      dasm_put(Dst, 9212);
     }
   iseqne_end:
     if (vk) {
-      dasm_put(Dst, 9225, -BCBIAS_J*4);
+      dasm_put(Dst, 9221, -BCBIAS_J*4);
     } else {
-      dasm_put(Dst, 9240, -BCBIAS_J*4);
+      dasm_put(Dst, 9236, -BCBIAS_J*4);
     }
-    dasm_put(Dst, 7237);
+    dasm_put(Dst, 7233);
     if (op == BC_ISEQV || op == BC_ISNEV) {
-      dasm_put(Dst, 9255, LJ_TISPRI, LJ_TISTABUD, Dt6(->metatable), Dt6(->nomm), 1<<MM_eq);
+      dasm_put(Dst, 9251, LJ_TISPRI, LJ_TISTABUD, Dt6(->metatable), Dt6(->nomm), 1<<MM_eq);
       if (vk) {
-        dasm_put(Dst, 9313);
+        dasm_put(Dst, 9309);
       } else {
-        dasm_put(Dst, 9317);
+        dasm_put(Dst, 9313);
       }
-      dasm_put(Dst, 9323);
+      dasm_put(Dst, 9319);
     }
     break;
   case BC_ISEQS: case BC_ISNES:
     vk = op == BC_ISEQS;
-    dasm_put(Dst, 9328, LJ_TSTR);
+    dasm_put(Dst, 9324, LJ_TSTR);
   iseqne_test:
     if (vk) {
-      dasm_put(Dst, 9211);
+      dasm_put(Dst, 9207);
     } else {
       dasm_put(Dst, 2774);
     }
     goto iseqne_end;
   case BC_ISEQN: case BC_ISNEN:
     vk = op == BC_ISEQN;
-    dasm_put(Dst, 9352, LJ_TISNUM);
+    dasm_put(Dst, 9348, LJ_TISNUM);
     if (sse) {
-      dasm_put(Dst, 9366);
+      dasm_put(Dst, 9362);
     } else {
-      dasm_put(Dst, 9378);
+      dasm_put(Dst, 9374);
       if (cmov) {
-      dasm_put(Dst, 9105);
+      dasm_put(Dst, 9101);
       } else {
-      dasm_put(Dst, 9111);
+      dasm_put(Dst, 9107);
       }
     }
     goto iseqne_fp;
   case BC_ISEQP: case BC_ISNEP:
     vk = op == BC_ISEQP;
-    dasm_put(Dst, 9385);
+    dasm_put(Dst, 9381);
     goto iseqne_test;
 
   /* -- Unary test and copy ops ------------------------------------------- */
 
   case BC_ISTC: case BC_ISFC: case BC_IST: case BC_ISF:
-    dasm_put(Dst, 9397, LJ_TISTRUECOND);
+    dasm_put(Dst, 9393, LJ_TISTRUECOND);
     if (op == BC_IST || op == BC_ISTC) {
-      dasm_put(Dst, 9409);
+      dasm_put(Dst, 9405);
     } else {
-      dasm_put(Dst, 9414);
+      dasm_put(Dst, 9410);
     }
     if (op == BC_ISTC || op == BC_ISFC) {
-      dasm_put(Dst, 9419);
+      dasm_put(Dst, 9415);
     }
-    dasm_put(Dst, 9430, -BCBIAS_J*4);
+    dasm_put(Dst, 9426, -BCBIAS_J*4);
     break;
 
   /* -- Unary ops --------------------------------------------------------- */
 
   case BC_MOV:
-    dasm_put(Dst, 9462);
+    dasm_put(Dst, 9458);
     break;
   case BC_NOT:
-    dasm_put(Dst, 9496, LJ_TISTRUECOND, LJ_TTRUE);
+    dasm_put(Dst, 9492, LJ_TISTRUECOND, LJ_TTRUE);
     break;
   case BC_UNM:
-    dasm_put(Dst, 9532, LJ_TISNUM);
+    dasm_put(Dst, 9528, LJ_TISNUM);
     if (sse) {
-      dasm_put(Dst, 9543, (unsigned int)(U64x(80000000,00000000)), (unsigned int)((U64x(80000000,00000000))>>32));
+      dasm_put(Dst, 9539, (unsigned int)(U64x(80000000,00000000)), (unsigned int)((U64x(80000000,00000000))>>32));
     } else {
-      dasm_put(Dst, 9568);
+      dasm_put(Dst, 9564);
     }
-    dasm_put(Dst, 7237);
+    dasm_put(Dst, 7233);
     break;
   case BC_LEN:
-    dasm_put(Dst, 9577, LJ_TSTR);
+    dasm_put(Dst, 9573, LJ_TSTR);
     if (sse) {
-      dasm_put(Dst, 9591, Dt5(->len));
+      dasm_put(Dst, 9587, Dt5(->len));
     } else {
-      dasm_put(Dst, 9609, Dt5(->len));
+      dasm_put(Dst, 9605, Dt5(->len));
     }
-    dasm_put(Dst, 9618, LJ_TTAB);
+    dasm_put(Dst, 9614, LJ_TTAB);
     if (sse) {
-      dasm_put(Dst, 9659);
+      dasm_put(Dst, 9655);
     } else {
     }
-    dasm_put(Dst, 9668);
+    dasm_put(Dst, 9664);
     break;
 
   /* -- Binary ops -------------------------------------------------------- */
 
 
   case BC_ADDVN: case BC_ADDNV: case BC_ADDVV:
-    dasm_put(Dst, 9678);
+    dasm_put(Dst, 9674);
     vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN);
     switch (vk) {
     case 0:
-    dasm_put(Dst, 9686, LJ_TISNUM);
+    dasm_put(Dst, 9682, LJ_TISNUM);
     if (sse) {
-    dasm_put(Dst, 9698);
+    dasm_put(Dst, 9694);
     } else {
-    dasm_put(Dst, 9712);
+    dasm_put(Dst, 9708);
     }
       break;
     case 1:
-    dasm_put(Dst, 9720, LJ_TISNUM);
+    dasm_put(Dst, 9716, LJ_TISNUM);
     if (sse) {
-    dasm_put(Dst, 9732);
+    dasm_put(Dst, 9728);
     } else {
-    dasm_put(Dst, 9746);
+    dasm_put(Dst, 9742);
     }
       break;
     default:
-    dasm_put(Dst, 9754, LJ_TISNUM, LJ_TISNUM);
+    dasm_put(Dst, 9750, LJ_TISNUM, LJ_TISNUM);
     if (sse) {
-    dasm_put(Dst, 9776);
+    dasm_put(Dst, 9772);
     } else {
-    dasm_put(Dst, 9790);
+    dasm_put(Dst, 9786);
     }
       break;
     }
     if (sse) {
-    dasm_put(Dst, 9561);
+    dasm_put(Dst, 9557);
     } else {
-    dasm_put(Dst, 9573);
+    dasm_put(Dst, 9569);
     }
-    dasm_put(Dst, 7237);
+    dasm_put(Dst, 7233);
     break;
   case BC_SUBVN: case BC_SUBNV: case BC_SUBVV:
-    dasm_put(Dst, 9678);
+    dasm_put(Dst, 9674);
     vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN);
     switch (vk) {
     case 0:
-    dasm_put(Dst, 9686, LJ_TISNUM);
+    dasm_put(Dst, 9682, LJ_TISNUM);
     if (sse) {
-    dasm_put(Dst, 9798);
+    dasm_put(Dst, 9794);
     } else {
-    dasm_put(Dst, 9812);
+    dasm_put(Dst, 9808);
     }
       break;
     case 1:
-    dasm_put(Dst, 9720, LJ_TISNUM);
+    dasm_put(Dst, 9716, LJ_TISNUM);
     if (sse) {
-    dasm_put(Dst, 9820);
+    dasm_put(Dst, 9816);
     } else {
-    dasm_put(Dst, 9834);
+    dasm_put(Dst, 9830);
     }
       break;
     default:
-    dasm_put(Dst, 9754, LJ_TISNUM, LJ_TISNUM);
+    dasm_put(Dst, 9750, LJ_TISNUM, LJ_TISNUM);
     if (sse) {
-    dasm_put(Dst, 9842);
+    dasm_put(Dst, 9838);
     } else {
-    dasm_put(Dst, 9856);
+    dasm_put(Dst, 9852);
     }
       break;
     }
     if (sse) {
-    dasm_put(Dst, 9561);
+    dasm_put(Dst, 9557);
     } else {
-    dasm_put(Dst, 9573);
+    dasm_put(Dst, 9569);
     }
-    dasm_put(Dst, 7237);
+    dasm_put(Dst, 7233);
     break;
   case BC_MULVN: case BC_MULNV: case BC_MULVV:
-    dasm_put(Dst, 9678);
+    dasm_put(Dst, 9674);
     vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN);
     switch (vk) {
     case 0:
-    dasm_put(Dst, 9686, LJ_TISNUM);
+    dasm_put(Dst, 9682, LJ_TISNUM);
     if (sse) {
-    dasm_put(Dst, 9864);
+    dasm_put(Dst, 9860);
     } else {
-    dasm_put(Dst, 9878);
+    dasm_put(Dst, 9874);
     }
       break;
     case 1:
-    dasm_put(Dst, 9720, LJ_TISNUM);
+    dasm_put(Dst, 9716, LJ_TISNUM);
     if (sse) {
-    dasm_put(Dst, 9886);
+    dasm_put(Dst, 9882);
     } else {
-    dasm_put(Dst, 9900);
+    dasm_put(Dst, 9896);
     }
       break;
     default:
-    dasm_put(Dst, 9754, LJ_TISNUM, LJ_TISNUM);
+    dasm_put(Dst, 9750, LJ_TISNUM, LJ_TISNUM);
     if (sse) {
-    dasm_put(Dst, 9908);
+    dasm_put(Dst, 9904);
     } else {
-    dasm_put(Dst, 9922);
+    dasm_put(Dst, 9918);
     }
       break;
     }
     if (sse) {
-    dasm_put(Dst, 9561);
+    dasm_put(Dst, 9557);
     } else {
-    dasm_put(Dst, 9573);
+    dasm_put(Dst, 9569);
     }
-    dasm_put(Dst, 7237);
+    dasm_put(Dst, 7233);
     break;
   case BC_DIVVN: case BC_DIVNV: case BC_DIVVV:
-    dasm_put(Dst, 9678);
+    dasm_put(Dst, 9674);
     vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN);
     switch (vk) {
     case 0:
-    dasm_put(Dst, 9686, LJ_TISNUM);
+    dasm_put(Dst, 9682, LJ_TISNUM);
     if (sse) {
-    dasm_put(Dst, 9930);
+    dasm_put(Dst, 9926);
     } else {
-    dasm_put(Dst, 9944);
+    dasm_put(Dst, 9940);
     }
       break;
     case 1:
-    dasm_put(Dst, 9720, LJ_TISNUM);
+    dasm_put(Dst, 9716, LJ_TISNUM);
     if (sse) {
-    dasm_put(Dst, 9952);
+    dasm_put(Dst, 9948);
     } else {
-    dasm_put(Dst, 9966);
+    dasm_put(Dst, 9962);
     }
       break;
     default:
-    dasm_put(Dst, 9754, LJ_TISNUM, LJ_TISNUM);
+    dasm_put(Dst, 9750, LJ_TISNUM, LJ_TISNUM);
     if (sse) {
-    dasm_put(Dst, 9974);
+    dasm_put(Dst, 9970);
     } else {
-    dasm_put(Dst, 9988);
+    dasm_put(Dst, 9984);
     }
       break;
     }
     if (sse) {
-    dasm_put(Dst, 9561);
+    dasm_put(Dst, 9557);
     } else {
-    dasm_put(Dst, 9573);
+    dasm_put(Dst, 9569);
     }
-    dasm_put(Dst, 7237);
+    dasm_put(Dst, 7233);
     break;
   case BC_MODVN:
-    dasm_put(Dst, 9678);
+    dasm_put(Dst, 9674);
     vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN);
     switch (vk) {
     case 0:
-    dasm_put(Dst, 9686, LJ_TISNUM);
+    dasm_put(Dst, 9682, LJ_TISNUM);
     if (sse) {
-    dasm_put(Dst, 9996);
+    dasm_put(Dst, 9992);
     } else {
-    dasm_put(Dst, 10010);
+    dasm_put(Dst, 10006);
     }
       break;
     case 1:
-    dasm_put(Dst, 9720, LJ_TISNUM);
+    dasm_put(Dst, 9716, LJ_TISNUM);
     if (sse) {
-    dasm_put(Dst, 10018);
+    dasm_put(Dst, 10014);
     } else {
-    dasm_put(Dst, 10032);
+    dasm_put(Dst, 10028);
     }
       break;
     default:
-    dasm_put(Dst, 9754, LJ_TISNUM, LJ_TISNUM);
+    dasm_put(Dst, 9750, LJ_TISNUM, LJ_TISNUM);
     if (sse) {
-    dasm_put(Dst, 10040);
+    dasm_put(Dst, 10036);
     } else {
-    dasm_put(Dst, 10054);
+    dasm_put(Dst, 10050);
     }
       break;
     }
-    dasm_put(Dst, 10062);
+    dasm_put(Dst, 10058);
     if (sse) {
-    dasm_put(Dst, 9561);
+    dasm_put(Dst, 9557);
     } else {
-    dasm_put(Dst, 9573);
+    dasm_put(Dst, 9569);
     }
-    dasm_put(Dst, 7237);
+    dasm_put(Dst, 7233);
     break;
   case BC_MODNV: case BC_MODVV:
-    dasm_put(Dst, 9678);
+    dasm_put(Dst, 9674);
     vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN);
     switch (vk) {
     case 0:
-    dasm_put(Dst, 9686, LJ_TISNUM);
+    dasm_put(Dst, 9682, LJ_TISNUM);
     if (sse) {
-    dasm_put(Dst, 9996);
+    dasm_put(Dst, 9992);
     } else {
-    dasm_put(Dst, 10010);
+    dasm_put(Dst, 10006);
     }
       break;
     case 1:
-    dasm_put(Dst, 9720, LJ_TISNUM);
+    dasm_put(Dst, 9716, LJ_TISNUM);
     if (sse) {
-    dasm_put(Dst, 10018);
+    dasm_put(Dst, 10014);
     } else {
-    dasm_put(Dst, 10032);
+    dasm_put(Dst, 10028);
     }
       break;
     default:
-    dasm_put(Dst, 9754, LJ_TISNUM, LJ_TISNUM);
+    dasm_put(Dst, 9750, LJ_TISNUM, LJ_TISNUM);
     if (sse) {
-    dasm_put(Dst, 10040);
+    dasm_put(Dst, 10036);
     } else {
-    dasm_put(Dst, 10054);
+    dasm_put(Dst, 10050);
     }
       break;
     }
-    dasm_put(Dst, 10068);
+    dasm_put(Dst, 10064);
     break;
   case BC_POW:
-    dasm_put(Dst, 9678);
+    dasm_put(Dst, 9674);
     vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN);
     switch (vk) {
     case 0:
-    dasm_put(Dst, 9686, LJ_TISNUM);
+    dasm_put(Dst, 9682, LJ_TISNUM);
     if (sse) {
-    dasm_put(Dst, 9996);
+    dasm_put(Dst, 9992);
     } else {
-    dasm_put(Dst, 10010);
+    dasm_put(Dst, 10006);
     }
       break;
     case 1:
-    dasm_put(Dst, 9720, LJ_TISNUM);
+    dasm_put(Dst, 9716, LJ_TISNUM);
     if (sse) {
-    dasm_put(Dst, 10018);
+    dasm_put(Dst, 10014);
     } else {
-    dasm_put(Dst, 10032);
+    dasm_put(Dst, 10028);
     }
       break;
     default:
-    dasm_put(Dst, 9754, LJ_TISNUM, LJ_TISNUM);
+    dasm_put(Dst, 9750, LJ_TISNUM, LJ_TISNUM);
     if (sse) {
-    dasm_put(Dst, 10040);
+    dasm_put(Dst, 10036);
     } else {
-    dasm_put(Dst, 10054);
+    dasm_put(Dst, 10050);
     }
       break;
     }
-    dasm_put(Dst, 10073);
+    dasm_put(Dst, 10069);
     if (sse) {
-    dasm_put(Dst, 9561);
+    dasm_put(Dst, 9557);
     } else {
-    dasm_put(Dst, 9573);
+    dasm_put(Dst, 9569);
     }
-    dasm_put(Dst, 7237);
+    dasm_put(Dst, 7233);
     break;
 
   case BC_CAT:
-    dasm_put(Dst, 10077, Dt1(->base), Dt1(->base));
+    dasm_put(Dst, 10073, Dt1(->base), Dt1(->base));
     break;
 
   /* -- Constant ops ------------------------------------------------------ */
 
   case BC_KSTR:
-    dasm_put(Dst, 10167, LJ_TSTR);
+    dasm_put(Dst, 10163, LJ_TSTR);
     break;
   case BC_KSHORT:
     if (sse) {
-      dasm_put(Dst, 10202);
+      dasm_put(Dst, 10198);
     } else {
-      dasm_put(Dst, 10217);
+      dasm_put(Dst, 10213);
     }
-    dasm_put(Dst, 7237);
+    dasm_put(Dst, 7233);
     break;
   case BC_KNUM:
     if (sse) {
-      dasm_put(Dst, 10225);
+      dasm_put(Dst, 10221);
     } else {
-      dasm_put(Dst, 10238);
+      dasm_put(Dst, 10234);
     }
-    dasm_put(Dst, 7237);
+    dasm_put(Dst, 7233);
     break;
   case BC_KPRI:
-    dasm_put(Dst, 10245);
+    dasm_put(Dst, 10241);
     break;
   case BC_KNIL:
-    dasm_put(Dst, 10273, LJ_TNIL);
+    dasm_put(Dst, 10269, LJ_TNIL);
     break;
 
   /* -- Upvalue and function ops ------------------------------------------ */
 
   case BC_UGET:
-    dasm_put(Dst, 10320, offsetof(GCfuncL, uvptr), DtA(->v));
+    dasm_put(Dst, 10316, offsetof(GCfuncL, uvptr), DtA(->v));
     break;
   case BC_USETV:
 #define TV2MARKOFS \
  ((int32_t)offsetof(GCupval, marked)-(int32_t)offsetof(GCupval, tv))
-    dasm_put(Dst, 10365, offsetof(GCfuncL, uvptr), DtA(->closed), DtA(->v), TV2MARKOFS, LJ_GC_BLACK, LJ_TISGCV, LJ_TISNUM - LJ_TISGCV, Dt4(->gch.marked), LJ_GC_WHITES, GG_DISP2G);
-    dasm_put(Dst, 10456);
+    dasm_put(Dst, 10361, offsetof(GCfuncL, uvptr), DtA(->closed), DtA(->v), TV2MARKOFS, LJ_GC_BLACK, LJ_TISGCV, LJ_TISNUM - LJ_TISGCV, Dt4(->gch.marked), LJ_GC_WHITES, GG_DISP2G);
+    dasm_put(Dst, 10452);
     break;
 #undef TV2MARKOFS
   case BC_USETS:
-    dasm_put(Dst, 10468, offsetof(GCfuncL, uvptr), DtA(->v), LJ_TSTR, DtA(->marked), LJ_GC_BLACK, Dt4(->gch.marked), LJ_GC_WHITES, DtA(->closed), GG_DISP2G);
+    dasm_put(Dst, 10464, offsetof(GCfuncL, uvptr), DtA(->v), LJ_TSTR, DtA(->marked), LJ_GC_BLACK, Dt4(->gch.marked), LJ_GC_WHITES, DtA(->closed), GG_DISP2G);
     break;
   case BC_USETN:
-    dasm_put(Dst, 10561);
+    dasm_put(Dst, 10557);
     if (sse) {
-      dasm_put(Dst, 10566);
+      dasm_put(Dst, 10562);
     } else {
-      dasm_put(Dst, 9381);
+      dasm_put(Dst, 9377);
     }
-    dasm_put(Dst, 10573, offsetof(GCfuncL, uvptr), DtA(->v));
+    dasm_put(Dst, 10569, offsetof(GCfuncL, uvptr), DtA(->v));
     if (sse) {
-      dasm_put(Dst, 10582);
+      dasm_put(Dst, 10578);
     } else {
-      dasm_put(Dst, 10588);
+      dasm_put(Dst, 10584);
     }
-    dasm_put(Dst, 7237);
+    dasm_put(Dst, 7233);
     break;
   case BC_USETP:
-    dasm_put(Dst, 10591, offsetof(GCfuncL, uvptr), DtA(->v));
+    dasm_put(Dst, 10587, offsetof(GCfuncL, uvptr), DtA(->v));
     break;
   case BC_UCLO:
-    dasm_put(Dst, 10630, -BCBIAS_J*4, Dt1(->openupval), Dt1(->base), Dt1(->base));
+    dasm_put(Dst, 10626, -BCBIAS_J*4, Dt1(->openupval), Dt1(->base), Dt1(->base));
     break;
 
   case BC_FNEW:
-    dasm_put(Dst, 10685, Dt1(->base), Dt1(->base), LJ_TFUNC);
+    dasm_put(Dst, 10681, Dt1(->base), Dt1(->base), LJ_TFUNC);
     break;
 
   /* -- Table ops --------------------------------------------------------- */
 
   case BC_TNEW:
-    dasm_put(Dst, 10751, Dt1(->base), DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), LJ_TTAB);
+    dasm_put(Dst, 10747, Dt1(->base), DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), LJ_TTAB);
     break;
   case BC_TDUP:
-    dasm_put(Dst, 10872, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), Dt1(->base), LJ_TTAB);
+    dasm_put(Dst, 10868, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), Dt1(->base), LJ_TTAB);
     break;
 
   case BC_GGET:
-    dasm_put(Dst, 10967, Dt7(->env));
+    dasm_put(Dst, 10963, Dt7(->env));
     break;
   case BC_GSET:
-    dasm_put(Dst, 10986, Dt7(->env));
+    dasm_put(Dst, 10982, Dt7(->env));
     break;
 
   case BC_TGETV:
-    dasm_put(Dst, 11005, LJ_TTAB, LJ_TISNUM);
+    dasm_put(Dst, 11001, LJ_TTAB, LJ_TISNUM);
     if (sse) {
-      dasm_put(Dst, 11038);
+      dasm_put(Dst, 11034);
     } else {
     }
-    dasm_put(Dst, 11059, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<<MM_index);
-    dasm_put(Dst, 11152, LJ_TSTR);
+    dasm_put(Dst, 11055, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<<MM_index);
+    dasm_put(Dst, 11148, LJ_TSTR);
     break;
   case BC_TGETS:
-    dasm_put(Dst, 11170, LJ_TTAB, Dt6(->hmask), Dt5(->hash), sizeof(Node), Dt6(->node), DtB(->key.it), LJ_TSTR, DtB(->key.gcr), LJ_TNIL);
-    dasm_put(Dst, 11255, LJ_TNIL, DtB(->next), Dt6(->metatable), Dt6(->nomm), 1<<MM_index);
+    dasm_put(Dst, 11166, LJ_TTAB, Dt6(->hmask), Dt5(->hash), sizeof(Node), Dt6(->node), DtB(->key.it), LJ_TSTR, DtB(->key.gcr), LJ_TNIL);
+    dasm_put(Dst, 11251, LJ_TNIL, DtB(->next), Dt6(->metatable), Dt6(->nomm), 1<<MM_index);
     break;
   case BC_TGETB:
-    dasm_put(Dst, 11327, LJ_TTAB, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<<MM_index);
-    dasm_put(Dst, 9668);
+    dasm_put(Dst, 11323, LJ_TTAB, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<<MM_index);
+    dasm_put(Dst, 9664);
     break;
 
   case BC_TSETV:
-    dasm_put(Dst, 11427, LJ_TTAB, LJ_TISNUM);
+    dasm_put(Dst, 11423, LJ_TTAB, LJ_TISNUM);
     if (sse) {
-      dasm_put(Dst, 11038);
+      dasm_put(Dst, 11034);
     } else {
     }
-    dasm_put(Dst, 11460, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->metatable));
-    dasm_put(Dst, 11544, 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, 11456, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->metatable));
+    dasm_put(Dst, 11540, 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, 11606, 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, 11682, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<<MM_newindex, DtB(->next));
-    dasm_put(Dst, 11775, 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, 11602, 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, 11678, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<<MM_newindex, DtB(->next));
+    dasm_put(Dst, 11771, 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, 11866, LJ_TTAB, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable));
-    dasm_put(Dst, 11965, 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, 11862, LJ_TTAB, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable));
+    dasm_put(Dst, 11961, 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, 12011);
+    dasm_put(Dst, 12007);
     if (sse) {
-      dasm_put(Dst, 10566);
+      dasm_put(Dst, 10562);
     } else {
     }
-    dasm_put(Dst, 12016, Dt6(->marked), LJ_GC_BLACK);
+    dasm_put(Dst, 12012, Dt6(->marked), LJ_GC_BLACK);
     if (sse) {
-      dasm_put(Dst, 12041);
+      dasm_put(Dst, 12037);
     } else {
     }
-    dasm_put(Dst, 12048, Dt6(->asize), Dt6(->array), Dt1(->base), Dt1(->base), Dt6(->marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain));
-    dasm_put(Dst, 12174, Dt6(->gclist));
+    dasm_put(Dst, 12044, Dt6(->asize), Dt6(->array), Dt1(->base), Dt1(->base), Dt6(->marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain));
+    dasm_put(Dst, 12170, Dt6(->gclist));
     break;
 
   /* -- Calls and vararg handling ----------------------------------------- */
 
   case BC_CALL: case BC_CALLM:
-    dasm_put(Dst, 9682);
+    dasm_put(Dst, 9678);
     if (op == BC_CALLM) {
-      dasm_put(Dst, 12182);
+      dasm_put(Dst, 12178);
     }
-    dasm_put(Dst, 12187, LJ_TFUNC, Dt7(->pc));
+    dasm_put(Dst, 12183, LJ_TFUNC, Dt7(->pc));
     break;
 
   case BC_CALLMT:
-    dasm_put(Dst, 12182);
+    dasm_put(Dst, 12178);
     break;
   case BC_CALLT:
-    dasm_put(Dst, 12229, LJ_TFUNC, FRAME_TYPE, Dt7(->ffid), Dt7(->pc));
-    dasm_put(Dst, 12348, FRAME_TYPE, Dt7(->pc), PC2PROTO(k));
+    dasm_put(Dst, 12225, LJ_TFUNC, FRAME_TYPE, Dt7(->ffid), Dt7(->pc));
+    dasm_put(Dst, 12344, FRAME_TYPE, Dt7(->pc), PC2PROTO(k));
     break;
 
   case BC_ITERC:
-    dasm_put(Dst, 12406, LJ_TFUNC, 2+1, Dt7(->pc));
+    dasm_put(Dst, 12402, LJ_TFUNC, 2+1, Dt7(->pc));
     break;
 
   case BC_VARG:
-    dasm_put(Dst, 12487, Dt7(->pc), PC2PROTO(numparams), (8+FRAME_VARG), LJ_TNIL);
-    dasm_put(Dst, 12632, Dt1(->maxstack), Dt1(->base), Dt1(->top), Dt1(->base), Dt1(->top));
+    dasm_put(Dst, 12483, Dt7(->pc), PC2PROTO(numparams), (8+FRAME_VARG), LJ_TNIL);
+    dasm_put(Dst, 12628, Dt1(->maxstack), Dt1(->base), Dt1(->top), Dt1(->base), Dt1(->top));
     break;
 
   /* -- Returns ----------------------------------------------------------- */
 
   case BC_RETM:
-    dasm_put(Dst, 12182);
+    dasm_put(Dst, 12178);
     break;
 
   case BC_RET: case BC_RET0: case BC_RET1:
     if (op != BC_RET0) {
-      dasm_put(Dst, 12731);
+      dasm_put(Dst, 12727);
     }
-    dasm_put(Dst, 12735, FRAME_TYPE);
+    dasm_put(Dst, 12731, FRAME_TYPE);
     switch (op) {
     case BC_RET:
-      dasm_put(Dst, 12754);
+      dasm_put(Dst, 12750);
       break;
     case BC_RET1:
-      dasm_put(Dst, 12812);
+      dasm_put(Dst, 12808);
       /* fallthrough */
     case BC_RET0:
-      dasm_put(Dst, 12828);
+      dasm_put(Dst, 12824);
     default:
       break;
     }
-    dasm_put(Dst, 12839, Dt7(->pc), PC2PROTO(k));
+    dasm_put(Dst, 12835, Dt7(->pc), PC2PROTO(k));
     if (op == BC_RET) {
-      dasm_put(Dst, 12883, LJ_TNIL);
+      dasm_put(Dst, 12879, LJ_TNIL);
     } else {
-      dasm_put(Dst, 12892, LJ_TNIL);
+      dasm_put(Dst, 12888, LJ_TNIL);
     }
-    dasm_put(Dst, 12899);
+    dasm_put(Dst, 12895);
     if (op != BC_RET0) {
-      dasm_put(Dst, 12920);
+      dasm_put(Dst, 12916);
     }
     dasm_put(Dst, 4542);
     break;
@@ -2007,7 +2011,7 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse)
 
   case BC_FORL:
 #if LJ_HASJIT
-    dasm_put(Dst, 12924, HOTCOUNT_PCMASK, GG_DISP2HOT);
+    dasm_put(Dst, 12920, HOTCOUNT_PCMASK, GG_DISP2HOT);
 #endif
     break;
 
@@ -2019,57 +2023,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, 12945);
+    dasm_put(Dst, 12941);
     if (!vk) {
-      dasm_put(Dst, 12949, LJ_TISNUM, LJ_TISNUM);
+      dasm_put(Dst, 12945, LJ_TISNUM, LJ_TISNUM);
     }
-    dasm_put(Dst, 12968);
+    dasm_put(Dst, 12964);
     if (!vk) {
-      dasm_put(Dst, 12972, LJ_TISNUM);
+      dasm_put(Dst, 12968, LJ_TISNUM);
     }
     if (sse) {
-      dasm_put(Dst, 12981);
+      dasm_put(Dst, 12977);
       if (vk) {
-        dasm_put(Dst, 12993);
+        dasm_put(Dst, 12989);
       } else {
-        dasm_put(Dst, 13012);
+        dasm_put(Dst, 13008);
       }
-      dasm_put(Dst, 13017);
+      dasm_put(Dst, 13013);
     } else {
-      dasm_put(Dst, 13030);
+      dasm_put(Dst, 13026);
       if (vk) {
-        dasm_put(Dst, 13036);
+        dasm_put(Dst, 13032);
       } else {
-        dasm_put(Dst, 13052);
+        dasm_put(Dst, 13048);
       }
-      dasm_put(Dst, 13060);
+      dasm_put(Dst, 13056);
       if (cmov) {
-      dasm_put(Dst, 9105);
+      dasm_put(Dst, 9101);
       } else {
-      dasm_put(Dst, 9111);
+      dasm_put(Dst, 9107);
       }
       if (!cmov) {
-        dasm_put(Dst, 13065);
+        dasm_put(Dst, 13061);
       }
     }
     if (op == BC_FORI) {
-      dasm_put(Dst, 13071, -BCBIAS_J*4);
+      dasm_put(Dst, 13067, -BCBIAS_J*4);
     } else if (op == BC_JFORI) {
-      dasm_put(Dst, 13081, -BCBIAS_J*4, BC_JLOOP);
+      dasm_put(Dst, 13077, -BCBIAS_J*4, BC_JLOOP);
     } else if (op == BC_IFORL) {
-      dasm_put(Dst, 13095, -BCBIAS_J*4);
+      dasm_put(Dst, 13091, -BCBIAS_J*4);
     } else {
-      dasm_put(Dst, 13091, BC_JLOOP);
+      dasm_put(Dst, 13087, BC_JLOOP);
     }
-    dasm_put(Dst, 9140);
+    dasm_put(Dst, 9136);
     if (sse) {
-      dasm_put(Dst, 13105);
+      dasm_put(Dst, 13101);
     }
     break;
 
   case BC_ITERL:
 #if LJ_HASJIT
-    dasm_put(Dst, 12924, HOTCOUNT_PCMASK, GG_DISP2HOT);
+    dasm_put(Dst, 12920, HOTCOUNT_PCMASK, GG_DISP2HOT);
 #endif
     break;
 
@@ -2078,33 +2082,33 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse)
     break;
 #endif
   case BC_IITERL:
-    dasm_put(Dst, 13116, LJ_TNIL);
+    dasm_put(Dst, 13112, LJ_TNIL);
     if (op == BC_JITERL) {
-      dasm_put(Dst, 13131, BC_JLOOP);
+      dasm_put(Dst, 13127, BC_JLOOP);
     } else {
-      dasm_put(Dst, 13145, -BCBIAS_J*4);
+      dasm_put(Dst, 13141, -BCBIAS_J*4);
     }
-    dasm_put(Dst, 9440);
+    dasm_put(Dst, 9436);
     break;
 
   case BC_LOOP:
 #if LJ_HASJIT
-    dasm_put(Dst, 12924, HOTCOUNT_PCMASK, GG_DISP2HOT);
+    dasm_put(Dst, 12920, HOTCOUNT_PCMASK, GG_DISP2HOT);
 #endif
     break;
 
   case BC_ILOOP:
-    dasm_put(Dst, 7237);
+    dasm_put(Dst, 7233);
     break;
 
   case BC_JLOOP:
 #if LJ_HASJIT
-    dasm_put(Dst, 13161, DISPATCH_J(trace), DtD(->mcode), DISPATCH_GL(jit_base), DISPATCH_GL(jit_L));
+    dasm_put(Dst, 13157, DISPATCH_J(trace), DtD(->mcode), DISPATCH_GL(jit_base), DISPATCH_GL(jit_L));
 #endif
     break;
 
   case BC_JMP:
-    dasm_put(Dst, 13185, -BCBIAS_J*4);
+    dasm_put(Dst, 13181, -BCBIAS_J*4);
     break;
 
   /* -- Function headers -------------------------------------------------- */
@@ -2127,13 +2131,13 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse)
     break;
 #endif
   case BC_IFUNCF:
-    dasm_put(Dst, 13210, -4+PC2PROTO(k), Dt1(->maxstack), -4+PC2PROTO(numparams));
+    dasm_put(Dst, 13206, -4+PC2PROTO(k), Dt1(->maxstack), -4+PC2PROTO(numparams));
     if (op == BC_JFUNCF) {
-      dasm_put(Dst, 13240, BC_JLOOP);
+      dasm_put(Dst, 13236, BC_JLOOP);
     } else {
-      dasm_put(Dst, 7237);
+      dasm_put(Dst, 7233);
     }
-    dasm_put(Dst, 13249, LJ_TNIL);
+    dasm_put(Dst, 13245, LJ_TNIL);
     break;
 
   case BC_JFUNCV:
@@ -2144,30 +2148,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, 13271, FRAME_VARG, Dt1(->maxstack), -4+PC2PROTO(numparams), LJ_TNIL);
+    dasm_put(Dst, 13267, FRAME_VARG, Dt1(->maxstack), -4+PC2PROTO(numparams), LJ_TNIL);
     if (op == BC_JFUNCV) {
-      dasm_put(Dst, 13240, BC_JLOOP);
+      dasm_put(Dst, 13236, BC_JLOOP);
     } else {
-      dasm_put(Dst, 13362, -4+PC2PROTO(k));
+      dasm_put(Dst, 13358, -4+PC2PROTO(k));
     }
-    dasm_put(Dst, 13385, LJ_TNIL);
+    dasm_put(Dst, 13381, LJ_TNIL);
     break;
 
   case BC_FUNCC:
   case BC_FUNCCW:
-    dasm_put(Dst, 13407, Dt8(->f), Dt1(->base), 8*LUA_MINSTACK, Dt1(->maxstack), Dt1(->top));
+    dasm_put(Dst, 13403, Dt8(->f), Dt1(->base), 8*LUA_MINSTACK, Dt1(->maxstack), Dt1(->top));
     if (op == BC_FUNCC) {
-      dasm_put(Dst, 13437);
+      dasm_put(Dst, 13433);
     } else {
-      dasm_put(Dst, 13441);
+      dasm_put(Dst, 13437);
     }
-    dasm_put(Dst, 13449, DISPATCH_GL(vmstate), ~LJ_VMST_C);
+    dasm_put(Dst, 13445, DISPATCH_GL(vmstate), ~LJ_VMST_C);
     if (op == BC_FUNCC) {
-      dasm_put(Dst, 13458);
+      dasm_put(Dst, 13454);
     } else {
-      dasm_put(Dst, 13462, DISPATCH_GL(wrapf));
+      dasm_put(Dst, 13458, DISPATCH_GL(wrapf));
     }
-    dasm_put(Dst, 13467, DISPATCH_GL(vmstate), ~LJ_VMST_INTERP, Dt1(->base), Dt1(->top));
+    dasm_put(Dst, 13463, DISPATCH_GL(vmstate), ~LJ_VMST_INTERP, Dt1(->base), Dt1(->top));
     break;
 
   /* ---------------------------------------------------------------------- */
@@ -2195,7 +2199,7 @@ static int build_backend(BuildCtx *ctx)
 
   build_subroutines(ctx, cmov, sse);
 
-  dasm_put(Dst, 13492);
+  dasm_put(Dst, 13488);
   for (op = 0; op < BC__MAX; op++)
     build_ins(ctx, (BCOp)op, op, cmov, sse);