1 files changed, 580 insertions, 530 deletions

diff --git a/src/buildvm_ppcspe.h b/src/buildvm_ppcspe.h
index 59cd96fa..257fe353 100644
--- a/src/buildvm_ppcspe.h
+++ b/src/buildvm_ppcspe.h
@@ -12,7 +12,7 @@
 #define DASM_SECTION_CODE_OP    0
 #define DASM_SECTION_CODE_SUB   1
 #define DASM_MAXSECTION         2
-static const unsigned int build_actionlist[4961] = {
+static const unsigned int build_actionlist[4992] = {
 0x00010001,
 0x00060014,
 0x72000000,
@@ -740,6 +740,9 @@ static const unsigned int build_actionlist[4961] = {
 0x48000000,
 0x00050024,
 0x0006003e,
+0x00000000,
+0x7c751b78,
+0x00000000,
 0x7c8e6214,
 0x91d20000,
 0x00098200,
@@ -747,8 +750,17 @@ static const unsigned int build_actionlist[4961] = {
 0x9201000c,
 0x48000001,
 0x00030006,
+0x00000000,
+0x28030000,
+0x40820000,
+0x00050835,
+0x7ea3ab78,
+0x48000000,
+0x0005003f,
+0x00000000,
 0x48000000,
 0x00050035,
+0x00000000,
 0x00060025,
 0x7e439378,
 0x91320000,
@@ -772,7 +784,7 @@ static const unsigned int build_actionlist[4961] = {
 0x7e947214,
 0x7c0903a6,
 0x4e800420,
-0x0006003f,
+0x00060040,
 0x7e439378,
 0x91d20000,
 0x00098200,
@@ -786,8 +798,8 @@ static const unsigned int build_actionlist[4961] = {
 0x39750008,
 0x8154fffc,
 0x48000000,
-0x00050040,
-0x00060041,
+0x00050041,
+0x00060042,
 0x7e439378,
 0x91d20000,
 0x00098200,
@@ -811,21 +823,21 @@ static const unsigned int build_actionlist[4961] = {
 0x00000000,
 0x48000000,
 0x00070000,
-0x00060042,
+0x00060043,
 0x280b0008,
 0x100e0301,
 0x41800000,
-0x00050843,
+0x00050844,
 0x111ad200,
 0x3a8efff8,
 0x10804232,
 0x820efff8,
 0x40840000,
-0x00050843,
+0x00050844,
 0x10140321,
 0x398b0008,
 0x41820000,
-0x00050844,
+0x00050845,
 0x39000008,
 0x396bfff8,
 0x0006000b,
@@ -836,12 +848,12 @@ static const unsigned int build_actionlist[4961] = {
 0x40820000,
 0x0005080b,
 0x48000000,
-0x00050044,
-0x00060045,
+0x00050045,
+0x00060046,
 0x280b0008,
 0x806e0000,
 0x41800000,
-0x00050843,
+0x00050844,
 0x39200000,
 0x00098200,
 0x7c03b040,
@@ -853,12 +865,12 @@ static const unsigned int build_actionlist[4961] = {
 0x00098200,
 0x10694300,
 0x48000000,
-0x00050046,
-0x00060047,
+0x00050047,
+0x00060048,
 0x280b0008,
 0x106e0301,
 0x41800000,
-0x00050843,
+0x00050844,
 0x1003c234,
 0x11031a2c,
 0x40800000,
@@ -872,7 +884,7 @@ static const unsigned int build_actionlist[4961] = {
 0x81710000,
 0x00098200,
 0x41820000,
-0x00050846,
+0x00050847,
 0x00000000,
 0x800a0000,
 0x00098200,
@@ -901,16 +913,16 @@ static const unsigned int build_actionlist[4961] = {
 0x00050805,
 0x28090000,
 0x41820000,
-0x00050846,
+0x00050847,
 0x48000000,
 0x0005000d,
 0x0006000f,
 0x1008d234,
 0x41800000,
-0x00050846,
+0x00050847,
 0x10684217,
 0x48000000,
-0x00050046,
+0x00050047,
 0x00060010,
 0x2c080000,
 0x00098200,
@@ -928,30 +940,30 @@ static const unsigned int build_actionlist[4961] = {
 0x7d49402e,
 0x48000000,
 0x0005000c,
-0x00060048,
+0x00060049,
 0x00000000,
 0x280b0010,
 0x106e0301,
 0x108e0b01,
 0x41800000,
-0x00050843,
+0x00050844,
 0x1003222c,
 0x1000c234,
 0x40830000,
-0x00050843,
+0x00050844,
 0x81030000,
 0x00098200,
 0x28080000,
 0x88c30000,
 0x00098200,
 0x40820000,
-0x00050843,
+0x00050844,
 0x70c00000,
 0x00090200,
 0x90830000,
 0x00098200,
 0x41820000,
-0x00050846,
+0x00050847,
 0x80110000,
 0x00098200,
 0x54c607b8,
@@ -962,41 +974,41 @@ static const unsigned int build_actionlist[4961] = {
 0x90030000,
 0x00098200,
 0x48000000,
-0x00050046,
-0x00060049,
+0x00050047,
+0x0006004a,
 0x280b0010,
 0x108e0301,
 0x41800000,
-0x00050843,
+0x00050844,
 0x1004c234,
 0x38ae0008,
 0x40800000,
-0x00050843,
+0x00050844,
 0x7e439378,
 0x48000001,
 0x00030009,
 0x10630301,
 0x48000000,
-0x00050046,
-0x0006004a,
+0x00050047,
+0x0006004b,
 0x280b0008,
 0x106e0301,
 0x40820000,
-0x00050843,
+0x00050844,
 0x1003b232,
 0x41800000,
-0x00050846,
+0x00050847,
 0x48000000,
-0x00050043,
-0x0006004b,
+0x00050044,
+0x0006004c,
 0x00000000,
 0x280b0008,
 0x106e0301,
 0x41800000,
-0x00050843,
+0x00050844,
 0x1003ba34,
 0x41800000,
-0x00050846,
+0x00050847,
 0x80110000,
 0x00098200,
 0x1003b232,
@@ -1006,31 +1018,31 @@ static const unsigned int build_actionlist[4961] = {
 0x4c403202,
 0x9201000c,
 0x40820000,
-0x00050843,
+0x00050844,
 0x80110000,
 0x00098200,
 0x81110000,
 0x00098200,
 0x7c004040,
 0x40800001,
-0x0005084c,
+0x0005084d,
 0x7e439378,
 0x7dc47378,
 0x48000001,
 0x0003000a,
 0x10771a2d,
 0x48000000,
-0x00050046,
-0x0006004d,
+0x00050047,
+0x0006004e,
 0x280b0008,
 0x108e0301,
 0x41800000,
-0x00050843,
+0x00050844,
 0x134e5b20,
 0x1004c234,
 0x820efff8,
 0x40800000,
-0x00050843,
+0x00050844,
 0x91d20000,
 0x00098200,
 0x7e439378,
@@ -1043,7 +1055,7 @@ static const unsigned int build_actionlist[4961] = {
 0x28030000,
 0x107ad217,
 0x41820000,
-0x00050846,
+0x00050847,
 0x100e0b01,
 0x3a8efff8,
 0x110e1301,
@@ -1052,16 +1064,16 @@ static const unsigned int build_actionlist[4961] = {
 0x00098200,
 0x11140b21,
 0x48000000,
-0x00050044,
-0x0006004e,
+0x00050045,
+0x0006004f,
 0x280b0008,
 0x106e0301,
 0x41800000,
-0x00050843,
+0x00050844,
 0x1003c234,
 0x820efff8,
 0x40800000,
-0x00050843,
+0x00050844,
 0x00000000,
 0x81230000,
 0x00098200,
@@ -1070,7 +1082,7 @@ static const unsigned int build_actionlist[4961] = {
 0x28090000,
 0x3a8efff8,
 0x40820000,
-0x00050843,
+0x00050844,
 0x00000000,
 0x100a0301,
 0x00090cab,
@@ -1081,21 +1093,21 @@ static const unsigned int build_actionlist[4961] = {
 0x00098200,
 0x10140321,
 0x48000000,
-0x00050044,
-0x0006004f,
+0x00050045,
+0x00060050,
 0x280b0010,
 0x106e0301,
 0x108e0b01,
 0x41800000,
-0x00050843,
+0x00050844,
 0x1003c234,
 0x820efff8,
 0x40800000,
-0x00050843,
+0x00050844,
 0x1004b232,
 0x3cc03ff0,
 0x40800000,
-0x00050843,
+0x00050844,
 0x112022f5,
 0x80030000,
 0x00098200,
@@ -1117,12 +1129,12 @@ static const unsigned int build_actionlist[4961] = {
 0x39800000,
 0x00098200,
 0x41800000,
-0x00050844,
+0x00050845,
 0x39800000,
 0x00098200,
 0x11140b21,
 0x48000000,
-0x00050044,
+0x00050045,
 0x0006000c,
 0x80030000,
 0x00098200,
@@ -1130,7 +1142,7 @@ static const unsigned int build_actionlist[4961] = {
 0x39800000,
 0x00098200,
 0x41820000,
-0x00050844,
+0x00050845,
 0x7d244b78,
 0x48000001,
 0x0003000c,
@@ -1138,20 +1150,20 @@ static const unsigned int build_actionlist[4961] = {
 0x39800000,
 0x00098200,
 0x41820000,
-0x00050844,
+0x00050845,
 0x00000000,
 0x11030301,
 0x48000000,
 0x0005000b,
-0x00060050,
+0x00060051,
 0x280b0008,
 0x106e0301,
 0x41800000,
-0x00050843,
+0x00050844,
 0x1003c234,
 0x820efff8,
 0x40800000,
-0x00050843,
+0x00050844,
 0x00000000,
 0x81230000,
 0x00098200,
@@ -1160,7 +1172,7 @@ static const unsigned int build_actionlist[4961] = {
 0x28090000,
 0x3a8efff8,
 0x40820000,
-0x00050843,
+0x00050844,
 0x00000000,
 0x100a0301,
 0x00090cab,
@@ -1172,13 +1184,13 @@ static const unsigned int build_actionlist[4961] = {
 0x110e0b21,
 0x10140321,
 0x48000000,
-0x00050044,
-0x00060051,
+0x00050045,
+0x00060052,
 0x280b0008,
 0x88d10000,
 0x00098200,
 0x41800000,
-0x00050843,
+0x00050844,
 0x7dc97378,
 0x39ce0008,
 0x54c607fe,
@@ -1188,18 +1200,18 @@ static const unsigned int build_actionlist[4961] = {
 0x00098200,
 0x48000000,
 0x00050024,
-0x00060052,
+0x00060053,
 0x280b0010,
 0x106e0301,
 0x108e0b01,
 0x41800000,
-0x00050843,
+0x00050844,
 0x88d10000,
 0x00098200,
 0x7dc97378,
 0x1004ca34,
 0x40800000,
-0x00050843,
+0x00050844,
 0x39ce0010,
 0x54c607fe,
 0x000900ab,
@@ -1210,16 +1222,16 @@ static const unsigned int build_actionlist[4961] = {
 0x00098200,
 0x48000000,
 0x00050024,
-0x00060053,
+0x00060054,
 0x280b0008,
 0x106e0301,
 0x41800000,
-0x00050843,
+0x00050844,
 0x10031a2c,
 0x2c000000,
 0x00098200,
 0x40820000,
-0x00050843,
+0x00050844,
 0x88030000,
 0x00098200,
 0x81030000,
@@ -1246,7 +1258,7 @@ static const unsigned int build_actionlist[4961] = {
 0x91d20000,
 0x00098200,
 0x41980000,
-0x00050843,
+0x00050844,
 0x0006000b,
 0x39ce0008,
 0x396bfff8,
@@ -1348,7 +1360,7 @@ static const unsigned int build_actionlist[4961] = {
 0x38600000,
 0x48000000,
 0x0005000e,
-0x00060054,
+0x00060055,
 0x00000000,
 0x806a0000,
 0x00098200,
@@ -1377,7 +1389,7 @@ static const unsigned int build_actionlist[4961] = {
 0x91d20000,
 0x00098200,
 0x41980000,
-0x00050843,
+0x00050844,
 0x0006000b,
 0x91230000,
 0x00098200,
@@ -1462,7 +1474,7 @@ static const unsigned int build_actionlist[4961] = {
 0x38600000,
 0x48000000,
 0x0005000e,
-0x00060055,
+0x00060056,
 0x80120000,
 0x00098200,
 0x00000000,
@@ -1476,30 +1488,30 @@ static const unsigned int build_actionlist[4961] = {
 0x38600000,
 0x00098200,
 0x41820000,
-0x00050843,
+0x00050844,
 0x93720000,
 0x00098200,
 0x98720000,
 0x00098200,
 0x48000000,
 0x0005001a,
-0x00060056,
+0x00060057,
 0x280b0008,
 0x106e0301,
 0x41800000,
-0x00050843,
+0x00050844,
 0x1003b232,
 0x40800000,
-0x00050843,
+0x00050844,
 0x106302e4,
-0x00060046,
+0x00060047,
 0x820efff8,
 0x3a8efff8,
 0x10740321,
-0x00060057,
+0x00060058,
 0x39800000,
 0x00098200,
-0x00060044,
+0x00060045,
 0x72000000,
 0x00090200,
 0x7d936378,
@@ -1529,312 +1541,312 @@ static const unsigned int build_actionlist[4961] = {
 0x13544320,
 0x48000000,
 0x0005000f,
-0x00060058,
+0x00060059,
 0x00000000,
 0x280b0008,
 0x108e0301,
 0x41800000,
-0x00050843,
+0x00050844,
 0x1004b232,
 0x1064222c,
 0x40800000,
-0x00050843,
+0x00050844,
 0x820efff8,
 0x48000001,
-0x00050059,
+0x0005005a,
 0x3a8efff8,
 0x10940321,
 0x48000000,
-0x00050057,
-0x0006005a,
+0x00050058,
+0x0006005b,
 0x280b0008,
 0x108e0301,
 0x41800000,
-0x00050843,
+0x00050844,
 0x1004b232,
 0x1064222c,
 0x40800000,
-0x00050843,
+0x00050844,
 0x820efff8,
 0x48000001,
-0x0005005b,
+0x0005005c,
 0x3a8efff8,
 0x10940321,
 0x48000000,
-0x00050057,
-0x0006005c,
+0x00050058,
+0x0006005d,
 0x280b0008,
 0x108e0301,
 0x41800000,
-0x00050843,
+0x00050844,
 0x1004b232,
 0x1064222c,
 0x40800000,
-0x00050843,
+0x00050844,
 0x48000001,
 0x0003000e,
 0x1063222d,
 0x48000000,
-0x00050046,
-0x0006005d,
+0x00050047,
+0x0006005e,
 0x280b0008,
 0x108e0301,
 0x41800000,
-0x00050843,
+0x00050844,
 0x1004b232,
 0x1064222c,
 0x40800000,
-0x00050843,
+0x00050844,
 0x48000001,
 0x0003000f,
 0x1063222d,
 0x48000000,
-0x00050046,
-0x0006005e,
+0x00050047,
+0x0006005f,
 0x280b0008,
 0x108e0301,
 0x41800000,
-0x00050843,
+0x00050844,
 0x1004b232,
 0x1064222c,
 0x40800000,
-0x00050843,
+0x00050844,
 0x00000000,
 0x48000001,
 0x00030010,
 0x1063222d,
 0x48000000,
-0x00050046,
-0x0006005f,
+0x00050047,
+0x00060060,
 0x280b0008,
 0x108e0301,
 0x41800000,
-0x00050843,
+0x00050844,
 0x1004b232,
 0x1064222c,
 0x40800000,
-0x00050843,
+0x00050844,
 0x48000001,
 0x00030011,
 0x1063222d,
 0x48000000,
-0x00050046,
-0x00060060,
+0x00050047,
+0x00060061,
 0x280b0008,
 0x108e0301,
 0x41800000,
-0x00050843,
+0x00050844,
 0x1004b232,
 0x1064222c,
 0x40800000,
-0x00050843,
+0x00050844,
 0x48000001,
 0x00030012,
 0x1063222d,
 0x48000000,
-0x00050046,
-0x00060061,
+0x00050047,
+0x00060062,
 0x280b0008,
 0x108e0301,
 0x41800000,
-0x00050843,
+0x00050844,
 0x1004b232,
 0x1064222c,
 0x40800000,
-0x00050843,
+0x00050844,
 0x48000001,
 0x00030013,
 0x1063222d,
 0x48000000,
-0x00050046,
-0x00060062,
+0x00050047,
+0x00060063,
 0x280b0008,
 0x108e0301,
 0x41800000,
-0x00050843,
+0x00050844,
 0x1004b232,
 0x1064222c,
 0x40800000,
-0x00050843,
+0x00050844,
 0x48000001,
 0x00030014,
 0x1063222d,
 0x48000000,
-0x00050046,
-0x00060063,
+0x00050047,
+0x00060064,
 0x00000000,
 0x280b0008,
 0x108e0301,
 0x41800000,
-0x00050843,
+0x00050844,
 0x1004b232,
 0x1064222c,
 0x40800000,
-0x00050843,
+0x00050844,
 0x48000001,
 0x00030015,
 0x1063222d,
 0x48000000,
-0x00050046,
-0x00060064,
+0x00050047,
+0x00060065,
 0x280b0008,
 0x108e0301,
 0x41800000,
-0x00050843,
+0x00050844,
 0x1004b232,
 0x1064222c,
 0x40800000,
-0x00050843,
+0x00050844,
 0x48000001,
 0x00030016,
 0x1063222d,
 0x48000000,
-0x00050046,
-0x00060065,
+0x00050047,
+0x00060066,
 0x280b0008,
 0x108e0301,
 0x41800000,
-0x00050843,
+0x00050844,
 0x1004b232,
 0x1064222c,
 0x40800000,
-0x00050843,
+0x00050844,
 0x48000001,
 0x00030017,
 0x1063222d,
 0x48000000,
-0x00050046,
-0x00060066,
+0x00050047,
+0x00060067,
 0x280b0008,
 0x108e0301,
 0x41800000,
-0x00050843,
+0x00050844,
 0x1004b232,
 0x1064222c,
 0x40800000,
-0x00050843,
+0x00050844,
 0x48000001,
 0x00030018,
 0x1063222d,
 0x48000000,
-0x00050046,
-0x00060067,
+0x00050047,
+0x00060068,
 0x280b0008,
 0x108e0301,
 0x41800000,
-0x00050843,
+0x00050844,
 0x1004b232,
 0x1064222c,
 0x40800000,
-0x00050843,
+0x00050844,
 0x00000000,
 0x48000001,
 0x00030019,
 0x1063222d,
 0x48000000,
-0x00050046,
-0x00060068,
+0x00050047,
+0x00060069,
 0x280b0008,
 0x108e0301,
 0x41800000,
-0x00050843,
+0x00050844,
 0x1004b232,
 0x1064222c,
 0x40800000,
-0x00050843,
+0x00050844,
 0x48000001,
 0x0003001a,
 0x1063222d,
 0x48000000,
-0x00050046,
-0x00060069,
+0x00050047,
+0x0006006a,
 0x280b0010,
 0x108e0301,
 0x10ce0b01,
 0x41800000,
-0x00050843,
+0x00050844,
 0x1066222c,
 0x1003b232,
 0x10a6322c,
 0x40830000,
-0x00050843,
+0x00050844,
 0x48000001,
 0x0003001b,
 0x1063222d,
 0x48000000,
-0x00050046,
-0x0006006a,
+0x00050047,
+0x0006006b,
 0x280b0010,
 0x108e0301,
 0x10ce0b01,
 0x41800000,
-0x00050843,
+0x00050844,
 0x1066222c,
 0x1003b232,
 0x10a6322c,
 0x40830000,
-0x00050843,
+0x00050844,
 0x48000001,
 0x0003001c,
 0x1063222d,
 0x48000000,
-0x00050046,
-0x0006006b,
+0x00050047,
+0x0006006c,
 0x280b0010,
 0x108e0301,
 0x10ce0b01,
 0x41800000,
-0x00050843,
+0x00050844,
 0x1066222c,
 0x1003b232,
 0x10a6322c,
 0x40830000,
-0x00050843,
+0x00050844,
 0x48000001,
 0x0003001d,
 0x1063222d,
 0x48000000,
-0x00050046,
-0x0006006c,
+0x00050047,
 0x0006006d,
+0x0006006e,
 0x00000000,
 0x280b0008,
 0x106e0301,
 0x41800000,
-0x00050843,
+0x00050844,
 0x1003b232,
 0x40800000,
-0x00050843,
+0x00050844,
 0x108a0301,
 0x00090cab,
 0x106322e8,
 0x48000000,
-0x00050046,
-0x0006006e,
+0x00050047,
+0x0006006f,
 0x280b0010,
 0x108e0301,
 0x10ce0b01,
 0x41800000,
-0x00050843,
+0x00050844,
 0x1066222c,
 0x1003b232,
 0x40830000,
-0x00050843,
+0x00050844,
 0x10a032f5,
 0x48000001,
 0x0003001e,
 0x1063222d,
 0x48000000,
-0x00050046,
-0x0006006f,
+0x00050047,
+0x00060070,
 0x280b0008,
 0x108e0301,
 0x41800000,
-0x00050843,
+0x00050844,
 0x1004b232,
 0x1064222c,
 0x40800000,
-0x00050843,
+0x00050844,
 0x38b10000,
 0x00098200,
 0x820efff8,
@@ -1850,16 +1862,16 @@ static const unsigned int build_actionlist[4961] = {
 0x00098200,
 0x10940b21,
 0x48000000,
-0x00050044,
-0x00060070,
+0x00050045,
+0x00060071,
 0x280b0008,
 0x108e0301,
 0x41800000,
-0x00050843,
+0x00050844,
 0x1004b232,
 0x1064222c,
 0x40800000,
-0x00050843,
+0x00050844,
 0x38aefff8,
 0x820efff8,
 0x48000001,
@@ -1871,76 +1883,76 @@ static const unsigned int build_actionlist[4961] = {
 0x00098200,
 0x00000000,
 0x48000000,
-0x00050044,
-0x00060071,
+0x00050045,
+0x00060072,
 0x280b0008,
 0x106e0301,
 0x41800000,
-0x00050843,
+0x00050844,
 0x1003b232,
 0x39000008,
 0x40800000,
-0x00050843,
+0x00050844,
 0x0006000b,
 0x108e4300,
 0x7c885840,
 0x1004b232,
 0x40840000,
-0x00050846,
+0x00050847,
 0x40800000,
-0x00050843,
+0x00050844,
 0x10041afd,
 0x39080008,
 0x4c010b82,
 0x10641a78,
 0x48000000,
 0x0005000b,
-0x00060072,
+0x00060073,
 0x280b0008,
 0x106e0301,
 0x41800000,
-0x00050843,
+0x00050844,
 0x1003b232,
 0x39000008,
 0x40800000,
-0x00050843,
+0x00050844,
 0x0006000b,
 0x108e4300,
 0x7c885840,
 0x1004b232,
 0x40840000,
-0x00050846,
+0x00050847,
 0x40800000,
-0x00050843,
+0x00050844,
 0x10041afc,
 0x39080008,
 0x4c010b82,
 0x10641a78,
 0x48000000,
 0x0005000b,
-0x00060073,
+0x00060074,
 0x280b0008,
 0x106e0301,
 0x41800000,
-0x00050843,
+0x00050844,
 0x1003ba34,
 0x40800000,
-0x00050843,
+0x00050844,
 0x80030000,
 0x00098200,
 0x106002f1,
 0x48000000,
-0x00050046,
-0x00060074,
+0x00050047,
+0x00060075,
 0x280b0008,
 0x106e0301,
 0x40820000,
-0x00050843,
+0x00050844,
 0x00000000,
 0x1003ba34,
 0x3a8efff8,
 0x40800000,
-0x00050843,
+0x00050844,
 0x80030000,
 0x00098200,
 0x39800000,
@@ -1955,31 +1967,31 @@ static const unsigned int build_actionlist[4961] = {
 0x7d8c489e,
 0x10740321,
 0x48000000,
-0x00050044,
-0x00060075,
+0x00050045,
+0x00060076,
 0x80110000,
 0x00098200,
 0x81110000,
 0x00098200,
 0x7c004040,
 0x40800001,
-0x0005084c,
+0x0005084d,
 0x280b0008,
 0x106e0301,
 0x40820000,
-0x00050843,
+0x00050844,
 0x1003b232,
 0x38910000,
 0x00098200,
 0x40800000,
-0x00050843,
+0x00050844,
 0x10001afa,
 0x38a00001,
 0x280000ff,
 0x98040000,
 0x41810000,
-0x00050843,
-0x00060076,
+0x00050844,
+0x00060077,
 0x7e439378,
 0x91d20000,
 0x00098200,
@@ -1990,8 +2002,8 @@ static const unsigned int build_actionlist[4961] = {
 0x00098200,
 0x10771a2d,
 0x48000000,
-0x00050046,
-0x00060077,
+0x00050047,
+0x00060078,
 0x80110000,
 0x00098200,
 0x81110000,
@@ -1999,28 +2011,28 @@ static const unsigned int build_actionlist[4961] = {
 0x00000000,
 0x7c004040,
 0x40800001,
-0x0005084c,
+0x0005084d,
 0x280b0010,
 0x10ae1301,
 0x106e0301,
 0x41800000,
-0x00050843,
+0x00050844,
 0x108e0b01,
 0x3920ffff,
 0x41820000,
 0x00050801,
 0x1005b232,
 0x40800000,
-0x00050843,
+0x00050844,
 0x11202afa,
 0x0006000b,
 0x1004b232,
 0x40800000,
-0x00050843,
+0x00050844,
 0x1003ba34,
 0x110022fa,
 0x40800000,
-0x00050843,
+0x00050844,
 0x80030000,
 0x00098200,
 0x7c004840,
@@ -2040,7 +2052,7 @@ static const unsigned int build_actionlist[4961] = {
 0x7c844214,
 0x7ca0281e,
 0x48000000,
-0x00050076,
+0x00050077,
 0x0006000f,
 0x7c004800,
 0x38c60001,
@@ -2054,27 +2066,27 @@ static const unsigned int build_actionlist[4961] = {
 0x39080001,
 0x48000000,
 0x0005000d,
-0x00060078,
+0x00060079,
 0x80110000,
 0x00098200,
 0x81110000,
 0x00098200,
 0x7c004040,
 0x40800001,
-0x0005084c,
+0x0005084d,
 0x00000000,
 0x280b0010,
 0x106e0301,
 0x108e0b01,
 0x41800000,
-0x00050843,
+0x00050844,
 0x1004b232,
 0x40800000,
-0x00050843,
+0x00050844,
 0x1003ba34,
 0x10a022fa,
 0x40800000,
-0x00050843,
+0x00050844,
 0x80030000,
 0x00098200,
 0x2c050000,
@@ -2088,13 +2100,13 @@ static const unsigned int build_actionlist[4961] = {
 0x00050802,
 0x7c882840,
 0x40820000,
-0x00050843,
+0x00050844,
 0x88030000,
 0x00098200,
 0x80910000,
 0x00098200,
 0x41840000,
-0x00050843,
+0x00050844,
 0x0006000b,
 0x28090000,
 0x7c0449ae,
@@ -2102,31 +2114,31 @@ static const unsigned int build_actionlist[4961] = {
 0x40820000,
 0x0005080b,
 0x48000000,
-0x00050076,
+0x00050077,
 0x0006000c,
 0x38710000,
 0x00098200,
 0x10771a2d,
 0x48000000,
-0x00050046,
-0x00060079,
+0x00050047,
+0x0006007a,
 0x80110000,
 0x00098200,
 0x81110000,
 0x00098200,
 0x7c004040,
 0x40800001,
-0x0005084c,
+0x0005084d,
 0x280b0008,
 0x106e0301,
 0x41800000,
-0x00050843,
+0x00050844,
 0x00000000,
 0x1003ba34,
 0x81110000,
 0x00098200,
 0x40800000,
-0x00050843,
+0x00050844,
 0x80a30000,
 0x00098200,
 0x38630000,
@@ -2137,34 +2149,34 @@ static const unsigned int build_actionlist[4961] = {
 0x7c082840,
 0x38c5ffff,
 0x41800000,
-0x00050843,
+0x00050844,
 0x0006000b,
 0x2c060000,
 0x7d0348ae,
 0x41800000,
-0x00050876,
+0x00050877,
 0x7d0431ae,
 0x38c6ffff,
 0x39290001,
 0x48000000,
 0x0005000b,
-0x0006007a,
+0x0006007b,
 0x80110000,
 0x00098200,
 0x81110000,
 0x00098200,
 0x7c004040,
 0x40800001,
-0x0005084c,
+0x0005084d,
 0x280b0008,
 0x106e0301,
 0x41800000,
-0x00050843,
+0x00050844,
 0x1003ba34,
 0x81110000,
 0x00098200,
 0x40800000,
-0x00050843,
+0x00050844,
 0x80a30000,
 0x00098200,
 0x38630000,
@@ -2174,12 +2186,12 @@ static const unsigned int build_actionlist[4961] = {
 0x7c082840,
 0x39200000,
 0x41800000,
-0x00050843,
+0x00050844,
 0x0006000b,
 0x7c092840,
 0x7d0348ae,
 0x40800000,
-0x00050876,
+0x00050877,
 0x00000000,
 0x3808ffbf,
 0x69060020,
@@ -2189,23 +2201,23 @@ static const unsigned int build_actionlist[4961] = {
 0x39290001,
 0x48000000,
 0x0005000b,
-0x0006007b,
+0x0006007c,
 0x80110000,
 0x00098200,
 0x81110000,
 0x00098200,
 0x7c004040,
 0x40800001,
-0x0005084c,
+0x0005084d,
 0x280b0008,
 0x106e0301,
 0x41800000,
-0x00050843,
+0x00050844,
 0x1003ba34,
 0x81110000,
 0x00098200,
 0x40800000,
-0x00050843,
+0x00050844,
 0x80a30000,
 0x00098200,
 0x38630000,
@@ -2215,12 +2227,12 @@ static const unsigned int build_actionlist[4961] = {
 0x7c082840,
 0x39200000,
 0x41800000,
-0x00050843,
+0x00050844,
 0x0006000b,
 0x7c092840,
 0x7d0348ae,
 0x40800000,
-0x00050876,
+0x00050877,
 0x3808ff9f,
 0x69060020,
 0x2800001a,
@@ -2229,41 +2241,41 @@ static const unsigned int build_actionlist[4961] = {
 0x39290001,
 0x48000000,
 0x0005000b,
-0x0006007c,
+0x0006007d,
 0x280b0008,
 0x106e0301,
 0x41800000,
-0x00050843,
+0x00050844,
 0x1003c234,
 0x40800000,
-0x00050843,
+0x00050844,
 0x48000001,
 0x00030022,
 0x10601af1,
 0x48000000,
-0x00050046,
-0x0006007d,
+0x00050047,
+0x0006007e,
 0x280b0008,
 0x106e0301,
 0x41800000,
-0x00050843,
+0x00050844,
 0x00000000,
 0x1003b232,
 0x40800000,
-0x00050843,
+0x00050844,
 0x1063dae0,
-0x0006007e,
+0x0006007f,
 0x10601af1,
 0x48000000,
-0x00050046,
-0x0006007f,
+0x00050047,
+0x00060080,
 0x280b0008,
 0x106e0301,
 0x41800000,
-0x00050843,
+0x00050844,
 0x1003b232,
 0x40800000,
-0x00050843,
+0x00050844,
 0x1063dae0,
 0x39000008,
 0x0006000b,
@@ -2271,22 +2283,22 @@ static const unsigned int build_actionlist[4961] = {
 0x7c885840,
 0x1004b232,
 0x40840000,
-0x0005087e,
+0x0005087f,
 0x40800000,
-0x00050843,
+0x00050844,
 0x1084dae0,
 0x7c632038,
 0x39080008,
 0x48000000,
 0x0005000b,
-0x00060080,
+0x00060081,
 0x280b0008,
 0x106e0301,
 0x41800000,
-0x00050843,
+0x00050844,
 0x1003b232,
 0x40800000,
-0x00050843,
+0x00050844,
 0x1063dae0,
 0x39000008,
 0x0006000b,
@@ -2294,22 +2306,22 @@ static const unsigned int build_actionlist[4961] = {
 0x7c885840,
 0x1004b232,
 0x40840000,
-0x0005087e,
+0x0005087f,
 0x40800000,
-0x00050843,
+0x00050844,
 0x1084dae0,
 0x7c632378,
 0x39080008,
 0x48000000,
 0x0005000b,
-0x00060081,
+0x00060082,
 0x280b0008,
 0x106e0301,
 0x41800000,
-0x00050843,
+0x00050844,
 0x1003b232,
 0x40800000,
-0x00050843,
+0x00050844,
 0x1063dae0,
 0x39000008,
 0x0006000b,
@@ -2317,129 +2329,129 @@ static const unsigned int build_actionlist[4961] = {
 0x7c885840,
 0x1004b232,
 0x40840000,
-0x0005087e,
+0x0005087f,
 0x00000000,
 0x40800000,
-0x00050843,
+0x00050844,
 0x1084dae0,
 0x7c632278,
 0x39080008,
 0x48000000,
 0x0005000b,
-0x00060082,
+0x00060083,
 0x280b0008,
 0x106e0301,
 0x41800000,
-0x00050843,
+0x00050844,
 0x1003b232,
 0x40800000,
-0x00050843,
+0x00050844,
 0x1063dae0,
 0x5460403e,
 0x5060c00e,
 0x5060c42e,
 0x106002f1,
 0x48000000,
-0x00050046,
-0x00060083,
+0x00050047,
+0x00060084,
 0x280b0008,
 0x106e0301,
 0x41800000,
-0x00050843,
+0x00050844,
 0x1003b232,
 0x40800000,
-0x00050843,
+0x00050844,
 0x1063dae0,
 0x7c6018f8,
 0x106002f1,
 0x48000000,
-0x00050046,
-0x00060084,
+0x00050047,
+0x00060085,
 0x280b0010,
 0x106e0301,
 0x108e0b01,
 0x41800000,
-0x00050843,
+0x00050844,
 0x1003222c,
 0x1000b232,
 0x40830000,
-0x00050843,
+0x00050844,
 0x1084dae0,
 0x1063dae0,
 0x548406fe,
 0x7c602030,
 0x106002f1,
 0x48000000,
-0x00050046,
-0x00060085,
+0x00050047,
+0x00060086,
 0x280b0010,
 0x106e0301,
 0x108e0b01,
 0x41800000,
-0x00050843,
+0x00050844,
 0x1003222c,
 0x1000b232,
 0x40830000,
-0x00050843,
+0x00050844,
 0x1084dae0,
 0x1063dae0,
 0x548406fe,
 0x7c602430,
 0x106002f1,
 0x48000000,
-0x00050046,
-0x00060086,
+0x00050047,
+0x00060087,
 0x280b0010,
 0x106e0301,
 0x108e0b01,
 0x41800000,
-0x00050843,
+0x00050844,
 0x1003222c,
 0x1000b232,
 0x40830000,
-0x00050843,
+0x00050844,
 0x1084dae0,
 0x1063dae0,
 0x548406fe,
 0x7c602630,
 0x106002f1,
 0x48000000,
-0x00050046,
-0x00060087,
+0x00050047,
+0x00060088,
 0x00000000,
 0x280b0010,
 0x106e0301,
 0x108e0b01,
 0x41800000,
-0x00050843,
+0x00050844,
 0x1003222c,
 0x1000b232,
 0x40830000,
-0x00050843,
+0x00050844,
 0x1084dae0,
 0x1063dae0,
 0x5c60203e,
 0x106002f1,
 0x48000000,
-0x00050046,
-0x00060088,
+0x00050047,
+0x00060089,
 0x280b0010,
 0x106e0301,
 0x108e0b01,
 0x41800000,
-0x00050843,
+0x00050844,
 0x1003222c,
 0x1000b232,
 0x40830000,
-0x00050843,
+0x00050844,
 0x1084dae0,
 0x1063dae0,
 0x7c8400d0,
 0x5c60203e,
 0x106002f1,
 0x48000000,
-0x00050046,
-0x00060043,
+0x00050047,
+0x00060044,
 0x80ca0000,
 0x00098200,
 0x7d0e5a14,
@@ -2466,7 +2478,7 @@ static const unsigned int build_actionlist[4961] = {
 0x000900a1,
 0x3a8efff8,
 0x41810000,
-0x00050844,
+0x00050845,
 0x0006000b,
 0x80120000,
 0x00098200,
@@ -2507,7 +2519,7 @@ static const unsigned int build_actionlist[4961] = {
 0x7c000000,
 0x48000000,
 0x0005000b,
-0x0006004c,
+0x0006004d,
 0x7ea802a6,
 0x91d20000,
 0x00098200,
@@ -2526,11 +2538,11 @@ static const unsigned int build_actionlist[4961] = {
 0x7d6e0050,
 0x814efffc,
 0x4e800020,
-0x00060089,
+0x0006008a,
 0x00000000,
 0x7c810808,
 0x00000000,
-0x0006008a,
+0x0006008b,
 0x88d10000,
 0x00098200,
 0x70c00000,
@@ -2543,7 +2555,7 @@ static const unsigned int build_actionlist[4961] = {
 0x7c11402e,
 0x7c0903a6,
 0x4e800420,
-0x0006008b,
+0x0006008c,
 0x88d10000,
 0x00098200,
 0x81310000,
@@ -2588,22 +2600,22 @@ static const unsigned int build_actionlist[4961] = {
 0x54eb9d78,
 0x7c0903a6,
 0x4e800420,
-0x0006008c,
+0x0006008d,
 0x3a100004,
 0x826affec,
 0x48000000,
 0x0005000e,
-0x0006008d,
+0x0006008e,
 0x00000000,
 0x7c810808,
 0x00000000,
-0x0006008e,
+0x0006008f,
 0x7e048378,
 0x00000000,
 0x48000000,
 0x00050001,
 0x00000000,
-0x0006008f,
+0x00060090,
 0x00000000,
 0x62040001,
 0x0006000b,
@@ -2628,24 +2640,24 @@ static const unsigned int build_actionlist[4961] = {
 0x814efffc,
 0x7c6903a6,
 0x4e800420,
-0x00060090,
+0x00060091,
 0x00000000,
 0x7c810808,
 0x00000000,
-0x00060091,
+0x00060092,
 0x00000000,
 0x7c810808,
 0x00000000,
-0x00060092,
+0x00060093,
 0x7ca802a6,
 0x48000001,
-0x00050059,
+0x0005005a,
 0x7ca803a6,
 0x1064222c,
 0x4e800020,
-0x00060093,
+0x00060094,
 0x1064222c,
-0x00060059,
+0x0006005a,
 0x5469657e,
 0x3529fc01,
 0x3900ffff,
@@ -2681,9 +2693,9 @@ static const unsigned int build_actionlist[4961] = {
 0x5103007e,
 0x1083022d,
 0x4e800020,
-0x00060094,
+0x00060095,
 0x1064222c,
-0x0006005b,
+0x0006005c,
 0x5469657e,
 0x3529fc01,
 0x3900ffff,
@@ -2720,9 +2732,9 @@ static const unsigned int build_actionlist[4961] = {
 0x1083022d,
 0x4e800020,
 0x00000000,
-0x00060095,
-0x1064222c,
 0x00060096,
+0x1064222c,
+0x00060097,
 0x5469657e,
 0x3529fc01,
 0x3900ffff,
@@ -2743,18 +2755,18 @@ static const unsigned int build_actionlist[4961] = {
 0x1088022d,
 0x4e800020,
 0x00000000,
-0x00060095,
 0x00060096,
-0x00000000,
 0x00060097,
 0x00000000,
-0x7c810808,
-0x00000000,
 0x00060098,
 0x00000000,
 0x7c810808,
 0x00000000,
 0x00060099,
+0x00000000,
+0x7c810808,
+0x00000000,
+0x0006009a,
 0x1083222d,
 0x28070001,
 0x10c5322d,
@@ -2793,7 +2805,7 @@ static const unsigned int build_actionlist[4961] = {
 0x11463217,
 0x7d6802a6,
 0x48000001,
-0x00050093,
+0x00050094,
 0x7d6803a6,
 0x108452e8,
 0x108522e1,
@@ -2815,7 +2827,7 @@ static const unsigned int build_actionlist[4961] = {
 0x4e800020,
 0x0006000c,
 0x7c810808,
-0x0006009a,
+0x0006009b,
 0x00000000,
 0x7c810808,
 0x00000000,
@@ -3125,11 +3137,30 @@ static const unsigned int build_actionlist[4961] = {
 0x1003c234,
 0x40800000,
 0x0005083e,
+0x00000000,
+0x81230000,
+0x00098200,
+0x28090000,
+0x40820000,
+0x00050809,
+0x0006000d,
+0x00000000,
+0x0006003f,
 0x48000001,
 0x00030022,
 0x48000000,
 0x0005000b,
 0x00000000,
+0x00060013,
+0x88090000,
+0x00098200,
+0x70000000,
+0x00090200,
+0x40820000,
+0x0005080d,
+0x48000000,
+0x0005003e,
+0x00000000,
 0x100e5300,
 0x1000b232,
 0x110f5b00,
@@ -3277,10 +3308,10 @@ static const unsigned int build_actionlist[4961] = {
 0x40830000,
 0x0005083d,
 0x00000000,
-0x0006009b,
+0x0006009c,
 0x108caae9,
 0x48000001,
-0x00050093,
+0x00050094,
 0x1004aae8,
 0x80f00000,
 0x3a100004,
@@ -3315,7 +3346,7 @@ static const unsigned int build_actionlist[4961] = {
 0x0005083d,
 0x00000000,
 0x48000000,
-0x0005009b,
+0x0005009c,
 0x00000000,
 0x108e5300,
 0x10ce5b00,
@@ -3750,10 +3781,10 @@ static const unsigned int build_actionlist[4961] = {
 0x7d6f402e,
 0x00000000,
 0x48000000,
-0x0005009c,
+0x0005009d,
 0x00000000,
 0x48000000,
-0x0005009d,
+0x0005009e,
 0x00000000,
 0x114e5300,
 0x116e5b00,
@@ -3809,7 +3840,7 @@ static const unsigned int build_actionlist[4961] = {
 0x0006000f,
 0x100bba34,
 0x41800000,
-0x0005089c,
+0x0005089d,
 0x48000000,
 0x0005002f,
 0x00000000,
@@ -3821,7 +3852,7 @@ static const unsigned int build_actionlist[4961] = {
 0x7d6f402e,
 0x40800000,
 0x0005082c,
-0x0006009c,
+0x0006009d,
 0x800a0000,
 0x00098200,
 0x810b0000,
@@ -3988,7 +4019,7 @@ static const unsigned int build_actionlist[4961] = {
 0x0006000f,
 0x100bba34,
 0x41800000,
-0x0005089d,
+0x0005089e,
 0x48000000,
 0x00050033,
 0x00060011,
@@ -4013,7 +4044,7 @@ static const unsigned int build_actionlist[4961] = {
 0x7d6f402e,
 0x40800000,
 0x00050830,
-0x0006009d,
+0x0006009e,
 0x800a0000,
 0x00098200,
 0x810b0000,
@@ -4292,8 +4323,8 @@ static const unsigned int build_actionlist[4961] = {
 0x100aca34,
 0x3a940008,
 0x40800000,
-0x0005083f,
-0x00060040,
+0x00050840,
+0x00060041,
 0x71000000,
 0x00090200,
 0x88ca0000,
@@ -4614,7 +4645,7 @@ static const unsigned int build_actionlist[4961] = {
 0x6a080000,
 0x00090200,
 0x40820000,
-0x0005089e,
+0x0005089f,
 0x00060017,
 0x80f0fffc,
 0x2c0c0008,
@@ -4665,7 +4696,7 @@ static const unsigned int build_actionlist[4961] = {
 0x13494320,
 0x48000000,
 0x0005000f,
-0x0006009e,
+0x0006009f,
 0x71090000,
 0x00090200,
 0x40820000,
@@ -4683,7 +4714,7 @@ static const unsigned int build_actionlist[4961] = {
 0x6a080000,
 0x00090200,
 0x40820000,
-0x0005089e,
+0x0005089f,
 0x80f0fffc,
 0x392efff8,
 0x54ea5d78,
@@ -4735,7 +4766,7 @@ static const unsigned int build_actionlist[4961] = {
 0x4c00e382,
 0x4c002382,
 0x41800000,
-0x00050841,
+0x00050842,
 0x00000000,
 0x110832e0,
 0x11140321,
@@ -5020,6 +5051,7 @@ enum {
   GLOB_vmeta_unm,
   GLOB_vmeta_arith_vv,
   GLOB_vmeta_len,
+  GLOB_BC_LEN_Z,
   GLOB_vmeta_callt,
   GLOB_BC_CALLT_Z,
   GLOB_vmeta_for,
@@ -5162,6 +5194,7 @@ static const char *const globnames[] = {
   "vmeta_unm",
   "vmeta_arith_vv",
   "vmeta_len",
+  "BC_LEN_Z",
   "vmeta_callt",
   "BC_CALLT_Z",
   "vmeta_for",
@@ -5341,96 +5374,106 @@ static void build_subroutines(BuildCtx *ctx)
   dasm_put(Dst, 481, DISPATCH_GL(tmptv), DISPATCH_GL(tmptv), DISPATCH_GL(tmptv2), DISPATCH_GL(tmptv), Dt1(->base), FRAME_CONT, Dt1(->top), DISPATCH_GL(tmptv));
   dasm_put(Dst, 556, DISPATCH_GL(tmptv), DISPATCH_GL(tmptv2), DISPATCH_GL(tmptv), Dt1(->base), FRAME_CONT, Dt1(->top), Dt1(->base));
   dasm_put(Dst, 637, -(BCBIAS_J*4 >> 16), LJ_TTRUE, LJ_TFALSE, Dt1(->base));
-  dasm_put(Dst, 706, Dt1(->base), FRAME_CONT, Dt1(->base), Dt1(->base), Dt7(->pc), Dt1(->base), Dt1(->base));
+  dasm_put(Dst, 706, Dt1(->base), FRAME_CONT);
+#ifdef LUAJIT_ENABLE_LUA52COMPAT
+  dasm_put(Dst, 728);
+#endif
+  dasm_put(Dst, 730, Dt1(->base));
+#ifdef LUAJIT_ENABLE_LUA52COMPAT
+  dasm_put(Dst, 738);
+#else
+  dasm_put(Dst, 745);
+#endif
+  dasm_put(Dst, 748, Dt1(->base), Dt7(->pc), Dt1(->base), Dt1(->base));
 #if LJ_HASJIT
-  dasm_put(Dst, 784);
+  dasm_put(Dst, 796);
 #endif
-  dasm_put(Dst, 786);
+  dasm_put(Dst, 798);
 #if LJ_HASJIT
-  dasm_put(Dst, 788, BC_JFORI);
+  dasm_put(Dst, 800, BC_JFORI);
 #endif
-  dasm_put(Dst, 791);
+  dasm_put(Dst, 803);
 #if LJ_HASJIT
-  dasm_put(Dst, 793, BC_JFORI);
+  dasm_put(Dst, 805, BC_JFORI);
 #endif
-  dasm_put(Dst, 796, BC_FORI, ~LJ_TNUMX, 31-3, Dt8(->upvalue), Dt6(->metatable), DISPATCH_GL(gcroot[GCROOT_MMNAME+MM_metatable]));
-  dasm_put(Dst, 861, Dt6(->hmask), Dt5(->hash), Dt6(->node), 31-5, 31-3, DtB(->key), DtB(->val), DtB(->next), LJ_TUDATA, 31-2, 4*~LJ_TNUMX, DISPATCH_GL(gcroot[GCROOT_BASEMT]));
-  dasm_put(Dst, 917, Dt6(->metatable), Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->marked), Dt6(->gclist));
-  dasm_put(Dst, 977, DISPATCH_GL(gcroot[GCROOT_BASEMT_NUM]), Dt1(->base), DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), Dt1(->top), (2+1)*8);
+  dasm_put(Dst, 808, BC_FORI, ~LJ_TNUMX, 31-3, Dt8(->upvalue), Dt6(->metatable), DISPATCH_GL(gcroot[GCROOT_MMNAME+MM_metatable]));
+  dasm_put(Dst, 873, Dt6(->hmask), Dt5(->hash), Dt6(->node), 31-5, 31-3, DtB(->key), DtB(->val), DtB(->next), LJ_TUDATA, 31-2, 4*~LJ_TNUMX, DISPATCH_GL(gcroot[GCROOT_BASEMT]));
+  dasm_put(Dst, 929, Dt6(->metatable), Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->marked), Dt6(->gclist));
+  dasm_put(Dst, 989, DISPATCH_GL(gcroot[GCROOT_BASEMT_NUM]), Dt1(->base), DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), Dt1(->top), (2+1)*8);
 #ifdef LUAJIT_ENABLE_LUA52COMPAT
-  dasm_put(Dst, 1050, Dt6(->metatable), Dt8(->upvalue[0]));
+  dasm_put(Dst, 1062, Dt6(->metatable), Dt8(->upvalue[0]));
 #else
-  dasm_put(Dst, 1059, Dt8(->upvalue[0]));
+  dasm_put(Dst, 1071, Dt8(->upvalue[0]));
 #endif
-  dasm_put(Dst, 1063, (3+1)*8, Dt6(->asize), Dt6(->array), 31-3, (0+1)*8, (2+1)*8, Dt6(->hmask), (0+1)*8, (0+1)*8);
-  dasm_put(Dst, 1127);
+  dasm_put(Dst, 1075, (3+1)*8, Dt6(->asize), Dt6(->array), 31-3, (0+1)*8, (2+1)*8, Dt6(->hmask), (0+1)*8, (0+1)*8);
+  dasm_put(Dst, 1139);
 #ifdef LUAJIT_ENABLE_LUA52COMPAT
-  dasm_put(Dst, 1140, Dt6(->metatable), Dt8(->upvalue[0]));
+  dasm_put(Dst, 1152, Dt6(->metatable), Dt8(->upvalue[0]));
 #else
-  dasm_put(Dst, 1149, Dt8(->upvalue[0]));
+  dasm_put(Dst, 1161, Dt8(->upvalue[0]));
 #endif
-  dasm_put(Dst, 1153, (3+1)*8, DISPATCH_GL(hookmask), 32-HOOK_ACTIVE_SHIFT, 8+FRAME_PCALL, DISPATCH_GL(hookmask), 32-HOOK_ACTIVE_SHIFT, 16+FRAME_PCALL, LJ_TTHREAD, Dt1(->status), Dt1(->cframe), Dt1(->top));
-  dasm_put(Dst, 1214, LUA_YIELD, Dt1(->base), Dt1(->maxstack), Dt1(->base), Dt1(->top), Dt1(->top), Dt1(->base), LUA_YIELD, Dt1(->top), ~LJ_VMST_INTERP, Dt1(->base), DISPATCH_GL(vmstate), Dt1(->maxstack));
-  dasm_put(Dst, 1277, Dt1(->top), FRAME_TYPE, LJ_TTRUE, FRAME_TYPE, LJ_TFALSE, Dt1(->top), (2+1)*8, 32-3);
-  dasm_put(Dst, 1337, Dt8(->upvalue[0].gcr), Dt1(->status), Dt1(->cframe), Dt1(->top), LUA_YIELD, Dt1(->base), Dt1(->maxstack), Dt1(->base), Dt1(->top), Dt1(->top), Dt1(->base), LUA_YIELD, Dt1(->top), ~LJ_VMST_INTERP);
-  dasm_put(Dst, 1396, Dt1(->base), DISPATCH_GL(vmstate), Dt1(->maxstack), Dt1(->top), FRAME_TYPE, 32-3, Dt1(->cframe));
-  dasm_put(Dst, 1453, Dt1(->base), CFRAME_RESUME, Dt1(->top), LUA_YIELD, Dt1(->cframe), Dt1(->status), (1+1)*8, FRAME_TYPE);
-  dasm_put(Dst, 1518);
-  dasm_put(Dst, 1587);
-  dasm_put(Dst, 1650);
-  dasm_put(Dst, 1715);
-  dasm_put(Dst, 1785, Dt8(->upvalue[0]), DISPATCH_GL(tmptv), DISPATCH_GL(tmptv), (2+1)*8, (2+1)*8);
-  dasm_put(Dst, 1857, Dt5(->len));
-  dasm_put(Dst, 1924, Dt5(->len), (0+1)*8, Dt5([1]), (1+1)*8, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), DISPATCH_GL(tmptv), Dt1(->base), Dt1(->base), DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold));
-  dasm_put(Dst, 1984, Dt5(->len), sizeof(GCstr)-1, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold));
-  dasm_put(Dst, 2050, Dt5(->len), DISPATCH_GL(tmpbuf.sz), Dt5([1]), DISPATCH_GL(tmpbuf.buf), DISPATCH_GL(strempty), DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold));
-  dasm_put(Dst, 2109, DISPATCH_GL(tmpbuf.sz), Dt5(->len), sizeof(GCstr), DISPATCH_GL(tmpbuf.buf), DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), DISPATCH_GL(tmpbuf.sz), Dt5(->len), sizeof(GCstr), DISPATCH_GL(tmpbuf.buf));
-  dasm_put(Dst, 2168, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), DISPATCH_GL(tmpbuf.sz), Dt5(->len), sizeof(GCstr), DISPATCH_GL(tmpbuf.buf));
-  dasm_put(Dst, 2235);
-  dasm_put(Dst, 2306);
-  dasm_put(Dst, 2394, Dt8(->f), 8*LUA_MINSTACK, Dt1(->maxstack), Dt1(->base), Dt1(->top), Dt1(->base), 31-3, Dt1(->top), Dt7(->pc));
-  dasm_put(Dst, 2473, FRAME_TYPE, LUA_MINSTACK, Dt1(->base), Dt1(->base), Dt1(->top), Dt1(->base), Dt1(->top));
+  dasm_put(Dst, 1165, (3+1)*8, DISPATCH_GL(hookmask), 32-HOOK_ACTIVE_SHIFT, 8+FRAME_PCALL, DISPATCH_GL(hookmask), 32-HOOK_ACTIVE_SHIFT, 16+FRAME_PCALL, LJ_TTHREAD, Dt1(->status), Dt1(->cframe), Dt1(->top));
+  dasm_put(Dst, 1226, LUA_YIELD, Dt1(->base), Dt1(->maxstack), Dt1(->base), Dt1(->top), Dt1(->top), Dt1(->base), LUA_YIELD, Dt1(->top), ~LJ_VMST_INTERP, Dt1(->base), DISPATCH_GL(vmstate), Dt1(->maxstack));
+  dasm_put(Dst, 1289, Dt1(->top), FRAME_TYPE, LJ_TTRUE, FRAME_TYPE, LJ_TFALSE, Dt1(->top), (2+1)*8, 32-3);
+  dasm_put(Dst, 1349, Dt8(->upvalue[0].gcr), Dt1(->status), Dt1(->cframe), Dt1(->top), LUA_YIELD, Dt1(->base), Dt1(->maxstack), Dt1(->base), Dt1(->top), Dt1(->top), Dt1(->base), LUA_YIELD, Dt1(->top), ~LJ_VMST_INTERP);
+  dasm_put(Dst, 1408, Dt1(->base), DISPATCH_GL(vmstate), Dt1(->maxstack), Dt1(->top), FRAME_TYPE, 32-3, Dt1(->cframe));
+  dasm_put(Dst, 1465, Dt1(->base), CFRAME_RESUME, Dt1(->top), LUA_YIELD, Dt1(->cframe), Dt1(->status), (1+1)*8, FRAME_TYPE);
+  dasm_put(Dst, 1530);
+  dasm_put(Dst, 1599);
+  dasm_put(Dst, 1662);
+  dasm_put(Dst, 1727);
+  dasm_put(Dst, 1797, Dt8(->upvalue[0]), DISPATCH_GL(tmptv), DISPATCH_GL(tmptv), (2+1)*8, (2+1)*8);
+  dasm_put(Dst, 1869, Dt5(->len));
+  dasm_put(Dst, 1936, Dt5(->len), (0+1)*8, Dt5([1]), (1+1)*8, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), DISPATCH_GL(tmptv), Dt1(->base), Dt1(->base), DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold));
+  dasm_put(Dst, 1996, Dt5(->len), sizeof(GCstr)-1, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold));
+  dasm_put(Dst, 2062, Dt5(->len), DISPATCH_GL(tmpbuf.sz), Dt5([1]), DISPATCH_GL(tmpbuf.buf), DISPATCH_GL(strempty), DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold));
+  dasm_put(Dst, 2121, DISPATCH_GL(tmpbuf.sz), Dt5(->len), sizeof(GCstr), DISPATCH_GL(tmpbuf.buf), DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), DISPATCH_GL(tmpbuf.sz), Dt5(->len), sizeof(GCstr), DISPATCH_GL(tmpbuf.buf));
+  dasm_put(Dst, 2180, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), DISPATCH_GL(tmpbuf.sz), Dt5(->len), sizeof(GCstr), DISPATCH_GL(tmpbuf.buf));
+  dasm_put(Dst, 2247);
+  dasm_put(Dst, 2318);
+  dasm_put(Dst, 2406, Dt8(->f), 8*LUA_MINSTACK, Dt1(->maxstack), Dt1(->base), Dt1(->top), Dt1(->base), 31-3, Dt1(->top), Dt7(->pc));
+  dasm_put(Dst, 2485, FRAME_TYPE, LUA_MINSTACK, Dt1(->base), Dt1(->base), Dt1(->top), Dt1(->base), Dt1(->top));
 #if LJ_HASJIT
-  dasm_put(Dst, 2515);
+  dasm_put(Dst, 2527);
 #endif
-  dasm_put(Dst, 2517, DISPATCH_GL(hookmask), HOOK_ACTIVE, GG_DISP2STATIC, DISPATCH_GL(hookmask), DISPATCH_GL(hookcount), HOOK_ACTIVE, 31-LUA_HOOKLINE, DISPATCH_GL(hookcount), Dt1(->base), Dt1(->base));
-  dasm_put(Dst, 2564, GG_DISP2STATIC);
+  dasm_put(Dst, 2529, DISPATCH_GL(hookmask), HOOK_ACTIVE, GG_DISP2STATIC, DISPATCH_GL(hookmask), DISPATCH_GL(hookcount), HOOK_ACTIVE, 31-LUA_HOOKLINE, DISPATCH_GL(hookcount), Dt1(->base), Dt1(->base));
+  dasm_put(Dst, 2576, GG_DISP2STATIC);
 #if LJ_HASJIT
-  dasm_put(Dst, 2582);
+  dasm_put(Dst, 2594);
 #endif
-  dasm_put(Dst, 2584);
+  dasm_put(Dst, 2596);
 #if LJ_HASJIT
-  dasm_put(Dst, 2587);
+  dasm_put(Dst, 2599);
 #endif
-  dasm_put(Dst, 2590);
+  dasm_put(Dst, 2602);
 #if LJ_HASJIT
-  dasm_put(Dst, 2592);
+  dasm_put(Dst, 2604);
 #endif
-  dasm_put(Dst, 2595, Dt1(->base), Dt1(->top), Dt1(->base), Dt1(->top));
+  dasm_put(Dst, 2607, Dt1(->base), Dt1(->top), Dt1(->base), Dt1(->top));
 #if LJ_HASJIT
-  dasm_put(Dst, 2617);
+  dasm_put(Dst, 2629);
 #endif
-  dasm_put(Dst, 2619);
+  dasm_put(Dst, 2631);
 #if LJ_HASJIT
-  dasm_put(Dst, 2621);
+  dasm_put(Dst, 2633);
 #endif
-  dasm_put(Dst, 2623);
+  dasm_put(Dst, 2635);
 #if LJ_HASJIT
-  dasm_put(Dst, 2707);
+  dasm_put(Dst, 2719);
 #else
-  dasm_put(Dst, 2730);
+  dasm_put(Dst, 2742);
 #endif
-  dasm_put(Dst, 2733);
+  dasm_put(Dst, 2745);
 #if LJ_HASJIT
-  dasm_put(Dst, 2735);
+  dasm_put(Dst, 2747);
 #endif
-  dasm_put(Dst, 2737);
+  dasm_put(Dst, 2749);
 #if LJ_HASJIT
-  dasm_put(Dst, 2739);
+  dasm_put(Dst, 2751);
 #endif
-  dasm_put(Dst, 2741);
+  dasm_put(Dst, 2753);
 #if LJ_HASFFI
-  dasm_put(Dst, 2804);
+  dasm_put(Dst, 2816);
 #endif
 }
 
@@ -5438,7 +5481,7 @@ static void build_subroutines(BuildCtx *ctx)
 static void build_ins(BuildCtx *ctx, BCOp op, int defop)
 {
   int vk = 0;
-  dasm_put(Dst, 2806, defop);
+  dasm_put(Dst, 2818, defop);
 
   switch (op) {
 
@@ -5447,112 +5490,119 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop)
   /* 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, 2808, -(BCBIAS_J*4 >> 16));
+    dasm_put(Dst, 2820, -(BCBIAS_J*4 >> 16));
     if (op == BC_ISLE || op == BC_ISGT) {
-      dasm_put(Dst, 2822);
+      dasm_put(Dst, 2834);
     }
     if (op == BC_ISLT || op == BC_ISLE) {
-      dasm_put(Dst, 2825);
+      dasm_put(Dst, 2837);
     } else {
-      dasm_put(Dst, 2827);
+      dasm_put(Dst, 2839);
     }
-    dasm_put(Dst, 2829);
+    dasm_put(Dst, 2841);
     break;
 
   case BC_ISEQV: case BC_ISNEV:
     vk = op == BC_ISEQV;
-    dasm_put(Dst, 2840, -(BCBIAS_J*4 >> 16));
+    dasm_put(Dst, 2852, -(BCBIAS_J*4 >> 16));
     if (vk) {
-      dasm_put(Dst, 2854);
+      dasm_put(Dst, 2866);
     } else {
-      dasm_put(Dst, 2856);
+      dasm_put(Dst, 2868);
     }
-    dasm_put(Dst, 2858, ~LJ_TISPRI, ~LJ_TISTABUD);
+    dasm_put(Dst, 2870, ~LJ_TISPRI, ~LJ_TISTABUD);
     if (vk) {
-      dasm_put(Dst, 2880);
+      dasm_put(Dst, 2892);
     } else {
-      dasm_put(Dst, 2882);
+      dasm_put(Dst, 2894);
     }
-    dasm_put(Dst, 2884);
+    dasm_put(Dst, 2896);
     if (vk) {
-      dasm_put(Dst, 2886);
+      dasm_put(Dst, 2898);
     } else {
-      dasm_put(Dst, 2888);
+      dasm_put(Dst, 2900);
     }
-    dasm_put(Dst, 2890, Dt6(->metatable), 1-vk, Dt6(->nomm), 1<<MM_eq);
+    dasm_put(Dst, 2902, Dt6(->metatable), 1-vk, Dt6(->nomm), 1<<MM_eq);
     break;
 
   case BC_ISEQS: case BC_ISNES:
     vk = op == BC_ISEQS;
-    dasm_put(Dst, 2911, 32-1, -(BCBIAS_J*4 >> 16));
+    dasm_put(Dst, 2923, 32-1, -(BCBIAS_J*4 >> 16));
     if (vk) {
-      dasm_put(Dst, 2925);
+      dasm_put(Dst, 2937);
     } else {
-      dasm_put(Dst, 2927);
+      dasm_put(Dst, 2939);
     }
-    dasm_put(Dst, 2929);
+    dasm_put(Dst, 2941);
     break;
 
   case BC_ISEQN: case BC_ISNEN:
     vk = op == BC_ISEQN;
-    dasm_put(Dst, 2940, -(BCBIAS_J*4 >> 16));
+    dasm_put(Dst, 2952, -(BCBIAS_J*4 >> 16));
     if (vk) {
-      dasm_put(Dst, 2954);
+      dasm_put(Dst, 2966);
     } else {
-      dasm_put(Dst, 2957);
+      dasm_put(Dst, 2969);
     }
-    dasm_put(Dst, 2959);
+    dasm_put(Dst, 2971);
     if (!vk) {
-      dasm_put(Dst, 2971);
+      dasm_put(Dst, 2983);
     }
     break;
 
   case BC_ISEQP: case BC_ISNEP:
     vk = op == BC_ISEQP;
-    dasm_put(Dst, 2977, 32-3, -(BCBIAS_J*4 >> 16));
+    dasm_put(Dst, 2989, 32-3, -(BCBIAS_J*4 >> 16));
     if (vk) {
-      dasm_put(Dst, 2989);
+      dasm_put(Dst, 3001);
     } else {
-      dasm_put(Dst, 2991);
+      dasm_put(Dst, 3003);
     }
-    dasm_put(Dst, 2993);
+    dasm_put(Dst, 3005);
     break;
 
   /* -- Unary test and copy ops ------------------------------------------- */
 
   case BC_ISTC: case BC_ISFC: case BC_IST: case BC_ISF:
-    dasm_put(Dst, 3004);
+    dasm_put(Dst, 3016);
     if (op == BC_IST || op == BC_ISF) {
-      dasm_put(Dst, 3010, -(BCBIAS_J*4 >> 16));
+      dasm_put(Dst, 3022, -(BCBIAS_J*4 >> 16));
       if (op == BC_IST) {
-        dasm_put(Dst, 3015);
+        dasm_put(Dst, 3027);
       } else {
-        dasm_put(Dst, 3017);
+        dasm_put(Dst, 3029);
       }
     } else {
       if (op == BC_ISTC) {
-        dasm_put(Dst, 3019);
+        dasm_put(Dst, 3031);
       } else {
-        dasm_put(Dst, 3022);
+        dasm_put(Dst, 3034);
       }
-      dasm_put(Dst, 3025, -(BCBIAS_J*4 >> 16));
+      dasm_put(Dst, 3037, -(BCBIAS_J*4 >> 16));
     }
-    dasm_put(Dst, 3032);
+    dasm_put(Dst, 3044);
     break;
 
   /* -- Unary ops --------------------------------------------------------- */
 
   case BC_MOV:
-    dasm_put(Dst, 3043);
+    dasm_put(Dst, 3055);
     break;
   case BC_NOT:
-    dasm_put(Dst, 3056, LJ_TTRUE);
+    dasm_put(Dst, 3068, LJ_TTRUE);
     break;
   case BC_UNM:
-    dasm_put(Dst, 3072);
+    dasm_put(Dst, 3084);
     break;
   case BC_LEN:
-    dasm_put(Dst, 3089, Dt5(->len));
+    dasm_put(Dst, 3101, Dt5(->len));
+#ifdef LUAJIT_ENABLE_LUA52COMPAT
+    dasm_put(Dst, 3125, Dt6(->metatable));
+#endif
+    dasm_put(Dst, 3132);
+#ifdef LUAJIT_ENABLE_LUA52COMPAT
+    dasm_put(Dst, 3138, Dt6(->nomm), 1<<MM_len);
+#endif
     break;
 
   /* -- Binary ops -------------------------------------------------------- */
@@ -5562,262 +5612,262 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop)
     vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN);
     switch (vk) {
     case 0:
-    dasm_put(Dst, 3117);
+    dasm_put(Dst, 3148);
       break;
     case 1:
-    dasm_put(Dst, 3123);
+    dasm_put(Dst, 3154);
       break;
     default:
-    dasm_put(Dst, 3129);
+    dasm_put(Dst, 3160);
       break;
     }
-    dasm_put(Dst, 3136);
+    dasm_put(Dst, 3167);
     break;
   case BC_SUBVN: case BC_SUBNV: case BC_SUBVV:
     vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN);
     switch (vk) {
     case 0:
-    dasm_put(Dst, 3149);
+    dasm_put(Dst, 3180);
       break;
     case 1:
-    dasm_put(Dst, 3155);
+    dasm_put(Dst, 3186);
       break;
     default:
-    dasm_put(Dst, 3161);
+    dasm_put(Dst, 3192);
       break;
     }
-    dasm_put(Dst, 3168);
+    dasm_put(Dst, 3199);
     break;
   case BC_MULVN: case BC_MULNV: case BC_MULVV:
     vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN);
     switch (vk) {
     case 0:
-    dasm_put(Dst, 3181);
+    dasm_put(Dst, 3212);
       break;
     case 1:
-    dasm_put(Dst, 3187);
+    dasm_put(Dst, 3218);
       break;
     default:
-    dasm_put(Dst, 3193);
+    dasm_put(Dst, 3224);
       break;
     }
-    dasm_put(Dst, 3200);
+    dasm_put(Dst, 3231);
     break;
   case BC_DIVVN: case BC_DIVNV: case BC_DIVVV:
     vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN);
     switch (vk) {
     case 0:
-    dasm_put(Dst, 3213);
+    dasm_put(Dst, 3244);
       break;
     case 1:
-    dasm_put(Dst, 3219);
+    dasm_put(Dst, 3250);
       break;
     default:
-    dasm_put(Dst, 3225);
+    dasm_put(Dst, 3256);
       break;
     }
-    dasm_put(Dst, 3232);
+    dasm_put(Dst, 3263);
     break;
   case BC_MODVN:
     vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN);
     switch (vk) {
     case 0:
-    dasm_put(Dst, 3245);
+    dasm_put(Dst, 3276);
       break;
     case 1:
-    dasm_put(Dst, 3251);
+    dasm_put(Dst, 3282);
       break;
     default:
-    dasm_put(Dst, 3257);
+    dasm_put(Dst, 3288);
       break;
     }
-    dasm_put(Dst, 3264);
+    dasm_put(Dst, 3295);
     break;
   case BC_MODNV: case BC_MODVV:
     vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN);
     switch (vk) {
     case 0:
-    dasm_put(Dst, 3282);
+    dasm_put(Dst, 3313);
       break;
     case 1:
-    dasm_put(Dst, 3288);
+    dasm_put(Dst, 3319);
       break;
     default:
-    dasm_put(Dst, 3294);
+    dasm_put(Dst, 3325);
       break;
     }
-    dasm_put(Dst, 3301);
+    dasm_put(Dst, 3332);
     break;
   case BC_POW:
-    dasm_put(Dst, 3304);
+    dasm_put(Dst, 3335);
     break;
 
   case BC_CAT:
-    dasm_put(Dst, 3326, Dt1(->base), 32-3, Dt1(->base));
+    dasm_put(Dst, 3357, Dt1(->base), 32-3, Dt1(->base));
     break;
 
   /* -- Constant ops ------------------------------------------------------ */
 
   case BC_KSTR:
-    dasm_put(Dst, 3356, 32-1);
+    dasm_put(Dst, 3387, 32-1);
     break;
   case BC_KCDATA:
 #if LJ_HASFFI
-    dasm_put(Dst, 3373, 32-1, LJ_TCDATA);
+    dasm_put(Dst, 3404, 32-1, LJ_TCDATA);
 #endif
     break;
   case BC_KSHORT:
-    dasm_put(Dst, 3392, 32-3);
+    dasm_put(Dst, 3423, 32-3);
     break;
   case BC_KNUM:
-    dasm_put(Dst, 3408);
+    dasm_put(Dst, 3439);
     break;
   case BC_KPRI:
-    dasm_put(Dst, 3421, 32-3);
+    dasm_put(Dst, 3452, 32-3);
     break;
   case BC_KNIL:
-    dasm_put(Dst, 3436);
+    dasm_put(Dst, 3467);
     break;
 
   /* -- Upvalue and function ops ------------------------------------------ */
 
   case BC_UGET:
-    dasm_put(Dst, 3455, 32-1, offsetof(GCfuncL, uvptr), DtA(->v));
+    dasm_put(Dst, 3486, 32-1, offsetof(GCfuncL, uvptr), DtA(->v));
     break;
   case BC_USETV:
-    dasm_put(Dst, 3476, 32-1, offsetof(GCfuncL, uvptr), DtA(->marked), DtA(->v), LJ_GC_BLACK, DtA(->closed), -(LJ_TISNUM+1), LJ_TISGCV - (LJ_TISNUM+1), Dt4(->gch.marked), LJ_GC_WHITES, GG_DISP2G);
+    dasm_put(Dst, 3507, 32-1, offsetof(GCfuncL, uvptr), DtA(->marked), DtA(->v), LJ_GC_BLACK, DtA(->closed), -(LJ_TISNUM+1), LJ_TISGCV - (LJ_TISNUM+1), Dt4(->gch.marked), LJ_GC_WHITES, GG_DISP2G);
     break;
   case BC_USETS:
-    dasm_put(Dst, 3528, 32-1, 32-1, offsetof(GCfuncL, uvptr), DtA(->marked), DtA(->v), LJ_GC_BLACK, Dt5(->marked), DtA(->closed), LJ_GC_WHITES, GG_DISP2G);
+    dasm_put(Dst, 3559, 32-1, 32-1, offsetof(GCfuncL, uvptr), DtA(->marked), DtA(->v), LJ_GC_BLACK, Dt5(->marked), DtA(->closed), LJ_GC_WHITES, GG_DISP2G);
     break;
   case BC_USETN:
-    dasm_put(Dst, 3577, 32-1, offsetof(GCfuncL, uvptr), DtA(->v));
+    dasm_put(Dst, 3608, 32-1, offsetof(GCfuncL, uvptr), DtA(->v));
     break;
   case BC_USETP:
-    dasm_put(Dst, 3598, 32-1, offsetof(GCfuncL, uvptr), 32-3, DtA(->v));
+    dasm_put(Dst, 3629, 32-1, offsetof(GCfuncL, uvptr), 32-3, DtA(->v));
     break;
 
   case BC_UCLO:
-    dasm_put(Dst, 3621, Dt1(->openupval), 32-1, -(BCBIAS_J*4 >> 16), Dt1(->base), Dt1(->base));
+    dasm_put(Dst, 3652, Dt1(->openupval), 32-1, -(BCBIAS_J*4 >> 16), Dt1(->base), Dt1(->base));
     break;
 
   case BC_FNEW:
-    dasm_put(Dst, 3651, 32-1, Dt1(->base), Dt1(->base));
+    dasm_put(Dst, 3682, 32-1, Dt1(->base), Dt1(->base));
     break;
 
   /* -- Table ops --------------------------------------------------------- */
 
   case BC_TNEW:
   case BC_TDUP:
-    dasm_put(Dst, 3677, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base));
+    dasm_put(Dst, 3708, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base));
     if (op == BC_TNEW) {
-      dasm_put(Dst, 3690);
+      dasm_put(Dst, 3721);
     } else {
-      dasm_put(Dst, 3698, 32-1);
+      dasm_put(Dst, 3729, 32-1);
     }
-    dasm_put(Dst, 3705, Dt1(->base));
+    dasm_put(Dst, 3736, Dt1(->base));
     break;
 
   case BC_GGET:
   case BC_GSET:
-    dasm_put(Dst, 3728, 32-1, Dt7(->env));
+    dasm_put(Dst, 3759, 32-1, Dt7(->env));
     if (op == BC_GGET) {
-      dasm_put(Dst, 3736);
+      dasm_put(Dst, 3767);
     } else {
-      dasm_put(Dst, 3739);
+      dasm_put(Dst, 3770);
     }
     break;
 
   case BC_TGETV:
-    dasm_put(Dst, 3742, Dt6(->asize), Dt6(->array), 31-3, Dt6(->metatable), Dt6(->nomm), 1<<MM_index);
+    dasm_put(Dst, 3773, Dt6(->asize), Dt6(->array), 31-3, Dt6(->metatable), Dt6(->nomm), 1<<MM_index);
     break;
   case BC_TGETS:
-    dasm_put(Dst, 3800, 32-1, Dt6(->hmask), Dt5(->hash), Dt6(->node), 31-5, 31-3, DtB(->key), DtB(->val), DtB(->next), Dt6(->metatable), Dt6(->nomm), 1<<MM_index);
-    dasm_put(Dst, 3864);
+    dasm_put(Dst, 3831, 32-1, Dt6(->hmask), Dt5(->hash), Dt6(->node), 31-5, 31-3, DtB(->key), DtB(->val), DtB(->next), Dt6(->metatable), Dt6(->nomm), 1<<MM_index);
+    dasm_put(Dst, 3895);
     break;
   case BC_TGETB:
-    dasm_put(Dst, 3869, 32-3, Dt6(->asize), Dt6(->array), Dt6(->metatable), Dt6(->nomm), 1<<MM_index);
+    dasm_put(Dst, 3900, 32-3, Dt6(->asize), Dt6(->array), Dt6(->metatable), Dt6(->nomm), 1<<MM_index);
     break;
 
   case BC_TSETV:
-    dasm_put(Dst, 3913, Dt6(->asize), Dt6(->array), 31-3, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->nomm), 1<<MM_newindex);
-    dasm_put(Dst, 3980, DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->marked), Dt6(->gclist));
+    dasm_put(Dst, 3944, Dt6(->asize), Dt6(->array), 31-3, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->nomm), 1<<MM_newindex);
+    dasm_put(Dst, 4011, DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->marked), Dt6(->gclist));
     break;
   case BC_TSETS:
-    dasm_put(Dst, 3992, 32-1, Dt6(->hmask), Dt5(->hash), Dt6(->node), Dt6(->nomm), 31-5, 31-3, Dt6(->marked), DtB(->key), DtB(->val), LJ_GC_BLACK, DtB(->val), Dt6(->metatable));
-    dasm_put(Dst, 4053, Dt6(->nomm), 1<<MM_newindex, DtB(->next), Dt6(->metatable), DISPATCH_GL(tmptv), Dt1(->base), Dt6(->nomm), 1<<MM_newindex, Dt1(->base), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain));
-    dasm_put(Dst, 4104, Dt6(->marked), Dt6(->gclist));
+    dasm_put(Dst, 4023, 32-1, Dt6(->hmask), Dt5(->hash), Dt6(->node), Dt6(->nomm), 31-5, 31-3, Dt6(->marked), DtB(->key), DtB(->val), LJ_GC_BLACK, DtB(->val), Dt6(->metatable));
+    dasm_put(Dst, 4084, Dt6(->nomm), 1<<MM_newindex, DtB(->next), Dt6(->metatable), DISPATCH_GL(tmptv), Dt1(->base), Dt6(->nomm), 1<<MM_newindex, Dt1(->base), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain));
+    dasm_put(Dst, 4135, Dt6(->marked), Dt6(->gclist));
     break;
   case BC_TSETB:
-    dasm_put(Dst, 4111, 32-3, Dt6(->asize), Dt6(->array), Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->nomm), 1<<MM_newindex, DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->marked));
-    dasm_put(Dst, 4171, Dt6(->gclist));
+    dasm_put(Dst, 4142, 32-3, Dt6(->asize), Dt6(->array), Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->nomm), 1<<MM_newindex, DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->marked));
+    dasm_put(Dst, 4202, Dt6(->gclist));
     break;
 
   case BC_TSETM:
-    dasm_put(Dst, 4176, 32-3, Dt6(->asize), 31-3, Dt6(->marked), Dt6(->array), LJ_GC_BLACK, Dt1(->base), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->marked), Dt6(->gclist));
-    dasm_put(Dst, 4245);
+    dasm_put(Dst, 4207, 32-3, Dt6(->asize), 31-3, Dt6(->marked), Dt6(->array), LJ_GC_BLACK, Dt1(->base), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->marked), Dt6(->gclist));
+    dasm_put(Dst, 4276);
     break;
 
   /* -- Calls and vararg handling ----------------------------------------- */
 
   case BC_CALLM:
-    dasm_put(Dst, 4248);
+    dasm_put(Dst, 4279);
     break;
   case BC_CALL:
-    dasm_put(Dst, 4250, Dt7(->pc));
+    dasm_put(Dst, 4281, Dt7(->pc));
     break;
 
   case BC_CALLMT:
-    dasm_put(Dst, 4270);
+    dasm_put(Dst, 4301);
     break;
   case BC_CALLT:
-    dasm_put(Dst, 4272, FRAME_TYPE, Dt7(->ffid), FRAME_VARG, Dt7(->pc), -4-8, Dt7(->pc), PC2PROTO(k), FRAME_TYPEP);
-    dasm_put(Dst, 4337, FRAME_TYPE);
+    dasm_put(Dst, 4303, FRAME_TYPE, Dt7(->ffid), FRAME_VARG, Dt7(->pc), -4-8, Dt7(->pc), PC2PROTO(k), FRAME_TYPEP);
+    dasm_put(Dst, 4368, FRAME_TYPE);
     break;
 
   case BC_ITERC:
-    dasm_put(Dst, 4344, Dt7(->pc));
+    dasm_put(Dst, 4375, Dt7(->pc));
     break;
 
   case BC_ITERN:
 #if LJ_HASJIT
 #endif
-    dasm_put(Dst, 4370, Dt6(->asize), Dt6(->array), 31-3, -(BCBIAS_J*4 >> 16), Dt6(->hmask), Dt6(->node), 31-5, 31-3, DtB(->key), -(BCBIAS_J*4 >> 16));
-    dasm_put(Dst, 4449);
+    dasm_put(Dst, 4401, Dt6(->asize), Dt6(->array), 31-3, -(BCBIAS_J*4 >> 16), Dt6(->hmask), Dt6(->node), 31-5, 31-3, DtB(->key), -(BCBIAS_J*4 >> 16));
+    dasm_put(Dst, 4480);
     break;
 
   case BC_ISNEXT:
-    dasm_put(Dst, 4453, LJ_TTAB, LJ_TFUNC, LJ_TNIL, Dt8(->ffid), FF_next_N, 32-1, -(BCBIAS_J*4 >> 16), BC_JMP, BC_ITERC, -(BCBIAS_J*4 >> 16));
+    dasm_put(Dst, 4484, LJ_TTAB, LJ_TFUNC, LJ_TNIL, Dt8(->ffid), FF_next_N, 32-1, -(BCBIAS_J*4 >> 16), BC_JMP, BC_ITERC, -(BCBIAS_J*4 >> 16));
     break;
 
   case BC_VARG:
-    dasm_put(Dst, 4504, FRAME_VARG, Dt1(->maxstack), Dt1(->top), Dt1(->base), 32-3, Dt1(->base));
-    dasm_put(Dst, 4584);
+    dasm_put(Dst, 4535, FRAME_VARG, Dt1(->maxstack), Dt1(->top), Dt1(->base), 32-3, Dt1(->base));
+    dasm_put(Dst, 4615);
     break;
 
   /* -- Returns ----------------------------------------------------------- */
 
   case BC_RETM:
-    dasm_put(Dst, 4590);
+    dasm_put(Dst, 4621);
     break;
 
   case BC_RET:
-    dasm_put(Dst, 4592, FRAME_TYPE, FRAME_VARG, Dt7(->pc), PC2PROTO(k), FRAME_TYPEP);
+    dasm_put(Dst, 4623, FRAME_TYPE, FRAME_VARG, Dt7(->pc), PC2PROTO(k), FRAME_TYPEP);
     break;
 
   case BC_RET0: case BC_RET1:
-    dasm_put(Dst, 4662, FRAME_TYPE, FRAME_VARG);
+    dasm_put(Dst, 4693, FRAME_TYPE, FRAME_VARG);
     if (op == BC_RET1) {
-      dasm_put(Dst, 4675);
+      dasm_put(Dst, 4706);
     }
-    dasm_put(Dst, 4678, Dt7(->pc), PC2PROTO(k));
+    dasm_put(Dst, 4709, Dt7(->pc), PC2PROTO(k));
     break;
 
   /* -- Loops and branches ------------------------------------------------ */
 
   case BC_FORL:
 #if LJ_HASJIT
-    dasm_put(Dst, 4706);
+    dasm_put(Dst, 4737);
 #endif
     break;
 
@@ -5829,35 +5879,35 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop)
   case BC_FORI:
   case BC_IFORL:
     vk = (op == BC_IFORL || op == BC_JFORL);
-    dasm_put(Dst, 4708, FORL_IDX*8, FORL_STEP*8, FORL_STOP*8);
+    dasm_put(Dst, 4739, FORL_IDX*8, FORL_STEP*8, FORL_STOP*8);
     if (!vk) {
-      dasm_put(Dst, 4716);
+      dasm_put(Dst, 4747);
     }
     if (vk) {
-      dasm_put(Dst, 4724, FORL_IDX*8);
+      dasm_put(Dst, 4755, FORL_IDX*8);
     }
-    dasm_put(Dst, 4728, FORL_EXT*8);
+    dasm_put(Dst, 4759, FORL_EXT*8);
     if (op != BC_JFORL) {
-      dasm_put(Dst, 4736, 32-1);
+      dasm_put(Dst, 4767, 32-1);
       if (op == BC_JFORI) {
-        dasm_put(Dst, 4740, -(BCBIAS_J*4 >> 16));
+        dasm_put(Dst, 4771, -(BCBIAS_J*4 >> 16));
       } else {
-        dasm_put(Dst, 4743, -(BCBIAS_J*4 >> 16));
+        dasm_put(Dst, 4774, -(BCBIAS_J*4 >> 16));
       }
     }
     if (op == BC_FORI) {
-      dasm_put(Dst, 4746);
+      dasm_put(Dst, 4777);
     } else if (op == BC_IFORL) {
-      dasm_put(Dst, 4748);
+      dasm_put(Dst, 4779);
     } else {
-      dasm_put(Dst, 4750, BC_JLOOP);
+      dasm_put(Dst, 4781, BC_JLOOP);
     }
-    dasm_put(Dst, 4753);
+    dasm_put(Dst, 4784);
     break;
 
   case BC_ITERL:
 #if LJ_HASJIT
-    dasm_put(Dst, 4768);
+    dasm_put(Dst, 4799);
 #endif
     break;
 
@@ -5866,40 +5916,40 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop)
     break;
 #endif
   case BC_IITERL:
-    dasm_put(Dst, 4770);
+    dasm_put(Dst, 4801);
     if (op == BC_JITERL) {
-      dasm_put(Dst, 4776);
+      dasm_put(Dst, 4807);
     } else {
-      dasm_put(Dst, 4778, 32-1, -(BCBIAS_J*4 >> 16));
+      dasm_put(Dst, 4809, 32-1, -(BCBIAS_J*4 >> 16));
     }
-    dasm_put(Dst, 4785);
+    dasm_put(Dst, 4816);
     break;
 
   case BC_LOOP:
 #if LJ_HASJIT
-    dasm_put(Dst, 4797);
+    dasm_put(Dst, 4828);
 #endif
     break;
 
   case BC_ILOOP:
-    dasm_put(Dst, 4799);
+    dasm_put(Dst, 4830);
     break;
 
   case BC_JLOOP:
 #if LJ_HASJIT
-    dasm_put(Dst, 4810);
+    dasm_put(Dst, 4841);
 #endif
     break;
 
   case BC_JMP:
-    dasm_put(Dst, 4812, 32-1, -(BCBIAS_J*4 >> 16));
+    dasm_put(Dst, 4843, 32-1, -(BCBIAS_J*4 >> 16));
     break;
 
   /* -- Function headers -------------------------------------------------- */
 
   case BC_FUNCF:
 #if LJ_HASJIT
-    dasm_put(Dst, 4828);
+    dasm_put(Dst, 4859);
 #endif
   case BC_FUNCV:  /* NYI: compiled vararg functions. */
     break;
@@ -5909,38 +5959,38 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop)
     break;
 #endif
   case BC_IFUNCF:
-    dasm_put(Dst, 4830, Dt1(->maxstack), -4+PC2PROTO(numparams), -4+PC2PROTO(k), 31-3);
+    dasm_put(Dst, 4861, Dt1(->maxstack), -4+PC2PROTO(numparams), -4+PC2PROTO(k), 31-3);
     if (op == BC_JFUNCF) {
-      dasm_put(Dst, 4848);
+      dasm_put(Dst, 4879);
     } else {
-      dasm_put(Dst, 4850);
+      dasm_put(Dst, 4881);
     }
-    dasm_put(Dst, 4859);
+    dasm_put(Dst, 4890);
     break;
 
   case BC_JFUNCV:
 #if !LJ_HASJIT
     break;
 #endif
-    dasm_put(Dst, 4865);
+    dasm_put(Dst, 4896);
     break;  /* NYI: compiled vararg functions. */
 
   case BC_IFUNCV:
-    dasm_put(Dst, 4867, Dt1(->maxstack), 8+FRAME_VARG, -4+PC2PROTO(k), -4+PC2PROTO(numparams));
+    dasm_put(Dst, 4898, Dt1(->maxstack), 8+FRAME_VARG, -4+PC2PROTO(k), -4+PC2PROTO(numparams));
     break;
 
   case BC_FUNCC:
   case BC_FUNCCW:
     if (op == BC_FUNCC) {
-      dasm_put(Dst, 4917, Dt8(->f));
+      dasm_put(Dst, 4948, Dt8(->f));
     } else {
-      dasm_put(Dst, 4920, DISPATCH_GL(wrapf));
+      dasm_put(Dst, 4951, DISPATCH_GL(wrapf));
     }
-    dasm_put(Dst, 4923, Dt1(->maxstack), Dt1(->base), Dt1(->top), ~LJ_VMST_C);
+    dasm_put(Dst, 4954, Dt1(->maxstack), Dt1(->base), Dt1(->top), ~LJ_VMST_C);
     if (op == BC_FUNCCW) {
-      dasm_put(Dst, 4936, Dt8(->f));
+      dasm_put(Dst, 4967, Dt8(->f));
     }
-    dasm_put(Dst, 4939, DISPATCH_GL(vmstate), Dt1(->top), 31-3, Dt1(->base), ~LJ_VMST_INTERP, DISPATCH_GL(vmstate));
+    dasm_put(Dst, 4970, DISPATCH_GL(vmstate), Dt1(->top), 31-3, Dt1(->base), ~LJ_VMST_INTERP, DISPATCH_GL(vmstate));
     break;
 
   /* ---------------------------------------------------------------------- */
@@ -5960,7 +6010,7 @@ static int build_backend(BuildCtx *ctx)
 
   build_subroutines(ctx);
 
-  dasm_put(Dst, 4960);
+  dasm_put(Dst, 4991);
   for (op = 0; op < BC__MAX; op++)
     build_ins(ctx, (BCOp)op, op);