From 31d566428fe85cdd8c94a01ccab5a2d602286db8 Mon Sep 17 00:00:00 2001 From: Mike Pall Date: Mon, 20 Jun 2011 20:45:41 +0200 Subject: [PATCH] From Lua 5.2: __len for tables. Needs -DLUAJIT_ENABLE_LUA52COMPAT. --- src/buildvm_arm.dasc | 23 +- src/buildvm_arm.h | 2043 ++++++++++++++++---------------- src/buildvm_ppc.dasc | 26 +- src/buildvm_ppcspe.h | 1374 +++++++++++----------- src/buildvm_x64.h | 2347 ++++++++++++++++++------------------- src/buildvm_x64win.h | 2339 ++++++++++++++++++------------------- src/buildvm_x86.dasc | 23 +- src/buildvm_x86.h | 2634 +++++++++++++++++++++--------------------- src/lj_meta.c | 13 +- src/lj_obj.h | 6 +- src/lj_record.c | 47 +- 11 files changed, 5558 insertions(+), 5317 deletions(-) diff --git a/src/buildvm_arm.dasc b/src/buildvm_arm.dasc index 4d3ba5b7..fd7c7b81 100644 --- a/src/buildvm_arm.dasc +++ b/src/buildvm_arm.dasc @@ -767,9 +767,16 @@ static void build_subroutines(BuildCtx *ctx) | mov CARG1, L | str PC, SAVE_PC | bl extern lj_meta_len // (lua_State *L, TValue *o) - | // Returns TValue * (metamethod base). + | // Returns NULL (retry) or TValue * (metamethod base). | IOS ldr BASE, L->base +#ifdef LUAJIT_ENABLE_LUA52COMPAT + | cmp CRET1, #0 + | bne ->vmeta_binop // Binop call for compatibility. + | ldr TAB:CARG1, [BASE, RC] + | b ->BC_LEN_Z +#else | b ->vmeta_binop // Binop call for compatibility. +#endif | |//-- Call metamethod ---------------------------------------------------- | @@ -2546,11 +2553,25 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop) | ins_next3 |2: | checktab CARG2, ->vmeta_len +#ifdef LUAJIT_ENABLE_LUA52COMPAT + | ldr TAB:CARG3, TAB:CARG1->metatable + | cmp TAB:CARG3, #0 + | bne >9 + |3: +#endif + |->BC_LEN_Z: | IOS mov RC, BASE | bl extern lj_tab_len // (GCtab *t) | // Returns uint32_t (but less than 2^31). | IOS mov BASE, RC | b <1 +#ifdef LUAJIT_ENABLE_LUA52COMPAT + |9: + | ldrb CARG4, TAB:CARG3->nomm + | tst CARG4, #1<vmeta_len +#endif break; /* -- Binary ops -------------------------------------------------------- */ diff --git a/src/buildvm_arm.h b/src/buildvm_arm.h index 26c2674a..505048bd 100644 --- a/src/buildvm_arm.h +++ b/src/buildvm_arm.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[5675] = { +static const unsigned int build_actionlist[5702] = { 0x00010001, 0x00060014, 0xe3160000, @@ -630,8 +630,16 @@ static const unsigned int build_actionlist[5675] = { 0xe5189000, 0x000d8180, 0x00000000, +0xe3500000, +0x1a000000, +0x00050035, +0xe799000b, +0xea000000, +0x00050040, +0x00000000, 0xea000000, 0x00050035, +0x00000000, 0x00060025, 0xe1a00008, 0xe508c000, @@ -658,7 +666,7 @@ static const unsigned int build_actionlist[5675] = { 0xe004a2ae, 0xe08aa009, 0xe12fff1c, -0x00060040, +0x00060041, 0xe1a00008, 0xe5089000, 0x000d8180, @@ -675,8 +683,8 @@ static const unsigned int build_actionlist[5675] = { 0xe5196004, 0xe28bb008, 0xea000000, -0x00050041, -0x00060042, +0x00050042, +0x00060043, 0xe1a00008, 0xe5089000, 0x000d8180, @@ -703,22 +711,22 @@ static const unsigned int build_actionlist[5675] = { 0x00000000, 0xea000000, 0x00070000, -0x00060043, +0x00060044, 0xe1c900d0, 0xe35b0008, 0x3a000000, -0x00050044, +0x00050045, 0xe3710000, 0x000a0000, 0x8a000000, -0x00050044, +0x00050045, 0xe5196004, 0xe14900f8, 0xe1a0c009, 0xe25ba008, 0xe28bb008, 0x0a000000, -0x00050045, +0x00050046, 0x0006000b, 0xe1cc00d8, 0xe25aa008, @@ -726,12 +734,12 @@ static const unsigned int build_actionlist[5675] = { 0x1a000000, 0x0005000b, 0xea000000, -0x00050045, -0x00060046, +0x00050046, +0x00060047, 0xe5991004, 0xe35b0008, 0x3a000000, -0x00050044, +0x00050045, 0xe3710000, 0x000a0000, 0x33e01000, @@ -741,12 +749,12 @@ static const unsigned int build_actionlist[5675] = { 0xe1a03183, 0xe18200d3, 0xea000000, -0x00050047, -0x00060048, +0x00050048, +0x00060049, 0xe1c900d0, 0xe35b0008, 0x3a000000, -0x00050044, +0x00050045, 0xe3710000, 0x000a0000, 0x13710000, @@ -764,7 +772,7 @@ static const unsigned int build_actionlist[5675] = { 0x000d8180, 0xe35c0000, 0x0a000000, -0x00050047, +0x00050048, 0xe51c2000, 0x000d8180, 0xe51b3000, @@ -794,12 +802,12 @@ static const unsigned int build_actionlist[5675] = { 0xe3e01000, 0x000a0000, 0xea000000, -0x00050047, +0x00050048, 0x0006000f, 0xe3710000, 0x000a0000, 0x1a000000, -0x00050047, +0x00050048, 0xea000000, 0x0005000e, 0x00060010, @@ -814,12 +822,12 @@ static const unsigned int build_actionlist[5675] = { 0x000d8180, 0xea000000, 0x0005000c, -0x00060049, +0x0006004a, 0xe1c900d0, 0xe1c920d8, 0xe35b0010, 0x3a000000, -0x00050044, +0x00050045, 0xe3710000, 0x000a0000, 0x0510c000, @@ -830,13 +838,13 @@ static const unsigned int build_actionlist[5675] = { 0x000d8180, 0x035c0000, 0x1a000000, -0x00050044, +0x00050045, 0xe3130000, 0x000a0000, 0xe5002000, 0x000d8180, 0x0a000000, -0x00050047, +0x00050048, 0xe5172000, 0x000d8180, 0xe3c33000, @@ -848,18 +856,18 @@ static const unsigned int build_actionlist[5675] = { 0xe5002000, 0x000d8180, 0xea000000, -0x00050047, -0x0006004a, +0x00050048, +0x0006004b, 0xe1c920d0, 0xe35b0010, 0x3a000000, -0x00050044, +0x00050045, 0xe1a01002, 0xe3730000, 0x000a0000, 0x00000000, 0x1a000000, -0x00050044, +0x00050045, 0xe1a00008, 0xe2892008, 0x00000000, @@ -872,27 +880,27 @@ static const unsigned int build_actionlist[5675] = { 0x00000000, 0xe1c000d0, 0xea000000, -0x00050047, -0x0006004b, -0xe1c900d0, -0xe35b0008, -0x3a000000, -0x00050044, -0xe3710000, -0x000a0000, -0x9a000000, -0x00050047, -0xea000000, -0x00050044, +0x00050048, 0x0006004c, 0xe1c900d0, 0xe35b0008, 0x3a000000, -0x00050044, +0x00050045, +0xe3710000, +0x000a0000, +0x9a000000, +0x00050048, +0xea000000, +0x00050045, +0x0006004d, +0xe1c900d0, +0xe35b0008, +0x3a000000, +0x00050045, 0xe3710000, 0x000a0000, 0x0a000000, -0x00050047, +0x00050048, 0xe5173000, 0x000d8180, 0xe5089000, @@ -902,14 +910,14 @@ static const unsigned int build_actionlist[5675] = { 0x93530000, 0xe58d6008, 0x8a000000, -0x00050044, +0x00050045, 0xe5170000, 0x000d8180, 0xe5171000, 0x000d8180, 0xe1500001, 0xab000000, -0x0005004d, +0x0005004e, 0xe1a00008, 0xe1a01009, 0xeb000000, @@ -919,19 +927,19 @@ static const unsigned int build_actionlist[5675] = { 0xe3e01000, 0x000a0000, 0xea000000, -0x00050047, -0x0006004e, +0x00050048, +0x0006004f, 0x00000000, 0xe1c900d0, 0xe35b0008, 0x3a000000, -0x00050044, +0x00050045, 0xe3e03000, 0x000a0000, 0xe3710000, 0x000a0000, 0x1a000000, -0x00050044, +0x00050045, 0xe18920fb, 0xe5196004, 0xe1a01000, @@ -952,7 +960,7 @@ static const unsigned int build_actionlist[5675] = { 0x03e01000, 0x000a0000, 0x0a000000, -0x00050047, +0x00050048, 0xe1c900d8, 0xe1c921d0, 0xe3a0b000, @@ -960,16 +968,16 @@ static const unsigned int build_actionlist[5675] = { 0xe14900f8, 0xe1c920f0, 0xea000000, -0x00050045, -0x0006004f, +0x00050046, +0x00060050, 0xe1c900d0, 0xe35b0008, 0x3a000000, -0x00050044, +0x00050045, 0xe3710000, 0x000a0000, 0x1a000000, -0x00050044, +0x00050045, 0x00000000, 0xe510c000, 0x000d8180, @@ -980,7 +988,7 @@ static const unsigned int build_actionlist[5675] = { 0x00000000, 0xe35c0000, 0x1a000000, -0x00050044, +0x00050045, 0x00000000, 0xe3e01000, 0x000a0000, @@ -989,19 +997,19 @@ static const unsigned int build_actionlist[5675] = { 0xe14920f8, 0xe589100c, 0xea000000, -0x00050045, -0x00060050, +0x00050046, +0x00060051, 0xe1c900d0, 0xe1c920d8, 0xe35b0010, 0x3a000000, -0x00050044, +0x00050045, 0xe3710000, 0x000a0000, 0x03730000, 0x000a0000, 0x1a000000, -0x00050044, +0x00050045, 0xe510c000, 0x000d8180, 0xe510b000, @@ -1023,14 +1031,14 @@ static const unsigned int build_actionlist[5675] = { 0x000a0000, 0x11c900f0, 0xea000000, -0x00050045, +0x00050046, 0x0006000c, 0xe510c000, 0x000d8180, 0xe1a01002, 0xe35c0000, 0x0a000000, -0x00050045, +0x00050046, 0x00000000, 0xe1a0a009, 0x00000000, @@ -1041,19 +1049,19 @@ static const unsigned int build_actionlist[5675] = { 0x00000000, 0xe3500000, 0x0a000000, -0x00050045, +0x00050046, 0xe1c000d0, 0xea000000, 0x0005000b, -0x00060051, +0x00060052, 0xe1c900d0, 0xe35b0008, 0x3a000000, -0x00050044, +0x00050045, 0xe3710000, 0x000a0000, 0x1a000000, -0x00050044, +0x00050045, 0x00000000, 0xe510c000, 0x000d8180, @@ -1064,7 +1072,7 @@ static const unsigned int build_actionlist[5675] = { 0x00000000, 0xe35c0000, 0x1a000000, -0x00050044, +0x00050045, 0x00000000, 0xe3a00000, 0xe3e01000, @@ -1074,13 +1082,13 @@ static const unsigned int build_actionlist[5675] = { 0xe14920f8, 0xe1c900f8, 0xea000000, -0x00050045, -0x00060052, +0x00050046, +0x00060053, 0xe557a000, 0x000d8180, 0xe35b0008, 0x3a000000, -0x00050044, +0x00050045, 0xe31a0000, 0x000a0000, 0xe1a0c009, @@ -1092,18 +1100,18 @@ static const unsigned int build_actionlist[5675] = { 0xe24bb008, 0xea000000, 0x00050024, -0x00060053, +0x00060054, 0xe1c900d0, 0xe1c920d8, 0xe35b0010, 0x3a000000, -0x00050044, +0x00050045, 0xe557a000, 0x000d8180, 0xe3730000, 0x000a0000, 0x1a000000, -0x00050044, +0x00050045, 0xe1a0c009, 0xe1c900f8, 0xe1c920f0, @@ -1117,16 +1125,16 @@ static const unsigned int build_actionlist[5675] = { 0xe24bb010, 0xea000000, 0x00050024, -0x00060054, +0x00060055, 0xe1c900d0, 0xe35b0008, 0x3a000000, -0x00050044, +0x00050045, 0xe3710000, 0x000a0000, 0x00000000, 0x1a000000, -0x00050044, +0x00050045, 0xe5196004, 0xe5089000, 0x000d8180, @@ -1141,7 +1149,7 @@ static const unsigned int build_actionlist[5675] = { 0xe58d6008, 0xe153000c, 0x0a000000, -0x00050044, +0x00050045, 0xe5103000, 0x000d8180, 0xe510c000, @@ -1151,7 +1159,7 @@ static const unsigned int build_actionlist[5675] = { 0x91520003, 0x935c0000, 0x8a000000, -0x00050044, +0x00050045, 0x0006000b, 0xe2422008, 0xe2899008, @@ -1242,7 +1250,7 @@ static const unsigned int build_actionlist[5675] = { 0xe3a00000, 0xea000000, 0x0005000e, -0x00060055, +0x00060056, 0x00000000, 0xe5120000, 0x000d8180, @@ -1260,7 +1268,7 @@ static const unsigned int build_actionlist[5675] = { 0xe58d6008, 0xe153000c, 0x0a000000, -0x00050044, +0x00050045, 0xe5103000, 0x000d8180, 0xe510c000, @@ -1270,7 +1278,7 @@ static const unsigned int build_actionlist[5675] = { 0x91520003, 0x935c0000, 0x8a000000, -0x00050044, +0x00050045, 0x0006000b, 0xe5002000, 0x000d8180, @@ -1348,7 +1356,7 @@ static const unsigned int build_actionlist[5675] = { 0xe3a00000, 0xea000000, 0x0005000e, -0x00060056, +0x00060057, 0xe5180000, 0x000d8180, 0xe089100b, @@ -1363,24 +1371,24 @@ static const unsigned int build_actionlist[5675] = { 0x000a0000, 0xe3a02000, 0x0a000000, -0x00050044, +0x00050045, 0xe5082000, 0x000d8180, 0xe5480000, 0x000d8180, 0xea000000, 0x0005001a, -0x00060057, +0x00060058, 0xe1c900d0, 0xe35b0008, 0x3a000000, -0x00050044, +0x00050045, 0xe3710000, 0x000a0000, 0x0a000000, -0x00050047, +0x00050048, 0x8a000000, -0x00050044, +0x00050045, 0xe1a02081, 0xe292c980, 0x5a000000, @@ -1404,7 +1412,7 @@ static const unsigned int build_actionlist[5675] = { 0xe3e01000, 0x000a0000, 0xea000000, -0x00050047, +0x00050048, 0x0006000c, 0xe1822000, 0xe1120fc1, @@ -1413,7 +1421,7 @@ static const unsigned int build_actionlist[5675] = { 0xe3e01000, 0x000a0000, 0xea000000, -0x00050047, +0x00050048, 0x0006000d, 0x03530480, 0x03520000, @@ -1426,20 +1434,20 @@ static const unsigned int build_actionlist[5675] = { 0x0006000e, 0x00000000, 0xeb000000, -0x00050058, +0x00050059, 0xea000000, -0x00050047, -0x00060059, +0x00050048, +0x0006005a, 0xe1c900d0, 0xe35b0008, 0x3a000000, -0x00050044, +0x00050045, 0xe3710000, 0x000a0000, 0x0a000000, -0x00050047, +0x00050048, 0x8a000000, -0x00050044, +0x00050045, 0xe1a02081, 0xe292c980, 0x5a000000, @@ -1460,14 +1468,14 @@ static const unsigned int build_actionlist[5675] = { 0x614f00d0, 0x00051809, 0x6a000000, -0x00050047, +0x00050048, 0xe3510000, 0xb2600000, 0x0006000b, 0xe3e01000, 0x000a0000, 0xea000000, -0x00050047, +0x00050048, 0x0006000c, 0xe1822000, 0xe1d22fc1, @@ -1476,7 +1484,7 @@ static const unsigned int build_actionlist[5675] = { 0xe3e01000, 0x000a0000, 0xea000000, -0x00050047, +0x00050048, 0x0006000d, 0x03530480, 0x1a000000, @@ -1487,38 +1495,38 @@ static const unsigned int build_actionlist[5675] = { 0x0005000b, 0x0006000e, 0xeb000000, -0x0005005a, +0x0005005b, 0x00000000, 0xea000000, -0x00050047, +0x00050048, 0x00040007, 0x00060013, 0x00020000, 0x00000000, 0x41e00000, -0x0006005b, +0x0006005c, 0xe1c900d0, 0xe35b0008, 0x3a000000, -0x00050044, +0x00050045, 0xe3710000, 0x000a0000, 0x8a000000, -0x00050044, +0x00050045, 0x13c11480, 0x1a000000, -0x00050047, +0x00050048, 0xe3500000, 0xb2700000, 0x614f00d0, 0x00051813, -0x00060047, +0x00060048, 0xe5196004, 0xe14900f8, -0x0006005c, +0x0006005d, 0xe3a0b000, 0x000a0000, -0x00060045, +0x00060046, 0xe2160000, 0x000a0000, 0x0516e004, @@ -1547,16 +1555,16 @@ static const unsigned int build_actionlist[5675] = { 0xe5010004, 0xea000000, 0x0005000f, -0x0006005d, +0x0006005e, 0xe1c900d0, 0xe35b0008, 0x3a000000, -0x00050044, +0x00050045, 0x00000000, 0xe3710000, 0x000a0000, 0x2a000000, -0x00050044, +0x00050045, 0x00000000, 0xe1a0a009, 0x00000000, @@ -1566,16 +1574,16 @@ static const unsigned int build_actionlist[5675] = { 0xe1a0900a, 0x00000000, 0xea000000, -0x00050047, -0x0006005e, +0x00050048, +0x0006005f, 0xe1c900d0, 0xe35b0008, 0x3a000000, -0x00050044, +0x00050045, 0xe3710000, 0x000a0000, 0x2a000000, -0x00050044, +0x00050045, 0x00000000, 0xe1a0a009, 0x00000000, @@ -1585,16 +1593,16 @@ static const unsigned int build_actionlist[5675] = { 0xe1a0900a, 0x00000000, 0xea000000, -0x00050047, -0x0006005f, +0x00050048, +0x00060060, 0xe1c900d0, 0xe35b0008, 0x3a000000, -0x00050044, +0x00050045, 0xe3710000, 0x000a0000, 0x2a000000, -0x00050044, +0x00050045, 0x00000000, 0xe1a0a009, 0x00000000, @@ -1604,16 +1612,16 @@ static const unsigned int build_actionlist[5675] = { 0xe1a0900a, 0x00000000, 0xea000000, -0x00050047, -0x00060060, +0x00050048, +0x00060061, 0xe1c900d0, 0xe35b0008, 0x3a000000, -0x00050044, +0x00050045, 0xe3710000, 0x000a0000, 0x2a000000, -0x00050044, +0x00050045, 0x00000000, 0xe1a0a009, 0x00000000, @@ -1623,16 +1631,16 @@ static const unsigned int build_actionlist[5675] = { 0xe1a0900a, 0x00000000, 0xea000000, -0x00050047, -0x00060061, +0x00050048, +0x00060062, 0xe1c900d0, 0xe35b0008, 0x3a000000, -0x00050044, +0x00050045, 0xe3710000, 0x000a0000, 0x2a000000, -0x00050044, +0x00050045, 0x00000000, 0xe1a0a009, 0x00000000, @@ -1642,16 +1650,16 @@ static const unsigned int build_actionlist[5675] = { 0xe1a0900a, 0x00000000, 0xea000000, -0x00050047, -0x00060062, +0x00050048, +0x00060063, 0xe1c900d0, 0xe35b0008, 0x3a000000, -0x00050044, +0x00050045, 0xe3710000, 0x000a0000, 0x2a000000, -0x00050044, +0x00050045, 0x00000000, 0xe1a0a009, 0x00000000, @@ -1661,16 +1669,16 @@ static const unsigned int build_actionlist[5675] = { 0xe1a0900a, 0x00000000, 0xea000000, -0x00050047, -0x00060063, +0x00050048, +0x00060064, 0xe1c900d0, 0xe35b0008, 0x3a000000, -0x00050044, +0x00050045, 0xe3710000, 0x000a0000, 0x2a000000, -0x00050044, +0x00050045, 0x00000000, 0xe1a0a009, 0x00000000, @@ -1680,16 +1688,16 @@ static const unsigned int build_actionlist[5675] = { 0xe1a0900a, 0x00000000, 0xea000000, -0x00050047, -0x00060064, +0x00050048, +0x00060065, 0xe1c900d0, 0xe35b0008, 0x3a000000, -0x00050044, +0x00050045, 0xe3710000, 0x000a0000, 0x2a000000, -0x00050044, +0x00050045, 0x00000000, 0xe1a0a009, 0x00000000, @@ -1699,16 +1707,16 @@ static const unsigned int build_actionlist[5675] = { 0xe1a0900a, 0x00000000, 0xea000000, -0x00050047, -0x00060065, +0x00050048, +0x00060066, 0xe1c900d0, 0xe35b0008, 0x3a000000, -0x00050044, +0x00050045, 0xe3710000, 0x000a0000, 0x2a000000, -0x00050044, +0x00050045, 0x00000000, 0xe1a0a009, 0x00000000, @@ -1718,16 +1726,16 @@ static const unsigned int build_actionlist[5675] = { 0xe1a0900a, 0x00000000, 0xea000000, -0x00050047, -0x00060066, +0x00050048, +0x00060067, 0xe1c900d0, 0xe35b0008, 0x3a000000, -0x00050044, +0x00050045, 0xe3710000, 0x000a0000, 0x2a000000, -0x00050044, +0x00050045, 0x00000000, 0xe1a0a009, 0x00000000, @@ -1737,16 +1745,16 @@ static const unsigned int build_actionlist[5675] = { 0xe1a0900a, 0x00000000, 0xea000000, -0x00050047, -0x00060067, +0x00050048, +0x00060068, 0xe1c900d0, 0xe35b0008, 0x3a000000, -0x00050044, +0x00050045, 0xe3710000, 0x000a0000, 0x2a000000, -0x00050044, +0x00050045, 0x00000000, 0xe1a0a009, 0x00000000, @@ -1756,16 +1764,16 @@ static const unsigned int build_actionlist[5675] = { 0xe1a0900a, 0x00000000, 0xea000000, -0x00050047, -0x00060068, +0x00050048, +0x00060069, 0xe1c900d0, 0xe35b0008, 0x3a000000, -0x00050044, +0x00050045, 0xe3710000, 0x000a0000, 0x2a000000, -0x00050044, +0x00050045, 0x00000000, 0xe1a0a009, 0x00000000, @@ -1775,16 +1783,16 @@ static const unsigned int build_actionlist[5675] = { 0xe1a0900a, 0x00000000, 0xea000000, -0x00050047, -0x00060069, +0x00050048, +0x0006006a, 0xe1c900d0, 0xe35b0008, 0x3a000000, -0x00050044, +0x00050045, 0xe3710000, 0x000a0000, 0x2a000000, -0x00050044, +0x00050045, 0x00000000, 0xe1a0a009, 0x00000000, @@ -1794,19 +1802,19 @@ static const unsigned int build_actionlist[5675] = { 0xe1a0900a, 0x00000000, 0xea000000, -0x00050047, -0x0006006a, +0x00050048, +0x0006006b, 0xe1c900d0, 0xe1c920d8, 0xe35b0010, 0x3a000000, -0x00050044, +0x00050045, 0xe3710000, 0x000a0000, 0x33730000, 0x000a0000, 0x2a000000, -0x00050044, +0x00050045, 0x00000000, 0xe1a0a009, 0x00000000, @@ -1816,19 +1824,19 @@ static const unsigned int build_actionlist[5675] = { 0xe1a0900a, 0x00000000, 0xea000000, -0x00050047, -0x0006006b, +0x00050048, +0x0006006c, 0xe1c900d0, 0xe1c920d8, 0xe35b0010, 0x3a000000, -0x00050044, +0x00050045, 0xe3710000, 0x000a0000, 0x33730000, 0x000a0000, 0x2a000000, -0x00050044, +0x00050045, 0x00000000, 0xe1a0a009, 0x00000000, @@ -1838,19 +1846,19 @@ static const unsigned int build_actionlist[5675] = { 0xe1a0900a, 0x00000000, 0xea000000, -0x00050047, -0x0006006c, +0x00050048, +0x0006006d, 0xe1c900d0, 0xe1c920d8, 0xe35b0010, 0x3a000000, -0x00050044, +0x00050045, 0xe3710000, 0x000a0000, 0x33730000, 0x000a0000, 0x2a000000, -0x00050044, +0x00050045, 0x00000000, 0xe1a0a009, 0x00000000, @@ -1860,37 +1868,37 @@ static const unsigned int build_actionlist[5675] = { 0xe1a0900a, 0x00000000, 0xea000000, -0x00050047, -0x0006006d, +0x00050048, 0x0006006e, +0x0006006f, 0xe1c900d0, 0xe35b0008, 0x3a000000, -0x00050044, +0x00050045, 0xe3710000, 0x000a0000, 0x2a000000, -0x00050044, +0x00050045, 0xe14220d0, 0x000c8100, 0xeb000000, 0x0003001f, 0xea000000, -0x00050047, -0x0006006f, +0x00050048, +0x00060070, 0xe1c900d0, 0xe1c920d8, 0xe35b0010, 0x3a000000, -0x00050044, +0x00050045, 0xe3710000, 0x000a0000, 0x2a000000, -0x00050044, +0x00050045, 0xe3730000, 0x000a0000, 0x1a000000, -0x00050044, +0x00050045, 0x00000000, 0xe1a0a009, 0x00000000, @@ -1900,16 +1908,16 @@ static const unsigned int build_actionlist[5675] = { 0xe1a0900a, 0x00000000, 0xea000000, -0x00050047, -0x00060070, +0x00050048, +0x00060071, 0xe1c900d0, 0xe35b0008, 0x3a000000, -0x00050044, +0x00050045, 0xe3710000, 0x000a0000, 0x2a000000, -0x00050044, +0x00050045, 0xe1a0200d, 0x00000000, 0xe1a0a009, @@ -1928,16 +1936,16 @@ static const unsigned int build_actionlist[5675] = { 0x000a0000, 0xe1c920f0, 0xea000000, -0x00050045, -0x00060071, +0x00050046, +0x00060072, 0xe1c900d0, 0xe35b0008, 0x3a000000, -0x00050044, +0x00050045, 0xe3710000, 0x000a0000, 0x2a000000, -0x00050044, +0x00050045, 0xe2492008, 0xe5196004, 0x00000000, @@ -1952,12 +1960,12 @@ static const unsigned int build_actionlist[5675] = { 0x000a0000, 0xe1c900f0, 0xea000000, -0x00050045, -0x00060072, +0x00050046, +0x00060073, 0xe1c900d0, 0xe35b0008, 0x3a000000, -0x00050044, +0x00050045, 0xe3710000, 0x000a0000, 0xe3a0a008, @@ -1967,7 +1975,7 @@ static const unsigned int build_actionlist[5675] = { 0xe18920da, 0xe15a000b, 0x2a000000, -0x00050047, +0x00050048, 0xe3730000, 0x000a0000, 0x1a000000, @@ -1979,7 +1987,7 @@ static const unsigned int build_actionlist[5675] = { 0x0005000b, 0x0006000d, 0x8a000000, -0x00050044, +0x00050045, 0xeb000000, 0x00030023, 0xe18920da, @@ -1987,12 +1995,12 @@ static const unsigned int build_actionlist[5675] = { 0x00050006, 0x0006000e, 0x8a000000, -0x00050044, +0x00050045, 0x0006000f, 0xe18920da, 0xe15a000b, 0x2a000000, -0x00050047, +0x00050048, 0xe3730000, 0x000a0000, 0x2a000000, @@ -2008,7 +2016,7 @@ static const unsigned int build_actionlist[5675] = { 0x0005000f, 0x00060011, 0x8a000000, -0x00050044, +0x00050045, 0xe1cd00f0, 0xe1a00002, 0xeb000000, @@ -2016,11 +2024,11 @@ static const unsigned int build_actionlist[5675] = { 0xe1cd20d0, 0xea000000, 0x00050010, -0x00060073, +0x00060074, 0xe1c900d0, 0xe35b0008, 0x3a000000, -0x00050044, +0x00050045, 0xe3710000, 0x000a0000, 0xe3a0a008, @@ -2030,7 +2038,7 @@ static const unsigned int build_actionlist[5675] = { 0xe18920da, 0xe15a000b, 0x2a000000, -0x00050047, +0x00050048, 0xe3730000, 0x000a0000, 0x1a000000, @@ -2042,7 +2050,7 @@ static const unsigned int build_actionlist[5675] = { 0x0005000b, 0x0006000d, 0x8a000000, -0x00050044, +0x00050045, 0xeb000000, 0x00030023, 0xe18920da, @@ -2050,13 +2058,13 @@ static const unsigned int build_actionlist[5675] = { 0x00050006, 0x0006000e, 0x8a000000, -0x00050044, +0x00050045, 0x0006000f, 0x00000000, 0xe18920da, 0xe15a000b, 0x2a000000, -0x00050047, +0x00050048, 0xe3730000, 0x000a0000, 0x2a000000, @@ -2071,7 +2079,7 @@ static const unsigned int build_actionlist[5675] = { 0x0005000f, 0x00060011, 0x8a000000, -0x00050044, +0x00050045, 0xe1cd00f0, 0xe1a00002, 0xeb000000, @@ -2079,29 +2087,29 @@ static const unsigned int build_actionlist[5675] = { 0xe1cd20d0, 0xea000000, 0x00050010, -0x00060074, +0x00060075, 0xe1c900d0, 0xe35b0008, 0x3a000000, -0x00050044, +0x00050045, 0xe3710000, 0x000a0000, 0x1a000000, -0x00050044, +0x00050045, 0xe5100000, 0x000d8180, 0xe3e01000, 0x000a0000, 0xea000000, -0x00050047, -0x00060075, +0x00050048, +0x00060076, 0xe1c900d0, 0xe5196004, 0xe35b0008, 0x03710000, 0x000a0000, 0x1a000000, -0x00050044, +0x00050045, 0xe5102000, 0x000d8180, 0xe5500000, @@ -2116,15 +2124,15 @@ static const unsigned int build_actionlist[5675] = { 0x000a0000, 0xe14900f8, 0xea000000, -0x00050045, -0x00060076, +0x00050046, +0x00060077, 0xe5170000, 0x000d8180, 0xe5171000, 0x000d8180, 0xe1500001, 0xab000000, -0x0005004d, +0x0005004e, 0xe1c900d0, 0xe5196004, 0xe35b0008, @@ -2133,10 +2141,10 @@ static const unsigned int build_actionlist[5675] = { 0x03d030ff, 0xe3a02001, 0x1a000000, -0x00050044, +0x00050045, 0xe58d0000, 0xe1a0100d, -0x00060077, +0x00060078, 0xe5089000, 0x000d8180, 0xe1a00008, @@ -2148,15 +2156,15 @@ static const unsigned int build_actionlist[5675] = { 0xe3e01000, 0x000a0000, 0xea000000, -0x00050047, -0x00060078, +0x00050048, +0x00060079, 0xe5170000, 0x000d8180, 0xe5171000, 0x000d8180, 0xe1500001, 0xab000000, -0x0005004d, +0x0005004e, 0xe1c900d0, 0xe1c921d0, 0xe35b0010, @@ -2164,13 +2172,13 @@ static const unsigned int build_actionlist[5675] = { 0x0a000000, 0x00050001, 0x3a000000, -0x00050044, +0x00050045, 0x00000000, 0xe3730000, 0x000a0000, 0xe1a0c002, 0x1a000000, -0x00050044, +0x00050045, 0x0006000b, 0xe1c920d8, 0xe3710000, @@ -2180,7 +2188,7 @@ static const unsigned int build_actionlist[5675] = { 0x03730000, 0x000a0000, 0x1a000000, -0x00050044, +0x00050045, 0xe2813001, 0xe3520000, 0xb0822003, @@ -2197,44 +2205,44 @@ static const unsigned int build_actionlist[5675] = { 0xe05c2002, 0xe2822001, 0xaa000000, -0x00050077, -0x00060079, +0x00050078, +0x0006007a, 0xe2470000, 0x000a0000, 0xe3e01000, 0x000a0000, 0xea000000, -0x00050047, -0x0006007a, +0x00050048, +0x0006007b, 0xe5170000, 0x000d8180, 0xe5171000, 0x000d8180, 0xe1500001, 0xab000000, -0x0005004d, +0x0005004e, 0xe1c900d0, 0xe1c920d8, 0xe35b0010, 0x3a000000, -0x00050044, +0x00050045, 0xe3710000, 0x000a0000, 0x03730000, 0x000a0000, 0x1a000000, -0x00050044, +0x00050045, 0xe2523001, 0xe5101000, 0x000d8180, 0x00000000, 0xba000000, -0x00050079, +0x0005007a, 0xe3510001, 0x3a000000, -0x00050079, +0x0005007a, 0x1a000000, -0x00050044, +0x00050045, 0xe517c000, 0x000d8180, 0xe5171000, @@ -2243,30 +2251,30 @@ static const unsigned int build_actionlist[5675] = { 0x000d8180, 0xe15c0002, 0x3a000000, -0x00050044, +0x00050045, 0x0006000b, 0xe7c10003, 0xe2533001, 0xaa000000, 0x0005000b, 0xea000000, -0x00050077, -0x0006007b, +0x00050078, +0x0006007c, 0xe5170000, 0x000d8180, 0xe5171000, 0x000d8180, 0xe1500001, 0xab000000, -0x0005004d, +0x0005004e, 0xe1c900d0, 0xe35b0008, 0x3a000000, -0x00050044, +0x00050045, 0xe3710000, 0x000a0000, 0x1a000000, -0x00050044, +0x00050045, 0xe5102000, 0x000d8180, 0xe517c000, @@ -2278,56 +2286,16 @@ static const unsigned int build_actionlist[5675] = { 0x000a0000, 0xe15c0002, 0x3a000000, -0x00050044, +0x00050045, 0x0006000b, 0x00000000, 0xe4d0c001, 0xe2533001, 0xba000000, -0x00050077, +0x00050078, 0xe7c1c003, 0xea000000, 0x0005000b, -0x0006007c, -0xe5170000, -0x000d8180, -0xe5171000, -0x000d8180, -0xe1500001, -0xab000000, -0x0005004d, -0xe1c900d0, -0xe35b0008, -0x3a000000, -0x00050044, -0xe3710000, -0x000a0000, -0x1a000000, -0x00050044, -0xe5102000, -0x000d8180, -0xe517c000, -0x000d8180, -0xe5171000, -0x000d8180, -0xe3a03000, -0xe2800000, -0x000a0000, -0xe15c0002, -0x3a000000, -0x00050044, -0x0006000b, -0xe7d0c003, -0xe1530002, -0x2a000000, -0x00050077, -0xe24cb041, -0xe35b001a, -0x322cc020, -0xe7c1c003, -0xe2833001, -0xea000000, -0x0005000b, 0x0006007d, 0xe5170000, 0x000d8180, @@ -2335,16 +2303,15 @@ static const unsigned int build_actionlist[5675] = { 0x000d8180, 0xe1500001, 0xab000000, -0x0005004d, +0x0005004e, 0xe1c900d0, 0xe35b0008, 0x3a000000, -0x00050044, -0x00000000, +0x00050045, 0xe3710000, 0x000a0000, 0x1a000000, -0x00050044, +0x00050045, 0xe5102000, 0x000d8180, 0xe517c000, @@ -2356,13 +2323,13 @@ static const unsigned int build_actionlist[5675] = { 0x000a0000, 0xe15c0002, 0x3a000000, -0x00050044, +0x00050045, 0x0006000b, 0xe7d0c003, 0xe1530002, 0x2a000000, -0x00050077, -0xe24cb061, +0x00050078, +0xe24cb041, 0xe35b001a, 0x322cc020, 0xe7c1c003, @@ -2370,14 +2337,55 @@ static const unsigned int build_actionlist[5675] = { 0xea000000, 0x0005000b, 0x0006007e, +0xe5170000, +0x000d8180, +0xe5171000, +0x000d8180, +0xe1500001, +0xab000000, +0x0005004e, 0xe1c900d0, 0xe35b0008, 0x3a000000, -0x00050044, +0x00050045, +0x00000000, 0xe3710000, 0x000a0000, 0x1a000000, -0x00050044, +0x00050045, +0xe5102000, +0x000d8180, +0xe517c000, +0x000d8180, +0xe5171000, +0x000d8180, +0xe3a03000, +0xe2800000, +0x000a0000, +0xe15c0002, +0x3a000000, +0x00050045, +0x0006000b, +0xe7d0c003, +0xe1530002, +0x2a000000, +0x00050078, +0xe24cb061, +0xe35b001a, +0x322cc020, +0xe7c1c003, +0xe2833001, +0xea000000, +0x0005000b, +0x0006007f, +0xe1c900d0, +0xe35b0008, +0x3a000000, +0x00050045, +0xe3710000, +0x000a0000, +0x1a000000, +0x00050045, 0x00000000, 0xe1a0a009, 0x00000000, @@ -2389,11 +2397,11 @@ static const unsigned int build_actionlist[5675] = { 0xe3e01000, 0x000a0000, 0xea000000, -0x00050047, -0x0006007f, -0x8a000000, -0x00050044, +0x00050048, 0x00060080, +0x8a000000, +0x00050045, +0x00060081, 0xe1a0c081, 0xe29cc980, 0x53a00000, @@ -2418,28 +2426,28 @@ static const unsigned int build_actionlist[5675] = { 0xe1830c10, 0xb2600000, 0xe12fff1e, -0x00060081, -0xe1c900d0, -0xe35b0008, -0x3a000000, -0x00050044, -0xe3710000, -0x000a0000, -0x1b000000, -0x0005007f, -0xe3e01000, -0x000a0000, -0xea000000, -0x00050047, 0x00060082, 0xe1c900d0, 0xe35b0008, 0x3a000000, -0x00050044, +0x00050045, 0xe3710000, 0x000a0000, 0x1b000000, -0x0005007f, +0x00050080, +0xe3e01000, +0x000a0000, +0xea000000, +0x00050048, +0x00060083, +0xe1c900d0, +0xe35b0008, +0x3a000000, +0x00050045, +0xe3710000, +0x000a0000, +0x1b000000, +0x00050080, 0xe1a02000, 0xe3a0a008, 0x0006000b, @@ -2451,20 +2459,20 @@ static const unsigned int build_actionlist[5675] = { 0xe3710000, 0x000a0000, 0x1b000000, -0x0005007f, +0x00050080, 0xe0022000, 0xea000000, 0x0005000b, -0x00060083, +0x00060084, 0x00000000, 0xe1c900d0, 0xe35b0008, 0x3a000000, -0x00050044, +0x00050045, 0xe3710000, 0x000a0000, 0x1b000000, -0x0005007f, +0x00050080, 0xe1a02000, 0xe3a0a008, 0x0006000b, @@ -2476,19 +2484,19 @@ static const unsigned int build_actionlist[5675] = { 0xe3710000, 0x000a0000, 0x1b000000, -0x0005007f, +0x00050080, 0xe1822000, 0xea000000, 0x0005000b, -0x00060084, +0x00060085, 0xe1c900d0, 0xe35b0008, 0x3a000000, -0x00050044, +0x00050045, 0xe3710000, 0x000a0000, 0x1b000000, -0x0005007f, +0x00050080, 0xe1a02000, 0xe3a0a008, 0x0006000b, @@ -2500,7 +2508,7 @@ static const unsigned int build_actionlist[5675] = { 0xe3710000, 0x000a0000, 0x1b000000, -0x0005007f, +0x00050080, 0xe0222000, 0xea000000, 0x0005000b, @@ -2510,17 +2518,17 @@ static const unsigned int build_actionlist[5675] = { 0xe5196004, 0xe14920f8, 0xea000000, -0x0005005c, -0x00060085, +0x0005005d, +0x00060086, 0xe1c900d0, 0xe35b0008, 0x3a000000, -0x00050044, +0x00050045, 0x00000000, 0xe3710000, 0x000a0000, 0x1b000000, -0x0005007f, +0x00050080, 0xe0202860, 0xe3c228ff, 0xe1a00460, @@ -2528,124 +2536,124 @@ static const unsigned int build_actionlist[5675] = { 0x000a0000, 0xe0200422, 0xea000000, -0x00050047, -0x00060086, +0x00050048, +0x00060087, 0xe1c900d0, 0xe35b0008, 0x3a000000, -0x00050044, +0x00050045, 0xe3710000, 0x000a0000, 0x1b000000, -0x0005007f, +0x00050080, 0xe1e00000, 0xe3e01000, 0x000a0000, 0xea000000, -0x00050047, -0x00060087, +0x00050048, +0x00060088, 0xe1c900d8, 0xe35b0010, 0x3a000000, -0x00050044, +0x00050045, 0xe3710000, 0x000a0000, 0x1b000000, -0x0005007f, +0x00050080, 0xe200a01f, 0xe1c900d0, 0xe3710000, 0x000a0000, 0x1b000000, -0x0005007f, +0x00050080, 0xe1a00a10, 0xe3e01000, 0x000a0000, 0xea000000, -0x00050047, -0x00060088, +0x00050048, +0x00060089, 0xe1c900d8, 0xe35b0010, 0x3a000000, -0x00050044, +0x00050045, 0xe3710000, 0x000a0000, 0x1b000000, -0x0005007f, +0x00050080, 0x00000000, 0xe200a01f, 0xe1c900d0, 0xe3710000, 0x000a0000, 0x1b000000, -0x0005007f, +0x00050080, 0xe1a00a30, 0xe3e01000, 0x000a0000, 0xea000000, -0x00050047, -0x00060089, +0x00050048, +0x0006008a, 0xe1c900d8, 0xe35b0010, 0x3a000000, -0x00050044, +0x00050045, 0xe3710000, 0x000a0000, 0x1b000000, -0x0005007f, +0x00050080, 0xe200a01f, 0xe1c900d0, 0xe3710000, 0x000a0000, 0x1b000000, -0x0005007f, +0x00050080, 0xe1a00a50, 0xe3e01000, 0x000a0000, 0xea000000, -0x00050047, -0x0006008a, +0x00050048, +0x0006008b, 0xe1c900d8, 0xe35b0010, 0x3a000000, -0x00050044, +0x00050045, 0xe3710000, 0x000a0000, 0x1b000000, -0x0005007f, +0x00050080, 0xe260a000, 0xe1c900d0, 0xe3710000, 0x000a0000, 0x1b000000, -0x0005007f, +0x00050080, 0xe1a00a70, 0xe3e01000, 0x000a0000, 0xea000000, -0x00050047, -0x0006008b, +0x00050048, +0x0006008c, 0xe1c900d8, 0xe35b0010, 0x3a000000, -0x00050044, +0x00050045, 0x00000000, 0xe3710000, 0x000a0000, 0x1b000000, -0x0005007f, +0x00050080, 0xe200a01f, 0xe1c900d0, 0xe3710000, 0x000a0000, 0x1b000000, -0x0005007f, +0x00050080, 0xe1a00a70, 0xe3e01000, 0x000a0000, 0xea000000, -0x00050047, -0x00060044, +0x00050048, +0x00060045, 0xe5192008, 0xe5181000, 0x000d8180, @@ -2671,7 +2679,7 @@ static const unsigned int build_actionlist[5675] = { 0xe1a0b180, 0xe249a008, 0xca000000, -0x00050045, +0x00050046, 0x0006000b, 0xe5180000, 0x000d8180, @@ -2709,7 +2717,7 @@ static const unsigned int build_actionlist[5675] = { 0xe1500000, 0xea000000, 0x0005000b, -0x0006004d, +0x0006004e, 0xe1a0a00e, 0xe5089000, 0x000d8180, @@ -2725,7 +2733,7 @@ static const unsigned int build_actionlist[5675] = { 0xe1a0e00a, 0xe5192008, 0xe12fff1e, -0x0006008c, +0x0006008d, 0x00000000, 0xe5570000, 0x000d8180, @@ -2747,7 +2755,7 @@ static const unsigned int build_actionlist[5675] = { 0xea000000, 0x00050001, 0x00000000, -0x0006008d, +0x0006008e, 0xe5570000, 0x000d8180, 0xe3100000, @@ -2759,7 +2767,7 @@ static const unsigned int build_actionlist[5675] = { 0xe087c10c, 0xe51cf000, 0x000d8180, -0x0006008e, +0x0006008f, 0xe5570000, 0x000d8180, 0xe5171000, @@ -2801,13 +2809,13 @@ static const unsigned int build_actionlist[5675] = { 0xe004a2ae, 0xe1a0b82e, 0xe12fff1c, -0x0006008f, +0x00060090, 0xe5130018, 0xe2866004, 0xe58d0004, 0xea000000, 0x0005000e, -0x00060090, +0x00060091, 0x00000000, 0xe5192008, 0xe2470000, @@ -2830,13 +2838,13 @@ static const unsigned int build_actionlist[5675] = { 0xea000000, 0x0005000d, 0x00000000, -0x00060091, +0x00060092, 0xe1a01006, 0x00000000, 0xea000000, 0x00050001, 0x00000000, -0x00060092, +0x00060093, 0x00000000, 0xe3861001, 0x0006000b, @@ -2862,7 +2870,7 @@ static const unsigned int build_actionlist[5675] = { 0xe5192008, 0xe516e004, 0xe12fff10, -0x00060093, +0x00060094, 0x00000000, 0xe24dd00c, 0xe92d1fff, @@ -2912,7 +2920,7 @@ static const unsigned int build_actionlist[5675] = { 0xea000000, 0x00050001, 0x00000000, -0x00060094, +0x00060095, 0x00000000, 0xe59d800c, 0x0006000b, @@ -2953,7 +2961,7 @@ static const unsigned int build_actionlist[5675] = { 0x00000000, 0x00060013, 0x3ff00000, -0x00060058, +0x00060059, 0xe1a02081, 0xe292c980, 0x5a000000, @@ -2988,7 +2996,7 @@ static const unsigned int build_actionlist[5675] = { 0x00050813, 0x11811003, 0xe12fff1e, -0x0006005a, +0x0006005b, 0xe1a02081, 0xe292c980, 0x5a000000, @@ -3023,7 +3031,7 @@ static const unsigned int build_actionlist[5675] = { 0x00050813, 0x11811003, 0xe12fff1e, -0x00060095, +0x00060096, 0x00000000, 0xe1a02081, 0xe292c980, @@ -3039,12 +3047,12 @@ static const unsigned int build_actionlist[5675] = { 0x50011c13, 0xe12fff1e, 0x00000000, -0x00060096, +0x00060097, 0xe92d401f, 0xeb000000, 0x0003002d, 0xeb000000, -0x00050058, +0x00050059, 0xe1cd20d8, 0xeb000000, 0x0003001f, @@ -3054,7 +3062,7 @@ static const unsigned int build_actionlist[5675] = { 0x0003002e, 0xe28dd014, 0xe8bd8000, -0x00060097, +0x00060098, 0xe210c480, 0x42600000, 0xe02cc0c1, @@ -3087,7 +3095,7 @@ static const unsigned int build_actionlist[5675] = { 0xe030108c, 0x42600000, 0xe12fff1e, -0x00060098, +0x00060099, 0xe59dc000, 0xe35c0001, 0x3a000000, @@ -3101,7 +3109,7 @@ static const unsigned int build_actionlist[5675] = { 0x0003002d, 0xe35c0005, 0x3a000000, -0x00050096, +0x00050097, 0x0a000000, 0x0003001c, 0xe35c0007, @@ -3136,7 +3144,7 @@ static const unsigned int build_actionlist[5675] = { 0x00000000, 0xe7f001f0, 0x00000000, -0x00060099, +0x0006009a, 0x00000000, 0xe92d4830, 0xe1a04000, @@ -3261,10 +3269,10 @@ static const unsigned int build_actionlist[5675] = { 0x000a0000, 0x00000000, 0x9a000000, -0x0005009a, +0x0005009b, 0x00000000, 0x9a000000, -0x0005009b, +0x0005009c, 0x00000000, 0xe3710000, 0x000a0000, @@ -3382,10 +3390,10 @@ static const unsigned int build_actionlist[5675] = { 0xe2866004, 0xe086c10c, 0x00000000, -0x0006009a, -0x00000000, 0x0006009b, 0x00000000, +0x0006009c, +0x00000000, 0xe3710000, 0x000a0000, 0x1a000000, @@ -3574,6 +3582,15 @@ static const unsigned int build_actionlist[5675] = { 0x1a000000, 0x0005003f, 0x00000000, +0xe5102000, +0x000d8180, +0xe3520000, +0x1a000000, +0x00050009, +0x0006000d, +0x00000000, +0x00060040, +0x00000000, 0xe1a0b009, 0x00000000, 0xeb000000, @@ -3584,6 +3601,16 @@ static const unsigned int build_actionlist[5675] = { 0xea000000, 0x0005000b, 0x00000000, +0x00060013, +0xe5523000, +0x000d8180, +0xe3130000, +0x000a0000, +0x1a000000, +0x0005000d, +0xea000000, +0x0005003f, +0x00000000, 0xe004caae, 0xe004b6ae, 0x00000000, @@ -3955,7 +3982,7 @@ static const unsigned int build_actionlist[5675] = { 0x0005003e, 0x00000000, 0xeb000000, -0x00050097, +0x00050098, 0xe3e01000, 0x000a0000, 0x0006000e, @@ -4008,7 +4035,7 @@ static const unsigned int build_actionlist[5675] = { 0x0005003e, 0x00000000, 0xeb000000, -0x00050096, +0x00050097, 0xea000000, 0x0005000e, 0x00000000, @@ -4426,10 +4453,10 @@ static const unsigned int build_actionlist[5675] = { 0xe795b10b, 0x00000000, 0xea000000, -0x0005009c, +0x0005009d, 0x00000000, 0xea000000, -0x0005009d, +0x0005009e, 0x00000000, 0xe004caae, 0xe004b6ae, @@ -4484,7 +4511,7 @@ static const unsigned int build_actionlist[5675] = { 0x000a0000, 0x01a0b002, 0x0a000000, -0x0005009c, +0x0005009d, 0xea000000, 0x0005002f, 0x00000000, @@ -4497,7 +4524,7 @@ static const unsigned int build_actionlist[5675] = { 0x000a0000, 0x1a000000, 0x0005002c, -0x0006009c, +0x0006009d, 0xe5102000, 0x000d8180, 0xe51b3000, @@ -4675,7 +4702,7 @@ static const unsigned int build_actionlist[5675] = { 0x000a0000, 0x01a0b002, 0x0a000000, -0x0005009d, +0x0005009e, 0xea000000, 0x00050033, 0x00000000, @@ -4688,7 +4715,7 @@ static const unsigned int build_actionlist[5675] = { 0x000a0000, 0x1a000000, 0x00050030, -0x0006009d, +0x0006009e, 0xe5102000, 0x000d8180, 0xe51b3000, @@ -4934,10 +4961,10 @@ static const unsigned int build_actionlist[5675] = { 0xe004b6ae, 0xe08bb000, 0xea000000, -0x0005009e, +0x0005009f, 0x00000000, 0xe004b6ae, -0x0006009e, +0x0006009f, 0xe1a0c009, 0xe1a920da, 0xe24bb008, @@ -4959,19 +4986,19 @@ static const unsigned int build_actionlist[5675] = { 0xe59d0004, 0xe080b18b, 0xea000000, -0x0005009f, +0x000500a0, 0x00000000, 0xe1a0b18b, -0x0006009f, +0x000600a0, 0xe1aa20d9, 0xe24bb008, 0xe28aa008, 0xe3730000, 0x000a0000, 0x1a000000, -0x00050040, +0x00050041, 0xe5196004, -0x00060041, +0x00060042, 0xe3a0c000, 0xe5523000, 0x000d8180, @@ -5238,12 +5265,12 @@ static const unsigned int build_actionlist[5675] = { 0xe089a00a, 0xe080b18b, 0xea000000, -0x000500a0, +0x000500a1, 0x00000000, 0xe5196004, 0xe1a0b18b, 0xe089a00a, -0x000600a0, +0x000600a1, 0xe58db004, 0x0006000b, 0xe2160000, @@ -5251,7 +5278,7 @@ static const unsigned int build_actionlist[5675] = { 0xe2261000, 0x000a0000, 0x1a000000, -0x000500a1, +0x000500a2, 0x00060017, 0xe516e004, 0xe25b3008, @@ -5293,9 +5320,9 @@ static const unsigned int build_actionlist[5675] = { 0xe509100c, 0xea000000, 0x0005000f, -0x000600a2, +0x000600a3, 0xe089a00a, -0x000600a1, +0x000600a2, 0xe3110000, 0x000a0000, 0x1a000000, @@ -5314,7 +5341,7 @@ static const unsigned int build_actionlist[5675] = { 0x000a0000, 0x0516e004, 0x1a000000, -0x000500a2, +0x000500a3, 0x00000000, 0xe18900da, 0x00000000, @@ -5357,7 +5384,7 @@ static const unsigned int build_actionlist[5675] = { 0xe2511001, 0xe18710b0, 0x0a000000, -0x00050090, +0x00050091, 0x00000000, 0xe1aa00d9, 0x00000000, @@ -5375,7 +5402,7 @@ static const unsigned int build_actionlist[5675] = { 0x037c0000, 0x000a0000, 0x1a000000, -0x00050042, +0x00050043, 0xe3530000, 0xba000000, 0x00050004, @@ -5438,7 +5465,7 @@ static const unsigned int build_actionlist[5675] = { 0x337c0000, 0x000a0000, 0x2a000000, -0x00050042, +0x00050043, 0xe35c0000, 0xe1ca00f0, 0xe1ca01f8, @@ -5495,7 +5522,7 @@ static const unsigned int build_actionlist[5675] = { 0xe2511001, 0xe18710b0, 0x0a000000, -0x00050090, +0x00050091, 0x00000000, 0xe1aa00d9, 0x00000000, @@ -5526,7 +5553,7 @@ static const unsigned int build_actionlist[5675] = { 0xe2511001, 0xe18710b0, 0x0a000000, -0x00050090, +0x00050091, 0x00000000, 0xe5d6c000, 0xe496e004, @@ -5566,7 +5593,7 @@ static const unsigned int build_actionlist[5675] = { 0xe2511001, 0xe18710b0, 0x0a000000, -0x00050092, +0x00050093, 0x00000000, 0xe5180000, 0x000d8180, @@ -5735,6 +5762,7 @@ enum { GLOB_vmeta_unm, GLOB_vmeta_arith_vv, GLOB_vmeta_len, + GLOB_BC_LEN_Z, GLOB_vmeta_callt, GLOB_BC_CALLT2_Z, GLOB_vmeta_for, @@ -5881,6 +5909,7 @@ static const char *const globnames[] = { "vmeta_unm", "vmeta_arith_vv", "vmeta_len", + "BC_LEN_Z", "vmeta_callt", "BC_CALLT2_Z", "vmeta_for", @@ -6100,299 +6129,304 @@ static void build_subroutines(BuildCtx *ctx) if (LJ_TARGET_OSX) { dasm_put(Dst, 614, Dt1(->base)); } - dasm_put(Dst, 617, Dt1(->base)); - if (LJ_TARGET_OSX) { - dasm_put(Dst, 627); - } - dasm_put(Dst, 629); - if (LJ_TARGET_OSX) { - dasm_put(Dst, 632); - } - dasm_put(Dst, 634, Dt7(->field_pc), Dt1(->base)); - if (LJ_TARGET_OSX) { - dasm_put(Dst, 655, Dt1(->base)); - } - dasm_put(Dst, 658, Dt1(->base)); - if (LJ_TARGET_OSX) { - dasm_put(Dst, 672, Dt1(->base)); - } -#if LJ_HASJIT - dasm_put(Dst, 675); -#endif - dasm_put(Dst, 677); -#if LJ_HASJIT - dasm_put(Dst, 679, BC_JFORI); -#endif - dasm_put(Dst, 682); -#if LJ_HASJIT - dasm_put(Dst, 685, BC_JFORI); -#endif - dasm_put(Dst, 688, BC_FORI, -LJ_TTRUE, -LJ_TISNUM, ~LJ_TISNUM, (int)(offsetof(GCfuncC, upvalue)>>3)-1, -LJ_TTAB, -LJ_TUDATA, Dt6(->metatable)); - dasm_put(Dst, 745, ~LJ_TNIL, DISPATCH_GL(gcroot[GCROOT_MMNAME+MM_metatable]), Dt6(->hmask), Dt5(->hash), Dt6(->node), DtB(->key), DtB(->val), DtB(->next), -LJ_TSTR, ~LJ_TTAB, -LJ_TNIL, -LJ_TISNUM); - dasm_put(Dst, 793, ~LJ_TISNUM, DISPATCH_GL(gcroot[GCROOT_BASEMT]), -LJ_TTAB, Dt6(->metatable), -LJ_TTAB, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), DISPATCH_GL(gc.grayagain), LJ_GC_BLACK, DISPATCH_GL(gc.grayagain), Dt6(->marked), Dt6(->gclist), -LJ_TTAB); - dasm_put(Dst, 845); - if (LJ_TARGET_OSX) { - dasm_put(Dst, 850); - } - dasm_put(Dst, 852); - if (LJ_TARGET_OSX) { - dasm_put(Dst, 855); - } - dasm_put(Dst, 857, -LJ_TISNUM, -LJ_TSTR, DISPATCH_GL(gcroot[GCROOT_BASEMT_NUM]), Dt1(->base), -LJ_TISNUM, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), ~LJ_TSTR); - dasm_put(Dst, 909, ~LJ_TNIL, -LJ_TTAB, Dt1(->base), Dt1(->top)); - if (LJ_TARGET_OSX) { - dasm_put(Dst, 932, Dt1(->base)); - } - dasm_put(Dst, 935, ~LJ_TNIL, (2+1)*8, -LJ_TTAB); #ifdef LUAJIT_ENABLE_LUA52COMPAT - dasm_put(Dst, 958, Dt6(->metatable)); + dasm_put(Dst, 617); +#else + dasm_put(Dst, 624); #endif - dasm_put(Dst, 961, Dt8(->upvalue[0])); + dasm_put(Dst, 627, Dt1(->base)); + if (LJ_TARGET_OSX) { + dasm_put(Dst, 635); + } + dasm_put(Dst, 637); + if (LJ_TARGET_OSX) { + dasm_put(Dst, 640); + } + dasm_put(Dst, 642, Dt7(->field_pc), Dt1(->base)); + if (LJ_TARGET_OSX) { + dasm_put(Dst, 663, Dt1(->base)); + } + dasm_put(Dst, 666, Dt1(->base)); + if (LJ_TARGET_OSX) { + dasm_put(Dst, 680, Dt1(->base)); + } +#if LJ_HASJIT + dasm_put(Dst, 683); +#endif + dasm_put(Dst, 685); +#if LJ_HASJIT + dasm_put(Dst, 687, BC_JFORI); +#endif + dasm_put(Dst, 690); +#if LJ_HASJIT + dasm_put(Dst, 693, BC_JFORI); +#endif + dasm_put(Dst, 696, BC_FORI, -LJ_TTRUE, -LJ_TISNUM, ~LJ_TISNUM, (int)(offsetof(GCfuncC, upvalue)>>3)-1, -LJ_TTAB, -LJ_TUDATA, Dt6(->metatable)); + dasm_put(Dst, 753, ~LJ_TNIL, DISPATCH_GL(gcroot[GCROOT_MMNAME+MM_metatable]), Dt6(->hmask), Dt5(->hash), Dt6(->node), DtB(->key), DtB(->val), DtB(->next), -LJ_TSTR, ~LJ_TTAB, -LJ_TNIL, -LJ_TISNUM); + dasm_put(Dst, 801, ~LJ_TISNUM, DISPATCH_GL(gcroot[GCROOT_BASEMT]), -LJ_TTAB, Dt6(->metatable), -LJ_TTAB, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), DISPATCH_GL(gc.grayagain), LJ_GC_BLACK, DISPATCH_GL(gc.grayagain), Dt6(->marked), Dt6(->gclist), -LJ_TTAB); + dasm_put(Dst, 853); + if (LJ_TARGET_OSX) { + dasm_put(Dst, 858); + } + dasm_put(Dst, 860); + if (LJ_TARGET_OSX) { + dasm_put(Dst, 863); + } + dasm_put(Dst, 865, -LJ_TISNUM, -LJ_TSTR, DISPATCH_GL(gcroot[GCROOT_BASEMT_NUM]), Dt1(->base), -LJ_TISNUM, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), ~LJ_TSTR); + dasm_put(Dst, 917, ~LJ_TNIL, -LJ_TTAB, Dt1(->base), Dt1(->top)); + if (LJ_TARGET_OSX) { + dasm_put(Dst, 940, Dt1(->base)); + } + dasm_put(Dst, 943, ~LJ_TNIL, (2+1)*8, -LJ_TTAB); #ifdef LUAJIT_ENABLE_LUA52COMPAT - dasm_put(Dst, 965); + dasm_put(Dst, 966, Dt6(->metatable)); #endif - dasm_put(Dst, 969, ~LJ_TNIL, (3+1)*8, -LJ_TTAB, -LJ_TISNUM, Dt6(->asize), Dt6(->array), (0+1)*8, -LJ_TNIL, (2+1)*8, Dt6(->hmask)); - if (LJ_TARGET_OSX) { - dasm_put(Dst, 1019); - } - dasm_put(Dst, 1021); - if (LJ_TARGET_OSX) { - dasm_put(Dst, 1024); - } - dasm_put(Dst, 1026, -LJ_TTAB); + dasm_put(Dst, 969, Dt8(->upvalue[0])); #ifdef LUAJIT_ENABLE_LUA52COMPAT - dasm_put(Dst, 1042, Dt6(->metatable)); + dasm_put(Dst, 973); #endif - dasm_put(Dst, 1045, Dt8(->upvalue[0])); + dasm_put(Dst, 977, ~LJ_TNIL, (3+1)*8, -LJ_TTAB, -LJ_TISNUM, Dt6(->asize), Dt6(->array), (0+1)*8, -LJ_TNIL, (2+1)*8, Dt6(->hmask)); + if (LJ_TARGET_OSX) { + dasm_put(Dst, 1027); + } + dasm_put(Dst, 1029); + if (LJ_TARGET_OSX) { + dasm_put(Dst, 1032); + } + dasm_put(Dst, 1034, -LJ_TTAB); #ifdef LUAJIT_ENABLE_LUA52COMPAT - dasm_put(Dst, 1049); + dasm_put(Dst, 1050, Dt6(->metatable)); #endif - dasm_put(Dst, 1053, ~LJ_TISNUM, (3+1)*8, DISPATCH_GL(hookmask), HOOK_ACTIVE, 8+FRAME_PCALL, 8+FRAME_PCALLH, DISPATCH_GL(hookmask), -LJ_TFUNC, HOOK_ACTIVE, 16+FRAME_PCALL, 16+FRAME_PCALLH, -LJ_TTHREAD); - dasm_put(Dst, 1112, Dt1(->base), Dt1(->top), Dt1(->status), Dt1(->base), Dt1(->maxstack), Dt1(->cframe), LUA_YIELD, Dt1(->top), Dt1(->top), Dt1(->base), LJ_VMST_INTERP, Dt1(->top), DISPATCH_GL(vmstate), LUA_YIELD); - dasm_put(Dst, 1171, Dt1(->base), Dt1(->maxstack), Dt1(->top), ~LJ_TTRUE, FRAME_TYPE, ~LJ_TFALSE, (2+1)*8, Dt1(->top)); - dasm_put(Dst, 1231, Dt8(->upvalue[0].gcr), Dt1(->base), Dt1(->top), Dt1(->status), Dt1(->base), Dt1(->maxstack), Dt1(->cframe), LUA_YIELD, Dt1(->top), Dt1(->top), Dt1(->base), LJ_VMST_INTERP, Dt1(->top), DISPATCH_GL(vmstate), LUA_YIELD); - dasm_put(Dst, 1287, Dt1(->base), Dt1(->maxstack), Dt1(->top), FRAME_TYPE, Dt1(->cframe), Dt1(->base), CFRAME_RESUME, Dt1(->top)); - dasm_put(Dst, 1346, LUA_YIELD, Dt1(->cframe), Dt1(->status), -LJ_TISNUM, ~LJ_TISNUM, ~LJ_TISNUM); - dasm_put(Dst, 1412, -LJ_TISNUM, ~LJ_TISNUM, ~LJ_TISNUM); - dasm_put(Dst, 1476, -LJ_TISNUM, (1+1)*8, FRAME_TYPE, ~LJ_TNIL); - dasm_put(Dst, 1540, -LJ_TISNUM); - if (LJ_TARGET_OSX) { - dasm_put(Dst, 1545); - } - dasm_put(Dst, 1547); - if (LJ_TARGET_OSX) { - dasm_put(Dst, 1550); - } - dasm_put(Dst, 1552, -LJ_TISNUM); - if (LJ_TARGET_OSX) { - dasm_put(Dst, 1564); - } - dasm_put(Dst, 1566); - if (LJ_TARGET_OSX) { - dasm_put(Dst, 1569); - } - dasm_put(Dst, 1571, -LJ_TISNUM); - if (LJ_TARGET_OSX) { - dasm_put(Dst, 1583); - } - dasm_put(Dst, 1585); - if (LJ_TARGET_OSX) { - dasm_put(Dst, 1588); - } - dasm_put(Dst, 1590, -LJ_TISNUM); - if (LJ_TARGET_OSX) { - dasm_put(Dst, 1602); - } - dasm_put(Dst, 1604); - if (LJ_TARGET_OSX) { - dasm_put(Dst, 1607); - } - dasm_put(Dst, 1609, -LJ_TISNUM); - if (LJ_TARGET_OSX) { - dasm_put(Dst, 1621); - } - dasm_put(Dst, 1623); - if (LJ_TARGET_OSX) { - dasm_put(Dst, 1626); - } - dasm_put(Dst, 1628, -LJ_TISNUM); - if (LJ_TARGET_OSX) { - dasm_put(Dst, 1640); - } - dasm_put(Dst, 1642); - if (LJ_TARGET_OSX) { - dasm_put(Dst, 1645); - } - dasm_put(Dst, 1647, -LJ_TISNUM); - if (LJ_TARGET_OSX) { - dasm_put(Dst, 1659); - } - dasm_put(Dst, 1661); - if (LJ_TARGET_OSX) { - dasm_put(Dst, 1664); - } - dasm_put(Dst, 1666, -LJ_TISNUM); - if (LJ_TARGET_OSX) { - dasm_put(Dst, 1678); - } - dasm_put(Dst, 1680); - if (LJ_TARGET_OSX) { - dasm_put(Dst, 1683); - } - dasm_put(Dst, 1685, -LJ_TISNUM); - if (LJ_TARGET_OSX) { - dasm_put(Dst, 1697); - } - dasm_put(Dst, 1699); - if (LJ_TARGET_OSX) { - dasm_put(Dst, 1702); - } - dasm_put(Dst, 1704, -LJ_TISNUM); - if (LJ_TARGET_OSX) { - dasm_put(Dst, 1716); - } - dasm_put(Dst, 1718); - if (LJ_TARGET_OSX) { - dasm_put(Dst, 1721); - } - dasm_put(Dst, 1723, -LJ_TISNUM); - if (LJ_TARGET_OSX) { - dasm_put(Dst, 1735); - } - dasm_put(Dst, 1737); - if (LJ_TARGET_OSX) { - dasm_put(Dst, 1740); - } - dasm_put(Dst, 1742, -LJ_TISNUM); - if (LJ_TARGET_OSX) { - dasm_put(Dst, 1754); - } - dasm_put(Dst, 1756); - if (LJ_TARGET_OSX) { - dasm_put(Dst, 1759); - } - dasm_put(Dst, 1761, -LJ_TISNUM); - if (LJ_TARGET_OSX) { - dasm_put(Dst, 1773); - } - dasm_put(Dst, 1775); - if (LJ_TARGET_OSX) { - dasm_put(Dst, 1778); - } - dasm_put(Dst, 1780, -LJ_TISNUM, -LJ_TISNUM); - if (LJ_TARGET_OSX) { - dasm_put(Dst, 1795); - } - dasm_put(Dst, 1797); - if (LJ_TARGET_OSX) { - dasm_put(Dst, 1800); - } - dasm_put(Dst, 1802, -LJ_TISNUM, -LJ_TISNUM); - if (LJ_TARGET_OSX) { - dasm_put(Dst, 1817); - } - dasm_put(Dst, 1819); - if (LJ_TARGET_OSX) { - dasm_put(Dst, 1822); - } - dasm_put(Dst, 1824, -LJ_TISNUM, -LJ_TISNUM); - if (LJ_TARGET_OSX) { - dasm_put(Dst, 1839); - } - dasm_put(Dst, 1841); - if (LJ_TARGET_OSX) { - dasm_put(Dst, 1844); - } - dasm_put(Dst, 1846, -LJ_TISNUM, Dt8(->upvalue[0]), -LJ_TISNUM, -LJ_TISNUM); - if (LJ_TARGET_OSX) { - dasm_put(Dst, 1879); - } - dasm_put(Dst, 1881); - if (LJ_TARGET_OSX) { - dasm_put(Dst, 1884); - } - dasm_put(Dst, 1886, -LJ_TISNUM); - if (LJ_TARGET_OSX) { - dasm_put(Dst, 1899); - } - dasm_put(Dst, 1901); - if (LJ_TARGET_OSX) { - dasm_put(Dst, 1904); - } - dasm_put(Dst, 1906, ~LJ_TISNUM, (2+1)*8, -LJ_TISNUM); - if (LJ_TARGET_OSX) { - dasm_put(Dst, 1928); - } - dasm_put(Dst, 1930); - if (LJ_TARGET_OSX) { - dasm_put(Dst, 1933); - } - dasm_put(Dst, 1935, (2+1)*8, -LJ_TISNUM, -LJ_TISNUM, -LJ_TISNUM); - dasm_put(Dst, 1986, -LJ_TISNUM, -LJ_TISNUM); - dasm_put(Dst, 2040, -LJ_TISNUM, -LJ_TSTR, Dt5(->len), ~LJ_TISNUM, -LJ_TSTR, Dt5(->len), Dt5([1])); - dasm_put(Dst, 2094, ~LJ_TISNUM, (0+1)*8, (1+1)*8, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), -LJ_TISNUM, Dt1(->base), Dt1(->base), ~LJ_TSTR, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold)); - dasm_put(Dst, 2153, -LJ_TISNUM, -LJ_TSTR, Dt5(->len), -LJ_TISNUM, sizeof(GCstr)-1, -DISPATCH_GL(strempty), ~LJ_TSTR, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), -LJ_TSTR, -LJ_TISNUM, Dt5(->len)); - dasm_put(Dst, 2215, DISPATCH_GL(tmpbuf.sz), DISPATCH_GL(tmpbuf.buf), Dt5([1]), DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), -LJ_TSTR, Dt5(->len), DISPATCH_GL(tmpbuf.sz), DISPATCH_GL(tmpbuf.buf), sizeof(GCstr)); - dasm_put(Dst, 2268, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), -LJ_TSTR, Dt5(->len), DISPATCH_GL(tmpbuf.sz), DISPATCH_GL(tmpbuf.buf), sizeof(GCstr), DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold)); - dasm_put(Dst, 2328, -LJ_TSTR, Dt5(->len), DISPATCH_GL(tmpbuf.sz), DISPATCH_GL(tmpbuf.buf), sizeof(GCstr), -LJ_TTAB); - if (LJ_TARGET_OSX) { - dasm_put(Dst, 2366); - } - dasm_put(Dst, 2368); - if (LJ_TARGET_OSX) { - dasm_put(Dst, 2371); - } - dasm_put(Dst, 2373, ~LJ_TISNUM, -LJ_TISNUM, ~LJ_TISNUM, -LJ_TISNUM, -LJ_TISNUM); - dasm_put(Dst, 2444, -LJ_TISNUM, -LJ_TISNUM, -LJ_TISNUM, -LJ_TISNUM, ~LJ_TISNUM); - dasm_put(Dst, 2504, -LJ_TISNUM, ~LJ_TISNUM, -LJ_TISNUM, ~LJ_TISNUM, -LJ_TISNUM, -LJ_TISNUM, ~LJ_TISNUM, -LJ_TISNUM); - dasm_put(Dst, 2560, -LJ_TISNUM, ~LJ_TISNUM, -LJ_TISNUM, -LJ_TISNUM, ~LJ_TISNUM, -LJ_TISNUM, -LJ_TISNUM, ~LJ_TISNUM); - dasm_put(Dst, 2617, -LJ_TISNUM, -LJ_TISNUM, ~LJ_TISNUM, Dt1(->maxstack), Dt1(->top), Dt8(->f), Dt1(->base), 8*LUA_MINSTACK, Dt1(->base), Dt1(->top), Dt7(->field_pc), FRAME_TYPE, FRAME_TYPEP); - dasm_put(Dst, 2680, LUA_MINSTACK, Dt1(->base), Dt1(->base), Dt1(->top), Dt1(->base)); -#if LJ_HASJIT - dasm_put(Dst, 2714, DISPATCH_GL(hookmask), HOOK_VMEVENT, DISPATCH_GL(hookcount), HOOK_ACTIVE, LUA_MASKLINE|LUA_MASKCOUNT, DISPATCH_GL(hookcount)); + dasm_put(Dst, 1053, Dt8(->upvalue[0])); +#ifdef LUAJIT_ENABLE_LUA52COMPAT + dasm_put(Dst, 1057); #endif - dasm_put(Dst, 2734, DISPATCH_GL(hookmask), HOOK_ACTIVE, GG_DISP2STATIC, DISPATCH_GL(hookmask), DISPATCH_GL(hookcount), HOOK_ACTIVE, LUA_MASKLINE|LUA_MASKCOUNT, DISPATCH_GL(hookcount), LUA_MASKLINE, Dt1(->base), Dt1(->base)); - dasm_put(Dst, 2780, GG_DISP2STATIC); + dasm_put(Dst, 1061, ~LJ_TISNUM, (3+1)*8, DISPATCH_GL(hookmask), HOOK_ACTIVE, 8+FRAME_PCALL, 8+FRAME_PCALLH, DISPATCH_GL(hookmask), -LJ_TFUNC, HOOK_ACTIVE, 16+FRAME_PCALL, 16+FRAME_PCALLH, -LJ_TTHREAD); + dasm_put(Dst, 1120, Dt1(->base), Dt1(->top), Dt1(->status), Dt1(->base), Dt1(->maxstack), Dt1(->cframe), LUA_YIELD, Dt1(->top), Dt1(->top), Dt1(->base), LJ_VMST_INTERP, Dt1(->top), DISPATCH_GL(vmstate), LUA_YIELD); + dasm_put(Dst, 1179, Dt1(->base), Dt1(->maxstack), Dt1(->top), ~LJ_TTRUE, FRAME_TYPE, ~LJ_TFALSE, (2+1)*8, Dt1(->top)); + dasm_put(Dst, 1239, Dt8(->upvalue[0].gcr), Dt1(->base), Dt1(->top), Dt1(->status), Dt1(->base), Dt1(->maxstack), Dt1(->cframe), LUA_YIELD, Dt1(->top), Dt1(->top), Dt1(->base), LJ_VMST_INTERP, Dt1(->top), DISPATCH_GL(vmstate), LUA_YIELD); + dasm_put(Dst, 1295, Dt1(->base), Dt1(->maxstack), Dt1(->top), FRAME_TYPE, Dt1(->cframe), Dt1(->base), CFRAME_RESUME, Dt1(->top)); + dasm_put(Dst, 1354, LUA_YIELD, Dt1(->cframe), Dt1(->status), -LJ_TISNUM, ~LJ_TISNUM, ~LJ_TISNUM); + dasm_put(Dst, 1420, -LJ_TISNUM, ~LJ_TISNUM, ~LJ_TISNUM); + dasm_put(Dst, 1484, -LJ_TISNUM, (1+1)*8, FRAME_TYPE, ~LJ_TNIL); + dasm_put(Dst, 1548, -LJ_TISNUM); + if (LJ_TARGET_OSX) { + dasm_put(Dst, 1553); + } + dasm_put(Dst, 1555); + if (LJ_TARGET_OSX) { + dasm_put(Dst, 1558); + } + dasm_put(Dst, 1560, -LJ_TISNUM); + if (LJ_TARGET_OSX) { + dasm_put(Dst, 1572); + } + dasm_put(Dst, 1574); + if (LJ_TARGET_OSX) { + dasm_put(Dst, 1577); + } + dasm_put(Dst, 1579, -LJ_TISNUM); + if (LJ_TARGET_OSX) { + dasm_put(Dst, 1591); + } + dasm_put(Dst, 1593); + if (LJ_TARGET_OSX) { + dasm_put(Dst, 1596); + } + dasm_put(Dst, 1598, -LJ_TISNUM); + if (LJ_TARGET_OSX) { + dasm_put(Dst, 1610); + } + dasm_put(Dst, 1612); + if (LJ_TARGET_OSX) { + dasm_put(Dst, 1615); + } + dasm_put(Dst, 1617, -LJ_TISNUM); + if (LJ_TARGET_OSX) { + dasm_put(Dst, 1629); + } + dasm_put(Dst, 1631); + if (LJ_TARGET_OSX) { + dasm_put(Dst, 1634); + } + dasm_put(Dst, 1636, -LJ_TISNUM); + if (LJ_TARGET_OSX) { + dasm_put(Dst, 1648); + } + dasm_put(Dst, 1650); + if (LJ_TARGET_OSX) { + dasm_put(Dst, 1653); + } + dasm_put(Dst, 1655, -LJ_TISNUM); + if (LJ_TARGET_OSX) { + dasm_put(Dst, 1667); + } + dasm_put(Dst, 1669); + if (LJ_TARGET_OSX) { + dasm_put(Dst, 1672); + } + dasm_put(Dst, 1674, -LJ_TISNUM); + if (LJ_TARGET_OSX) { + dasm_put(Dst, 1686); + } + dasm_put(Dst, 1688); + if (LJ_TARGET_OSX) { + dasm_put(Dst, 1691); + } + dasm_put(Dst, 1693, -LJ_TISNUM); + if (LJ_TARGET_OSX) { + dasm_put(Dst, 1705); + } + dasm_put(Dst, 1707); + if (LJ_TARGET_OSX) { + dasm_put(Dst, 1710); + } + dasm_put(Dst, 1712, -LJ_TISNUM); + if (LJ_TARGET_OSX) { + dasm_put(Dst, 1724); + } + dasm_put(Dst, 1726); + if (LJ_TARGET_OSX) { + dasm_put(Dst, 1729); + } + dasm_put(Dst, 1731, -LJ_TISNUM); + if (LJ_TARGET_OSX) { + dasm_put(Dst, 1743); + } + dasm_put(Dst, 1745); + if (LJ_TARGET_OSX) { + dasm_put(Dst, 1748); + } + dasm_put(Dst, 1750, -LJ_TISNUM); + if (LJ_TARGET_OSX) { + dasm_put(Dst, 1762); + } + dasm_put(Dst, 1764); + if (LJ_TARGET_OSX) { + dasm_put(Dst, 1767); + } + dasm_put(Dst, 1769, -LJ_TISNUM); + if (LJ_TARGET_OSX) { + dasm_put(Dst, 1781); + } + dasm_put(Dst, 1783); + if (LJ_TARGET_OSX) { + dasm_put(Dst, 1786); + } + dasm_put(Dst, 1788, -LJ_TISNUM, -LJ_TISNUM); + if (LJ_TARGET_OSX) { + dasm_put(Dst, 1803); + } + dasm_put(Dst, 1805); + if (LJ_TARGET_OSX) { + dasm_put(Dst, 1808); + } + dasm_put(Dst, 1810, -LJ_TISNUM, -LJ_TISNUM); + if (LJ_TARGET_OSX) { + dasm_put(Dst, 1825); + } + dasm_put(Dst, 1827); + if (LJ_TARGET_OSX) { + dasm_put(Dst, 1830); + } + dasm_put(Dst, 1832, -LJ_TISNUM, -LJ_TISNUM); + if (LJ_TARGET_OSX) { + dasm_put(Dst, 1847); + } + dasm_put(Dst, 1849); + if (LJ_TARGET_OSX) { + dasm_put(Dst, 1852); + } + dasm_put(Dst, 1854, -LJ_TISNUM, Dt8(->upvalue[0]), -LJ_TISNUM, -LJ_TISNUM); + if (LJ_TARGET_OSX) { + dasm_put(Dst, 1887); + } + dasm_put(Dst, 1889); + if (LJ_TARGET_OSX) { + dasm_put(Dst, 1892); + } + dasm_put(Dst, 1894, -LJ_TISNUM); + if (LJ_TARGET_OSX) { + dasm_put(Dst, 1907); + } + dasm_put(Dst, 1909); + if (LJ_TARGET_OSX) { + dasm_put(Dst, 1912); + } + dasm_put(Dst, 1914, ~LJ_TISNUM, (2+1)*8, -LJ_TISNUM); + if (LJ_TARGET_OSX) { + dasm_put(Dst, 1936); + } + dasm_put(Dst, 1938); + if (LJ_TARGET_OSX) { + dasm_put(Dst, 1941); + } + dasm_put(Dst, 1943, (2+1)*8, -LJ_TISNUM, -LJ_TISNUM, -LJ_TISNUM); + dasm_put(Dst, 1994, -LJ_TISNUM, -LJ_TISNUM); + dasm_put(Dst, 2048, -LJ_TISNUM, -LJ_TSTR, Dt5(->len), ~LJ_TISNUM, -LJ_TSTR, Dt5(->len), Dt5([1])); + dasm_put(Dst, 2102, ~LJ_TISNUM, (0+1)*8, (1+1)*8, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), -LJ_TISNUM, Dt1(->base), Dt1(->base), ~LJ_TSTR, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold)); + dasm_put(Dst, 2161, -LJ_TISNUM, -LJ_TSTR, Dt5(->len), -LJ_TISNUM, sizeof(GCstr)-1, -DISPATCH_GL(strempty), ~LJ_TSTR, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), -LJ_TSTR, -LJ_TISNUM, Dt5(->len)); + dasm_put(Dst, 2223, DISPATCH_GL(tmpbuf.sz), DISPATCH_GL(tmpbuf.buf), Dt5([1]), DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), -LJ_TSTR, Dt5(->len), DISPATCH_GL(tmpbuf.sz), DISPATCH_GL(tmpbuf.buf), sizeof(GCstr)); + dasm_put(Dst, 2276, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), -LJ_TSTR, Dt5(->len), DISPATCH_GL(tmpbuf.sz), DISPATCH_GL(tmpbuf.buf), sizeof(GCstr), DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold)); + dasm_put(Dst, 2336, -LJ_TSTR, Dt5(->len), DISPATCH_GL(tmpbuf.sz), DISPATCH_GL(tmpbuf.buf), sizeof(GCstr), -LJ_TTAB); + if (LJ_TARGET_OSX) { + dasm_put(Dst, 2374); + } + dasm_put(Dst, 2376); + if (LJ_TARGET_OSX) { + dasm_put(Dst, 2379); + } + dasm_put(Dst, 2381, ~LJ_TISNUM, -LJ_TISNUM, ~LJ_TISNUM, -LJ_TISNUM, -LJ_TISNUM); + dasm_put(Dst, 2452, -LJ_TISNUM, -LJ_TISNUM, -LJ_TISNUM, -LJ_TISNUM, ~LJ_TISNUM); + dasm_put(Dst, 2512, -LJ_TISNUM, ~LJ_TISNUM, -LJ_TISNUM, ~LJ_TISNUM, -LJ_TISNUM, -LJ_TISNUM, ~LJ_TISNUM, -LJ_TISNUM); + dasm_put(Dst, 2568, -LJ_TISNUM, ~LJ_TISNUM, -LJ_TISNUM, -LJ_TISNUM, ~LJ_TISNUM, -LJ_TISNUM, -LJ_TISNUM, ~LJ_TISNUM); + dasm_put(Dst, 2625, -LJ_TISNUM, -LJ_TISNUM, ~LJ_TISNUM, Dt1(->maxstack), Dt1(->top), Dt8(->f), Dt1(->base), 8*LUA_MINSTACK, Dt1(->base), Dt1(->top), Dt7(->field_pc), FRAME_TYPE, FRAME_TYPEP); + dasm_put(Dst, 2688, LUA_MINSTACK, Dt1(->base), Dt1(->base), Dt1(->top), Dt1(->base)); #if LJ_HASJIT - dasm_put(Dst, 2796, -GG_DISP2J, Dt7(->field_pc), DISPATCH_J(L), PC2PROTO(framesize), Dt1(->base), Dt1(->top)); + dasm_put(Dst, 2722, DISPATCH_GL(hookmask), HOOK_VMEVENT, DISPATCH_GL(hookcount), HOOK_ACTIVE, LUA_MASKLINE|LUA_MASKCOUNT, DISPATCH_GL(hookcount)); #endif - dasm_put(Dst, 2817); + dasm_put(Dst, 2742, DISPATCH_GL(hookmask), HOOK_ACTIVE, GG_DISP2STATIC, DISPATCH_GL(hookmask), DISPATCH_GL(hookcount), HOOK_ACTIVE, LUA_MASKLINE|LUA_MASKCOUNT, DISPATCH_GL(hookcount), LUA_MASKLINE, Dt1(->base), Dt1(->base)); + dasm_put(Dst, 2788, GG_DISP2STATIC); #if LJ_HASJIT - dasm_put(Dst, 2820); + dasm_put(Dst, 2804, -GG_DISP2J, Dt7(->field_pc), DISPATCH_J(L), PC2PROTO(framesize), Dt1(->base), Dt1(->top)); #endif - dasm_put(Dst, 2823); -#if LJ_HASJIT dasm_put(Dst, 2825); -#endif - dasm_put(Dst, 2828, Dt1(->base), Dt1(->top), Dt1(->base), Dt1(->top)); #if LJ_HASJIT - dasm_put(Dst, 2851, LJ_VMST_EXIT, DISPATCH_GL(vmstate), DISPATCH_GL(jit_L), DISPATCH_GL(jit_base), DISPATCH_J(exitno), DISPATCH_J(L), Dt1(->base), DISPATCH_GL(jit_L), -GG_DISP2J, Dt1(->cframe), Dt1(->base), ~CFRAME_RAWMASK); + dasm_put(Dst, 2828); #endif - dasm_put(Dst, 2899); + dasm_put(Dst, 2831); #if LJ_HASJIT - dasm_put(Dst, 2901, Dt7(->field_pc), DISPATCH_GL(jit_L), LJ_VMST_INTERP, PC2PROTO(k), DISPATCH_GL(vmstate), BC_FUNCF); + dasm_put(Dst, 2833); #endif - dasm_put(Dst, 2938); + dasm_put(Dst, 2836, Dt1(->base), Dt1(->top), Dt1(->base), Dt1(->top)); #if LJ_HASJIT - dasm_put(Dst, 3012); + dasm_put(Dst, 2859, LJ_VMST_EXIT, DISPATCH_GL(vmstate), DISPATCH_GL(jit_L), DISPATCH_GL(jit_base), DISPATCH_J(exitno), DISPATCH_J(L), Dt1(->base), DISPATCH_GL(jit_L), -GG_DISP2J, Dt1(->cframe), Dt1(->base), ~CFRAME_RAWMASK); #endif - dasm_put(Dst, 3026); + dasm_put(Dst, 2907); +#if LJ_HASJIT + dasm_put(Dst, 2909, Dt7(->field_pc), DISPATCH_GL(jit_L), LJ_VMST_INTERP, PC2PROTO(k), DISPATCH_GL(vmstate), BC_FUNCF); +#endif + dasm_put(Dst, 2946); +#if LJ_HASJIT + dasm_put(Dst, 3020); +#endif + dasm_put(Dst, 3034); { int i; for (i = 31; i >= 0; i--) { - dasm_put(Dst, 3062, i, i); + dasm_put(Dst, 3070, i, i); } } - dasm_put(Dst, 3067); + dasm_put(Dst, 3075); #if LJ_HASJIT - dasm_put(Dst, 3096); + dasm_put(Dst, 3104); #else - dasm_put(Dst, 3121); + dasm_put(Dst, 3129); #endif - dasm_put(Dst, 3123); + dasm_put(Dst, 3131); #if LJ_HASFFI #define DtE(_V) (int)(ptrdiff_t)&(((CCallState *)0)_V) - dasm_put(Dst, 3125, DtE(->spadj), DtE(->nsp), offsetof(CCallState, stack), DtE(->func), DtE(->gpr[0]), DtE(->gpr[1]), DtE(->gpr[2]), DtE(->gpr[3]), DtE(->gpr[0]), DtE(->gpr[1])); + dasm_put(Dst, 3133, DtE(->spadj), DtE(->nsp), offsetof(CCallState, stack), DtE(->func), DtE(->gpr[0]), DtE(->gpr[1]), DtE(->gpr[2]), DtE(->gpr[3]), DtE(->gpr[0]), DtE(->gpr[1])); #endif } @@ -6400,7 +6434,7 @@ static void build_subroutines(BuildCtx *ctx) static void build_ins(BuildCtx *ctx, BCOp op, int defop) { int vk = 0; - dasm_put(Dst, 3163, defop); + dasm_put(Dst, 3171, defop); switch (op) { @@ -6409,571 +6443,578 @@ 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, 3165, -LJ_TISNUM, -LJ_TISNUM); + dasm_put(Dst, 3173, -LJ_TISNUM, -LJ_TISNUM); if (op == BC_ISLT) { - dasm_put(Dst, 3181); + dasm_put(Dst, 3189); } else if (op == BC_ISGE) { - dasm_put(Dst, 3183); + dasm_put(Dst, 3191); } else if (op == BC_ISLE) { - dasm_put(Dst, 3185); + dasm_put(Dst, 3193); } else { - dasm_put(Dst, 3187); + dasm_put(Dst, 3195); } - dasm_put(Dst, 3189, -LJ_TISNUM); + dasm_put(Dst, 3197, -LJ_TISNUM); if (op == BC_ISLT) { - dasm_put(Dst, 3225); + dasm_put(Dst, 3233); } else if (op == BC_ISGE) { - dasm_put(Dst, 3227); + dasm_put(Dst, 3235); } else if (op == BC_ISLE) { - dasm_put(Dst, 3229); + dasm_put(Dst, 3237); } else { - dasm_put(Dst, 3231); + dasm_put(Dst, 3239); } - dasm_put(Dst, 3233); + dasm_put(Dst, 3241); break; case BC_ISEQV: case BC_ISNEV: vk = op == BC_ISEQV; - dasm_put(Dst, 3236, -LJ_TISNUM, -LJ_TISNUM); + dasm_put(Dst, 3244, -LJ_TISNUM, -LJ_TISNUM); if (vk) { - dasm_put(Dst, 3247); + dasm_put(Dst, 3255); } else { - dasm_put(Dst, 3250); + dasm_put(Dst, 3258); } if (LJ_HASFFI) { - dasm_put(Dst, 3253, -LJ_TCDATA, -LJ_TCDATA); + dasm_put(Dst, 3261, -LJ_TCDATA, -LJ_TCDATA); } - dasm_put(Dst, 3260, -LJ_TISPRI); + dasm_put(Dst, 3268, -LJ_TISPRI); if (vk) { - dasm_put(Dst, 3269, -LJ_TISTABUD); + dasm_put(Dst, 3277, -LJ_TISTABUD); } else { - dasm_put(Dst, 3286, -LJ_TISTABUD); + dasm_put(Dst, 3294, -LJ_TISTABUD); } - dasm_put(Dst, 3293, Dt6(->metatable)); + dasm_put(Dst, 3301, Dt6(->metatable)); if (vk) { - dasm_put(Dst, 3297); + dasm_put(Dst, 3305); } else { - dasm_put(Dst, 3300); + dasm_put(Dst, 3308); } - dasm_put(Dst, 3303, Dt6(->nomm), 1-vk, 1<nomm), 1-vk, 1<len), ~LJ_TISNUM, -LJ_TTAB); + dasm_put(Dst, 3545, -LJ_TSTR, Dt5(->len), ~LJ_TISNUM, -LJ_TTAB); +#ifdef LUAJIT_ENABLE_LUA52COMPAT + dasm_put(Dst, 3569, Dt6(->metatable)); +#endif + dasm_put(Dst, 3576); if (LJ_TARGET_OSX) { - dasm_put(Dst, 3561); + dasm_put(Dst, 3578); } - dasm_put(Dst, 3563); + dasm_put(Dst, 3580); if (LJ_TARGET_OSX) { - dasm_put(Dst, 3566); + dasm_put(Dst, 3583); } - dasm_put(Dst, 3568); + dasm_put(Dst, 3585); +#ifdef LUAJIT_ENABLE_LUA52COMPAT + dasm_put(Dst, 3588, Dt6(->nomm), 1<base), Dt1(->base)); + dasm_put(Dst, 4092, Dt1(->base), Dt1(->base)); break; /* -- Constant ops ------------------------------------------------------ */ case BC_KSTR: - dasm_put(Dst, 4091, ~LJ_TSTR); + dasm_put(Dst, 4118, ~LJ_TSTR); break; case BC_KCDATA: #if LJ_HASFFI - dasm_put(Dst, 4103, ~LJ_TCDATA); + dasm_put(Dst, 4130, ~LJ_TCDATA); #endif break; case BC_KSHORT: - dasm_put(Dst, 4115, ~LJ_TISNUM); + dasm_put(Dst, 4142, ~LJ_TISNUM); break; case BC_KNUM: - dasm_put(Dst, 4126); + dasm_put(Dst, 4153); break; case BC_KPRI: - dasm_put(Dst, 4136); + dasm_put(Dst, 4163); break; case BC_KNIL: - dasm_put(Dst, 4146, ~LJ_TNIL); + dasm_put(Dst, 4173, ~LJ_TNIL); break; /* -- Upvalue and function ops ------------------------------------------ */ case BC_UGET: - dasm_put(Dst, 4165, offsetof(GCfuncL, uvptr), DtA(->v)); + dasm_put(Dst, 4192, offsetof(GCfuncL, uvptr), DtA(->v)); break; case BC_USETV: - dasm_put(Dst, 4181, offsetof(GCfuncL, uvptr), DtA(->marked), DtA(->closed), DtA(->v), LJ_GC_BLACK, -LJ_TISGCV, -(LJ_TISNUM - LJ_TISGCV), Dt4(->gch.marked), -GG_DISP2G, LJ_GC_WHITES); + dasm_put(Dst, 4208, offsetof(GCfuncL, uvptr), DtA(->marked), DtA(->closed), DtA(->v), LJ_GC_BLACK, -LJ_TISGCV, -(LJ_TISNUM - LJ_TISGCV), Dt4(->gch.marked), -GG_DISP2G, LJ_GC_WHITES); if (LJ_TARGET_OSX) { - dasm_put(Dst, 4221); + dasm_put(Dst, 4248); } else { - dasm_put(Dst, 4228); + dasm_put(Dst, 4255); } - dasm_put(Dst, 4231); + dasm_put(Dst, 4258); break; case BC_USETS: - dasm_put(Dst, 4234, offsetof(GCfuncL, uvptr), ~LJ_TSTR, DtA(->marked), DtA(->v), DtA(->closed), LJ_GC_BLACK, Dt5(->marked), LJ_GC_WHITES, -GG_DISP2G); + dasm_put(Dst, 4261, offsetof(GCfuncL, uvptr), ~LJ_TSTR, DtA(->marked), DtA(->v), DtA(->closed), LJ_GC_BLACK, Dt5(->marked), LJ_GC_WHITES, -GG_DISP2G); if (LJ_TARGET_OSX) { - dasm_put(Dst, 4270); + dasm_put(Dst, 4297); } else { - dasm_put(Dst, 4277); + dasm_put(Dst, 4304); } - dasm_put(Dst, 4280); + dasm_put(Dst, 4307); break; case BC_USETN: - dasm_put(Dst, 4283, offsetof(GCfuncL, uvptr), DtA(->v)); + dasm_put(Dst, 4310, offsetof(GCfuncL, uvptr), DtA(->v)); break; case BC_USETP: - dasm_put(Dst, 4300, offsetof(GCfuncL, uvptr), DtA(->v)); + dasm_put(Dst, 4327, offsetof(GCfuncL, uvptr), DtA(->v)); break; case BC_UCLO: - dasm_put(Dst, 4316, Dt1(->openupval), Dt1(->base), Dt1(->base)); + dasm_put(Dst, 4343, Dt1(->openupval), Dt1(->base), Dt1(->base)); break; case BC_FNEW: - dasm_put(Dst, 4339, Dt1(->base), Dt1(->base), ~LJ_TFUNC); + dasm_put(Dst, 4366, Dt1(->base), Dt1(->base), ~LJ_TFUNC); break; /* -- Table ops --------------------------------------------------------- */ @@ -6981,115 +7022,115 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop) case BC_TNEW: case BC_TDUP: if (op == BC_TDUP) { - dasm_put(Dst, 4360); + dasm_put(Dst, 4387); } - dasm_put(Dst, 4362, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base)); + dasm_put(Dst, 4389, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base)); if (op == BC_TNEW) { - dasm_put(Dst, 4375); + dasm_put(Dst, 4402); } else { - dasm_put(Dst, 4384); + dasm_put(Dst, 4411); } - dasm_put(Dst, 4388, Dt1(->base), ~LJ_TTAB); + dasm_put(Dst, 4415, Dt1(->base), ~LJ_TTAB); break; case BC_GGET: case BC_GSET: - dasm_put(Dst, 4406, Dt7(->env)); + dasm_put(Dst, 4433, Dt7(->env)); if (op == BC_GGET) { - dasm_put(Dst, 4412); + dasm_put(Dst, 4439); } else { - dasm_put(Dst, 4415); + dasm_put(Dst, 4442); } break; case BC_TGETV: - dasm_put(Dst, 4418, -LJ_TTAB, -LJ_TISNUM, Dt6(->array), Dt6(->asize), -LJ_TNIL, Dt6(->metatable), Dt6(->nomm), 1<array), Dt6(->asize), -LJ_TNIL, Dt6(->metatable), Dt6(->nomm), 1<hmask), Dt5(->hash), Dt6(->node), DtB(->key), DtB(->val), DtB(->next), -LJ_TSTR, -LJ_TNIL, Dt6(->metatable), ~LJ_TNIL, Dt6(->nomm)); - dasm_put(Dst, 4535, 1<hmask), Dt5(->hash), Dt6(->node), DtB(->key), DtB(->val), DtB(->next), -LJ_TSTR, -LJ_TNIL, Dt6(->metatable), ~LJ_TNIL, Dt6(->nomm)); + dasm_put(Dst, 4562, 1<asize), Dt6(->array), -LJ_TNIL, Dt6(->metatable), Dt6(->nomm), 1<asize), Dt6(->array), -LJ_TNIL, Dt6(->metatable), Dt6(->nomm), 1<array), Dt6(->asize), -LJ_TNIL, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->nomm), 1<marked), Dt6(->gclist), -LJ_TSTR); + dasm_put(Dst, 4612, -LJ_TTAB, -LJ_TISNUM, Dt6(->array), Dt6(->asize), -LJ_TNIL, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->nomm), 1<marked), Dt6(->gclist), -LJ_TSTR); break; case BC_TSETS: - dasm_put(Dst, 4666, -LJ_TTAB, Dt6(->hmask), Dt5(->hash), Dt6(->node), Dt6(->nomm), DtB(->key), DtB(->val.it), DtB(->next), -LJ_TSTR, Dt6(->marked), -LJ_TNIL, LJ_GC_BLACK, DtB(->val)); - dasm_put(Dst, 4724, Dt6(->metatable), Dt6(->nomm), 1<metatable), Dt1(->base), Dt6(->nomm), 1<base), DISPATCH_GL(gc.grayagain), LJ_GC_BLACK); - dasm_put(Dst, 4777, DISPATCH_GL(gc.grayagain), Dt6(->marked), Dt6(->gclist)); + dasm_put(Dst, 4693, -LJ_TTAB, Dt6(->hmask), Dt5(->hash), Dt6(->node), Dt6(->nomm), DtB(->key), DtB(->val.it), DtB(->next), -LJ_TSTR, Dt6(->marked), -LJ_TNIL, LJ_GC_BLACK, DtB(->val)); + dasm_put(Dst, 4751, Dt6(->metatable), Dt6(->nomm), 1<metatable), Dt1(->base), Dt6(->nomm), 1<base), DISPATCH_GL(gc.grayagain), LJ_GC_BLACK); + dasm_put(Dst, 4804, DISPATCH_GL(gc.grayagain), Dt6(->marked), Dt6(->gclist)); break; case BC_TSETB: - dasm_put(Dst, 4786, -LJ_TTAB, Dt6(->asize), Dt6(->array), -LJ_TNIL, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->nomm), 1<marked), Dt6(->gclist)); + dasm_put(Dst, 4813, -LJ_TTAB, Dt6(->asize), Dt6(->array), -LJ_TNIL, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->nomm), 1<marked), Dt6(->gclist)); break; case BC_TSETM: - dasm_put(Dst, 4853, Dt6(->asize), Dt6(->array), Dt6(->marked), LJ_GC_BLACK, Dt1(->base)); + dasm_put(Dst, 4880, Dt6(->asize), Dt6(->array), Dt6(->marked), LJ_GC_BLACK, Dt1(->base)); if (LJ_TARGET_OSX) { - dasm_put(Dst, 4898, Dt1(->base)); + dasm_put(Dst, 4925, Dt1(->base)); } - dasm_put(Dst, 4901, DISPATCH_GL(gc.grayagain), LJ_GC_BLACK, DISPATCH_GL(gc.grayagain), Dt6(->marked), Dt6(->gclist)); + dasm_put(Dst, 4928, DISPATCH_GL(gc.grayagain), LJ_GC_BLACK, DISPATCH_GL(gc.grayagain), Dt6(->marked), Dt6(->gclist)); break; /* -- Calls and vararg handling ----------------------------------------- */ case BC_CALLM: - dasm_put(Dst, 4917); + dasm_put(Dst, 4944); break; case BC_CALL: - dasm_put(Dst, 4923, -LJ_TFUNC, Dt7(->field_pc)); + dasm_put(Dst, 4950, -LJ_TFUNC, Dt7(->field_pc)); break; case BC_CALLMT: - dasm_put(Dst, 4943); + dasm_put(Dst, 4970); break; case BC_CALLT: - dasm_put(Dst, 4948, -LJ_TFUNC, Dt7(->ffid), FRAME_TYPE, Dt7(->field_pc), Dt7(->field_pc), PC2PROTO(k), FRAME_VARG, FRAME_TYPEP); - dasm_put(Dst, 5009, FRAME_TYPE); + dasm_put(Dst, 4975, -LJ_TFUNC, Dt7(->ffid), FRAME_TYPE, Dt7(->field_pc), Dt7(->field_pc), PC2PROTO(k), FRAME_VARG, FRAME_TYPEP); + dasm_put(Dst, 5036, FRAME_TYPE); break; case BC_ITERC: - dasm_put(Dst, 5020, -LJ_TFUNC, Dt7(->field_pc)); + dasm_put(Dst, 5047, -LJ_TFUNC, Dt7(->field_pc)); break; case BC_ITERN: #if LJ_HASJIT #endif - dasm_put(Dst, 5044, Dt6(->asize), Dt6(->array), -LJ_TNIL, ~LJ_TISNUM, Dt6(->hmask), Dt6(->node), DtB(->val), -LJ_TNIL, DtB(->key)); + dasm_put(Dst, 5071, Dt6(->asize), Dt6(->array), -LJ_TNIL, ~LJ_TISNUM, Dt6(->hmask), Dt6(->node), DtB(->val), -LJ_TNIL, DtB(->key)); break; case BC_ISNEXT: - dasm_put(Dst, 5109, -LJ_TFUNC, Dt8(->ffid), -LJ_TTAB, -LJ_TNIL, FF_next_N, BC_JMP, BC_ITERC); + dasm_put(Dst, 5136, -LJ_TFUNC, Dt8(->ffid), -LJ_TTAB, -LJ_TNIL, FF_next_N, BC_JMP, BC_ITERC); break; case BC_VARG: - dasm_put(Dst, 5148, FRAME_VARG, ~LJ_TNIL, Dt1(->maxstack), Dt1(->top), Dt1(->base), Dt1(->base)); + dasm_put(Dst, 5175, FRAME_VARG, ~LJ_TNIL, Dt1(->maxstack), Dt1(->top), Dt1(->base), Dt1(->base)); break; /* -- Returns ----------------------------------------------------------- */ case BC_RETM: - dasm_put(Dst, 5220); + dasm_put(Dst, 5247); break; case BC_RET: - dasm_put(Dst, 5227, FRAME_TYPE, FRAME_VARG, Dt7(->field_pc), PC2PROTO(k), ~LJ_TNIL, FRAME_TYPEP); + dasm_put(Dst, 5254, FRAME_TYPE, FRAME_VARG, Dt7(->field_pc), PC2PROTO(k), ~LJ_TNIL, FRAME_TYPEP); break; case BC_RET0: case BC_RET1: - dasm_put(Dst, 5292, FRAME_TYPE, FRAME_VARG); + dasm_put(Dst, 5319, FRAME_TYPE, FRAME_VARG); if (op == BC_RET1) { - dasm_put(Dst, 5303); + dasm_put(Dst, 5330); } - dasm_put(Dst, 5305); + dasm_put(Dst, 5332); if (op == BC_RET1) { - dasm_put(Dst, 5308); + dasm_put(Dst, 5335); } - dasm_put(Dst, 5310, Dt7(->field_pc), PC2PROTO(k), ~LJ_TNIL); + dasm_put(Dst, 5337, Dt7(->field_pc), PC2PROTO(k), ~LJ_TNIL); break; /* -- Loops and branches ------------------------------------------------ */ @@ -7097,7 +7138,7 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop) case BC_FORL: #if LJ_HASJIT - dasm_put(Dst, 5336, -GG_DISP2HOT); + dasm_put(Dst, 5363, -GG_DISP2HOT); #endif break; @@ -7109,68 +7150,68 @@ 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, 5346); + dasm_put(Dst, 5373); if (op != BC_JFORL) { - dasm_put(Dst, 5348); + dasm_put(Dst, 5375); } if (!vk) { - dasm_put(Dst, 5350, -LJ_TISNUM, -LJ_TISNUM, -LJ_TISNUM); + dasm_put(Dst, 5377, -LJ_TISNUM, -LJ_TISNUM, -LJ_TISNUM); } else { - dasm_put(Dst, 5368, -LJ_TISNUM); + dasm_put(Dst, 5395, -LJ_TISNUM); if (op == BC_IFORL) { - dasm_put(Dst, 5376); + dasm_put(Dst, 5403); } else { - dasm_put(Dst, 5378); + dasm_put(Dst, 5405); } - dasm_put(Dst, 5381); + dasm_put(Dst, 5408); } - dasm_put(Dst, 5386); + dasm_put(Dst, 5413); if (op == BC_FORI) { - dasm_put(Dst, 5388); + dasm_put(Dst, 5415); } else if (op == BC_JFORI) { - dasm_put(Dst, 5390); + dasm_put(Dst, 5417); } else if (op == BC_IFORL) { - dasm_put(Dst, 5393); + dasm_put(Dst, 5420); } if (vk) { - dasm_put(Dst, 5395); + dasm_put(Dst, 5422); } - dasm_put(Dst, 5397); + dasm_put(Dst, 5424); if (op == BC_JFORI || op == BC_JFORL) { - dasm_put(Dst, 5402, BC_JLOOP); + dasm_put(Dst, 5429, BC_JLOOP); } - dasm_put(Dst, 5405); + dasm_put(Dst, 5432); if (!vk) { - dasm_put(Dst, 5412); + dasm_put(Dst, 5439); } else { - dasm_put(Dst, 5414); + dasm_put(Dst, 5441); } - dasm_put(Dst, 5416); + dasm_put(Dst, 5443); if (!vk) { - dasm_put(Dst, 5420, -LJ_TISNUM, -LJ_TISNUM); + dasm_put(Dst, 5447, -LJ_TISNUM, -LJ_TISNUM); } else { - dasm_put(Dst, 5432); - } - dasm_put(Dst, 5441); - if (op == BC_FORI) { - dasm_put(Dst, 5445); - } else if (op == BC_JFORI) { - dasm_put(Dst, 5447, BC_JLOOP); - } else if (op == BC_IFORL) { - dasm_put(Dst, 5452); - } else { - dasm_put(Dst, 5454, BC_JLOOP); - } - dasm_put(Dst, 5457); - if (vk) { - dasm_put(Dst, 5463); + dasm_put(Dst, 5459); } dasm_put(Dst, 5468); + if (op == BC_FORI) { + dasm_put(Dst, 5472); + } else if (op == BC_JFORI) { + dasm_put(Dst, 5474, BC_JLOOP); + } else if (op == BC_IFORL) { + dasm_put(Dst, 5479); + } else { + dasm_put(Dst, 5481, BC_JLOOP); + } + dasm_put(Dst, 5484); + if (vk) { + dasm_put(Dst, 5490); + } + dasm_put(Dst, 5495); break; case BC_ITERL: #if LJ_HASJIT - dasm_put(Dst, 5474, -GG_DISP2HOT); + dasm_put(Dst, 5501, -GG_DISP2HOT); #endif break; @@ -7179,40 +7220,40 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop) break; #endif case BC_IITERL: - dasm_put(Dst, 5484); + dasm_put(Dst, 5511); if (op == BC_JITERL) { - dasm_put(Dst, 5486, -LJ_TNIL, BC_JLOOP); + dasm_put(Dst, 5513, -LJ_TNIL, BC_JLOOP); } else { - dasm_put(Dst, 5492, -LJ_TNIL); + dasm_put(Dst, 5519, -LJ_TNIL); } - dasm_put(Dst, 5498); + dasm_put(Dst, 5525); break; case BC_LOOP: #if LJ_HASJIT - dasm_put(Dst, 5505, -GG_DISP2HOT); + dasm_put(Dst, 5532, -GG_DISP2HOT); #endif break; case BC_ILOOP: - dasm_put(Dst, 5515); + dasm_put(Dst, 5542); break; case BC_JLOOP: #if LJ_HASJIT - dasm_put(Dst, 5522, DISPATCH_J(trace), DISPATCH_GL(vmstate), DtD(->mcode), DISPATCH_GL(jit_base), DISPATCH_GL(jit_L)); + dasm_put(Dst, 5549, DISPATCH_J(trace), DISPATCH_GL(vmstate), DtD(->mcode), DISPATCH_GL(jit_base), DISPATCH_GL(jit_L)); #endif break; case BC_JMP: - dasm_put(Dst, 5536); + dasm_put(Dst, 5563); break; /* -- Function headers -------------------------------------------------- */ case BC_FUNCF: #if LJ_HASJIT - dasm_put(Dst, 5545, -GG_DISP2HOT); + dasm_put(Dst, 5572, -GG_DISP2HOT); #endif case BC_FUNCV: /* NYI: compiled vararg functions. */ break; @@ -7222,42 +7263,42 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop) break; #endif case BC_IFUNCF: - dasm_put(Dst, 5555, Dt1(->maxstack), -4+PC2PROTO(numparams), -4+PC2PROTO(k)); + dasm_put(Dst, 5582, Dt1(->maxstack), -4+PC2PROTO(numparams), -4+PC2PROTO(k)); if (op != BC_JFUNCF) { - dasm_put(Dst, 5565); + dasm_put(Dst, 5592); } - dasm_put(Dst, 5568, ~LJ_TNIL); + dasm_put(Dst, 5595, ~LJ_TNIL); if (op == BC_JFUNCF) { - dasm_put(Dst, 5575, BC_JLOOP); + dasm_put(Dst, 5602, BC_JLOOP); } else { - dasm_put(Dst, 5579); + dasm_put(Dst, 5606); } - dasm_put(Dst, 5584); + dasm_put(Dst, 5611); break; case BC_JFUNCV: #if !LJ_HASJIT break; #endif - dasm_put(Dst, 5590); + dasm_put(Dst, 5617); break; /* NYI: compiled vararg functions. */ case BC_IFUNCV: - dasm_put(Dst, 5592, Dt1(->maxstack), 8+FRAME_VARG, -4+PC2PROTO(k), -4+PC2PROTO(numparams), ~LJ_TNIL); + dasm_put(Dst, 5619, Dt1(->maxstack), 8+FRAME_VARG, -4+PC2PROTO(k), -4+PC2PROTO(numparams), ~LJ_TNIL); break; case BC_FUNCC: case BC_FUNCCW: if (op == BC_FUNCC) { - dasm_put(Dst, 5633, Dt8(->f)); + dasm_put(Dst, 5660, Dt8(->f)); } else { - dasm_put(Dst, 5636, DISPATCH_GL(wrapf)); + dasm_put(Dst, 5663, DISPATCH_GL(wrapf)); } - dasm_put(Dst, 5639, Dt1(->maxstack), Dt1(->base), Dt1(->top)); + dasm_put(Dst, 5666, Dt1(->maxstack), Dt1(->base), Dt1(->top)); if (op == BC_FUNCCW) { - dasm_put(Dst, 5649, Dt8(->f)); + dasm_put(Dst, 5676, Dt8(->f)); } - dasm_put(Dst, 5652, LJ_VMST_C, DISPATCH_GL(vmstate), Dt1(->base), LJ_VMST_INTERP, Dt1(->top), DISPATCH_GL(vmstate)); + dasm_put(Dst, 5679, LJ_VMST_C, DISPATCH_GL(vmstate), Dt1(->base), LJ_VMST_INTERP, Dt1(->top), DISPATCH_GL(vmstate)); break; /* ---------------------------------------------------------------------- */ @@ -7277,7 +7318,7 @@ static int build_backend(BuildCtx *ctx) build_subroutines(ctx); - dasm_put(Dst, 5674); + dasm_put(Dst, 5701); for (op = 0; op < BC__MAX; op++) build_ins(ctx, (BCOp)op, op); diff --git a/src/buildvm_ppc.dasc b/src/buildvm_ppc.dasc index c257de45..4e316883 100644 --- a/src/buildvm_ppc.dasc +++ b/src/buildvm_ppc.dasc @@ -818,13 +818,23 @@ static void build_subroutines(BuildCtx *ctx) | b ->vm_call_dispatch | |->vmeta_len: +#ifdef LUAJIT_ENABLE_LUA52COMPAT + | mr SAVE0, CARG1 +#endif | add CARG2, BASE, RD | stw BASE, L->base | mr CARG1, L | stw PC, SAVE_PC | bl extern lj_meta_len // (lua_State *L, TValue *o) - | // Returns TValue * (metamethod base). + | // Returns NULL (retry) or TValue * (metamethod base). +#ifdef LUAJIT_ENABLE_LUA52COMPAT + | cmplwi CRET1, 0 + | bne ->vmeta_binop // Binop call for compatibility. + | mr CARG1, SAVE0 + | b ->BC_LEN_Z +#else | b ->vmeta_binop // Binop call for compatibility. +#endif | |//-- Call metamethod ---------------------------------------------------- | @@ -2337,9 +2347,23 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop) |2: | checktab CARG1 | checkfail ->vmeta_len +#ifdef LUAJIT_ENABLE_LUA52COMPAT + | lwz TAB:TMP2, TAB:CARG1->metatable + | cmplwi TAB:TMP2, 0 + | bne >9 + |3: +#endif + |->BC_LEN_Z: | bl extern lj_tab_len // (GCtab *t) | // Returns uint32_t (but less than 2^31). | b <1 +#ifdef LUAJIT_ENABLE_LUA52COMPAT + |9: + | lbz TMP0, TAB:TMP2->nomm + | andi. TMP0, TMP0, 1<vmeta_len +#endif break; /* -- Binary ops -------------------------------------------------------- */ 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, -0x280b0008, -0x108e0301, -0x41800000, -0x00050843, -0x1004b232, -0x1064222c, -0x40800000, -0x00050843, -0x48000001, -0x0003000e, -0x1063222d, -0x48000000, -0x00050046, +0x00050058, 0x0006005d, 0x280b0008, 0x108e0301, 0x41800000, -0x00050843, +0x00050844, 0x1004b232, 0x1064222c, 0x40800000, -0x00050843, +0x00050844, 0x48000001, -0x0003000f, +0x0003000e, 0x1063222d, 0x48000000, -0x00050046, +0x00050047, 0x0006005e, 0x280b0008, 0x108e0301, 0x41800000, -0x00050843, +0x00050844, 0x1004b232, 0x1064222c, 0x40800000, -0x00050843, +0x00050844, +0x48000001, +0x0003000f, +0x1063222d, +0x48000000, +0x00050047, +0x0006005f, +0x280b0008, +0x108e0301, +0x41800000, +0x00050844, +0x1004b232, +0x1064222c, +0x40800000, +0x00050844, 0x00000000, 0x48000001, 0x00030010, 0x1063222d, 0x48000000, -0x00050046, -0x0006005f, -0x280b0008, -0x108e0301, -0x41800000, -0x00050843, -0x1004b232, -0x1064222c, -0x40800000, -0x00050843, -0x48000001, -0x00030011, -0x1063222d, -0x48000000, -0x00050046, +0x00050047, 0x00060060, 0x280b0008, 0x108e0301, 0x41800000, -0x00050843, +0x00050844, 0x1004b232, 0x1064222c, 0x40800000, -0x00050843, +0x00050844, 0x48000001, -0x00030012, +0x00030011, 0x1063222d, 0x48000000, -0x00050046, +0x00050047, 0x00060061, 0x280b0008, 0x108e0301, 0x41800000, -0x00050843, +0x00050844, 0x1004b232, 0x1064222c, 0x40800000, -0x00050843, +0x00050844, 0x48000001, -0x00030013, +0x00030012, 0x1063222d, 0x48000000, -0x00050046, +0x00050047, 0x00060062, 0x280b0008, 0x108e0301, 0x41800000, -0x00050843, +0x00050844, 0x1004b232, 0x1064222c, 0x40800000, -0x00050843, +0x00050844, +0x48000001, +0x00030013, +0x1063222d, +0x48000000, +0x00050047, +0x00060063, +0x280b0008, +0x108e0301, +0x41800000, +0x00050844, +0x1004b232, +0x1064222c, +0x40800000, +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, -0x280b0008, -0x108e0301, -0x41800000, -0x00050843, -0x1004b232, -0x1064222c, -0x40800000, -0x00050843, -0x48000001, -0x00030016, -0x1063222d, -0x48000000, -0x00050046, +0x00050047, 0x00060065, 0x280b0008, 0x108e0301, 0x41800000, -0x00050843, +0x00050844, 0x1004b232, 0x1064222c, 0x40800000, -0x00050843, +0x00050844, 0x48000001, -0x00030017, +0x00030016, 0x1063222d, 0x48000000, -0x00050046, +0x00050047, 0x00060066, 0x280b0008, 0x108e0301, 0x41800000, -0x00050843, +0x00050844, 0x1004b232, 0x1064222c, 0x40800000, -0x00050843, +0x00050844, 0x48000001, -0x00030018, +0x00030017, 0x1063222d, 0x48000000, -0x00050046, +0x00050047, 0x00060067, 0x280b0008, 0x108e0301, 0x41800000, -0x00050843, +0x00050844, 0x1004b232, 0x1064222c, 0x40800000, -0x00050843, +0x00050844, +0x48000001, +0x00030018, +0x1063222d, +0x48000000, +0x00050047, +0x00060068, +0x280b0008, +0x108e0301, +0x41800000, +0x00050844, +0x1004b232, +0x1064222c, +0x40800000, +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, -0x280b0010, -0x108e0301, -0x10ce0b01, -0x41800000, -0x00050843, -0x1066222c, -0x1003b232, -0x10a6322c, -0x40830000, -0x00050843, -0x48000001, -0x0003001b, -0x1063222d, -0x48000000, -0x00050046, +0x00050047, 0x0006006a, 0x280b0010, 0x108e0301, 0x10ce0b01, 0x41800000, -0x00050843, +0x00050844, 0x1066222c, 0x1003b232, 0x10a6322c, 0x40830000, -0x00050843, +0x00050844, 0x48000001, -0x0003001c, +0x0003001b, 0x1063222d, 0x48000000, -0x00050046, +0x00050047, 0x0006006b, 0x280b0010, 0x108e0301, 0x10ce0b01, 0x41800000, -0x00050843, +0x00050844, 0x1066222c, 0x1003b232, 0x10a6322c, 0x40830000, -0x00050843, +0x00050844, 0x48000001, -0x0003001d, +0x0003001c, 0x1063222d, 0x48000000, -0x00050046, +0x00050047, 0x0006006c, -0x0006006d, -0x00000000, -0x280b0008, -0x106e0301, -0x41800000, -0x00050843, -0x1003b232, -0x40800000, -0x00050843, -0x108a0301, -0x00090cab, -0x106322e8, -0x48000000, -0x00050046, -0x0006006e, 0x280b0010, 0x108e0301, 0x10ce0b01, 0x41800000, -0x00050843, +0x00050844, +0x1066222c, +0x1003b232, +0x10a6322c, +0x40830000, +0x00050844, +0x48000001, +0x0003001d, +0x1063222d, +0x48000000, +0x00050047, +0x0006006d, +0x0006006e, +0x00000000, +0x280b0008, +0x106e0301, +0x41800000, +0x00050844, +0x1003b232, +0x40800000, +0x00050844, +0x108a0301, +0x00090cab, +0x106322e8, +0x48000000, +0x00050047, +0x0006006f, +0x280b0010, +0x108e0301, +0x10ce0b01, +0x41800000, +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,48 +1883,25 @@ static const unsigned int build_actionlist[4961] = { 0x00098200, 0x00000000, 0x48000000, -0x00050044, -0x00060071, -0x280b0008, -0x106e0301, -0x41800000, -0x00050843, -0x1003b232, -0x39000008, -0x40800000, -0x00050843, -0x0006000b, -0x108e4300, -0x7c885840, -0x1004b232, -0x40840000, -0x00050846, -0x40800000, -0x00050843, -0x10041afd, -0x39080008, -0x4c010b82, -0x10641a78, -0x48000000, -0x0005000b, +0x00050045, 0x00060072, 0x280b0008, 0x106e0301, 0x41800000, -0x00050843, +0x00050844, 0x1003b232, 0x39000008, 0x40800000, -0x00050843, +0x00050844, 0x0006000b, 0x108e4300, 0x7c885840, 0x1004b232, 0x40840000, -0x00050846, +0x00050847, 0x40800000, -0x00050843, -0x10041afc, +0x00050844, +0x10041afd, 0x39080008, 0x4c010b82, 0x10641a78, @@ -1922,25 +1911,48 @@ static const unsigned int build_actionlist[4961] = { 0x280b0008, 0x106e0301, 0x41800000, -0x00050843, +0x00050844, +0x1003b232, +0x39000008, +0x40800000, +0x00050844, +0x0006000b, +0x108e4300, +0x7c885840, +0x1004b232, +0x40840000, +0x00050847, +0x40800000, +0x00050844, +0x10041afc, +0x39080008, +0x4c010b82, +0x10641a78, +0x48000000, +0x0005000b, +0x00060074, +0x280b0008, +0x106e0301, +0x41800000, +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,58 +2149,17 @@ static const unsigned int build_actionlist[4961] = { 0x7c082840, 0x38c5ffff, 0x41800000, -0x00050843, +0x00050844, 0x0006000b, 0x2c060000, 0x7d0348ae, 0x41800000, -0x00050876, +0x00050877, 0x7d0431ae, 0x38c6ffff, 0x39290001, 0x48000000, 0x0005000b, -0x0006007a, -0x80110000, -0x00098200, -0x81110000, -0x00098200, -0x7c004040, -0x40800001, -0x0005084c, -0x280b0008, -0x106e0301, -0x41800000, -0x00050843, -0x1003ba34, -0x81110000, -0x00098200, -0x40800000, -0x00050843, -0x80a30000, -0x00098200, -0x38630000, -0x00098200, -0x80910000, -0x00098200, -0x7c082840, -0x39200000, -0x41800000, -0x00050843, -0x0006000b, -0x7c092840, -0x7d0348ae, -0x40800000, -0x00050876, -0x00000000, -0x3808ffbf, -0x69060020, -0x2800001a, -0x7d06401e, -0x7d0449ae, -0x39290001, -0x48000000, -0x0005000b, 0x0006007b, 0x80110000, 0x00098200, @@ -2196,16 +2167,16 @@ static const unsigned int build_actionlist[4961] = { 0x00098200, 0x7c004040, 0x40800001, -0x0005084c, +0x0005084d, 0x280b0008, 0x106e0301, 0x41800000, -0x00050843, +0x00050844, 0x1003ba34, 0x81110000, 0x00098200, 0x40800000, -0x00050843, +0x00050844, 0x80a30000, 0x00098200, 0x38630000, @@ -2215,13 +2186,14 @@ static const unsigned int build_actionlist[4961] = { 0x7c082840, 0x39200000, 0x41800000, -0x00050843, +0x00050844, 0x0006000b, 0x7c092840, 0x7d0348ae, 0x40800000, -0x00050876, -0x3808ff9f, +0x00050877, +0x00000000, +0x3808ffbf, 0x69060020, 0x2800001a, 0x7d06401e, @@ -2230,63 +2202,80 @@ static const unsigned int build_actionlist[4961] = { 0x48000000, 0x0005000b, 0x0006007c, +0x80110000, +0x00098200, +0x81110000, +0x00098200, +0x7c004040, +0x40800001, +0x0005084d, 0x280b0008, 0x106e0301, 0x41800000, -0x00050843, -0x1003c234, +0x00050844, +0x1003ba34, +0x81110000, +0x00098200, 0x40800000, -0x00050843, -0x48000001, -0x00030022, -0x10601af1, +0x00050844, +0x80a30000, +0x00098200, +0x38630000, +0x00098200, +0x80910000, +0x00098200, +0x7c082840, +0x39200000, +0x41800000, +0x00050844, +0x0006000b, +0x7c092840, +0x7d0348ae, +0x40800000, +0x00050877, +0x3808ff9f, +0x69060020, +0x2800001a, +0x7d06401e, +0x7d0449ae, +0x39290001, 0x48000000, -0x00050046, +0x0005000b, 0x0006007d, 0x280b0008, 0x106e0301, 0x41800000, -0x00050843, -0x00000000, -0x1003b232, +0x00050844, +0x1003c234, 0x40800000, -0x00050843, -0x1063dae0, -0x0006007e, +0x00050844, +0x48000001, +0x00030022, 0x10601af1, 0x48000000, -0x00050046, -0x0006007f, +0x00050047, +0x0006007e, 0x280b0008, 0x106e0301, 0x41800000, -0x00050843, +0x00050844, +0x00000000, 0x1003b232, 0x40800000, -0x00050843, +0x00050844, 0x1063dae0, -0x39000008, -0x0006000b, -0x108e4300, -0x7c885840, -0x1004b232, -0x40840000, -0x0005087e, -0x40800000, -0x00050843, -0x1084dae0, -0x7c632038, -0x39080008, +0x0006007f, +0x10601af1, 0x48000000, -0x0005000b, +0x00050047, 0x00060080, 0x280b0008, 0x106e0301, 0x41800000, -0x00050843, +0x00050844, 0x1003b232, 0x40800000, -0x00050843, +0x00050844, 0x1063dae0, 0x39000008, 0x0006000b, @@ -2294,11 +2283,11 @@ static const unsigned int build_actionlist[4961] = { 0x7c885840, 0x1004b232, 0x40840000, -0x0005087e, +0x0005087f, 0x40800000, -0x00050843, +0x00050844, 0x1084dae0, -0x7c632378, +0x7c632038, 0x39080008, 0x48000000, 0x0005000b, @@ -2306,10 +2295,10 @@ static const unsigned int build_actionlist[4961] = { 0x280b0008, 0x106e0301, 0x41800000, -0x00050843, +0x00050844, 0x1003b232, 0x40800000, -0x00050843, +0x00050844, 0x1063dae0, 0x39000008, 0x0006000b, @@ -2317,12 +2306,11 @@ static const unsigned int build_actionlist[4961] = { 0x7c885840, 0x1004b232, 0x40840000, -0x0005087e, -0x00000000, +0x0005087f, 0x40800000, -0x00050843, +0x00050844, 0x1084dae0, -0x7c632278, +0x7c632378, 0x39080008, 0x48000000, 0x0005000b, @@ -2330,116 +2318,140 @@ static const unsigned int build_actionlist[4961] = { 0x280b0008, 0x106e0301, 0x41800000, -0x00050843, +0x00050844, 0x1003b232, 0x40800000, -0x00050843, +0x00050844, +0x1063dae0, +0x39000008, +0x0006000b, +0x108e4300, +0x7c885840, +0x1004b232, +0x40840000, +0x0005087f, +0x00000000, +0x40800000, +0x00050844, +0x1084dae0, +0x7c632278, +0x39080008, +0x48000000, +0x0005000b, +0x00060083, +0x280b0008, +0x106e0301, +0x41800000, +0x00050844, +0x1003b232, +0x40800000, +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, -0x00000000, -0x7c810808, -0x00000000, 0x00060091, 0x00000000, 0x7c810808, 0x00000000, 0x00060092, +0x00000000, +0x7c810808, +0x00000000, +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)); -#if LJ_HASJIT - dasm_put(Dst, 784); -#endif - dasm_put(Dst, 786); -#if LJ_HASJIT - dasm_put(Dst, 788, BC_JFORI); -#endif - dasm_put(Dst, 791); -#if LJ_HASJIT - dasm_put(Dst, 793, 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, 706, Dt1(->base), FRAME_CONT); #ifdef LUAJIT_ENABLE_LUA52COMPAT - dasm_put(Dst, 1050, Dt6(->metatable), Dt8(->upvalue[0])); -#else - dasm_put(Dst, 1059, Dt8(->upvalue[0])); + dasm_put(Dst, 728); #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, 730, Dt1(->base)); #ifdef LUAJIT_ENABLE_LUA52COMPAT - dasm_put(Dst, 1140, Dt6(->metatable), Dt8(->upvalue[0])); + dasm_put(Dst, 738); #else - dasm_put(Dst, 1149, Dt8(->upvalue[0])); + dasm_put(Dst, 745); #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, 748, Dt1(->base), Dt7(->pc), Dt1(->base), Dt1(->base)); #if LJ_HASJIT - dasm_put(Dst, 2515); + dasm_put(Dst, 796); #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, 798); #if LJ_HASJIT - dasm_put(Dst, 2582); + dasm_put(Dst, 800, BC_JFORI); #endif - dasm_put(Dst, 2584); + dasm_put(Dst, 803); #if LJ_HASJIT - dasm_put(Dst, 2587); + dasm_put(Dst, 805, BC_JFORI); #endif - dasm_put(Dst, 2590); -#if LJ_HASJIT - dasm_put(Dst, 2592); -#endif - dasm_put(Dst, 2595, Dt1(->base), Dt1(->top), Dt1(->base), Dt1(->top)); -#if LJ_HASJIT - dasm_put(Dst, 2617); -#endif - dasm_put(Dst, 2619); -#if LJ_HASJIT - dasm_put(Dst, 2621); -#endif - dasm_put(Dst, 2623); -#if LJ_HASJIT - dasm_put(Dst, 2707); + 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, 1062, Dt6(->metatable), Dt8(->upvalue[0])); #else - dasm_put(Dst, 2730); + dasm_put(Dst, 1071, Dt8(->upvalue[0])); #endif - dasm_put(Dst, 2733); + 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, 1152, Dt6(->metatable), Dt8(->upvalue[0])); +#else + dasm_put(Dst, 1161, Dt8(->upvalue[0])); +#endif + 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, 2735); + dasm_put(Dst, 2527); #endif - dasm_put(Dst, 2737); + 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, 2739); + dasm_put(Dst, 2594); #endif - dasm_put(Dst, 2741); + dasm_put(Dst, 2596); +#if LJ_HASJIT + dasm_put(Dst, 2599); +#endif + dasm_put(Dst, 2602); +#if LJ_HASJIT + dasm_put(Dst, 2604); +#endif + dasm_put(Dst, 2607, Dt1(->base), Dt1(->top), Dt1(->base), Dt1(->top)); +#if LJ_HASJIT + dasm_put(Dst, 2629); +#endif + dasm_put(Dst, 2631); +#if LJ_HASJIT + dasm_put(Dst, 2633); +#endif + dasm_put(Dst, 2635); +#if LJ_HASJIT + dasm_put(Dst, 2719); +#else + dasm_put(Dst, 2742); +#endif + dasm_put(Dst, 2745); +#if LJ_HASJIT + dasm_put(Dst, 2747); +#endif + dasm_put(Dst, 2749); +#if LJ_HASJIT + dasm_put(Dst, 2751); +#endif + 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<metatable), 1-vk, Dt6(->nomm), 1<> 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<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<asize), Dt6(->array), 31-3, Dt6(->metatable), Dt6(->nomm), 1<hmask), Dt5(->hash), Dt6(->node), 31-5, 31-3, DtB(->key), DtB(->val), DtB(->next), Dt6(->metatable), Dt6(->nomm), 1<hmask), Dt5(->hash), Dt6(->node), 31-5, 31-3, DtB(->key), DtB(->val), DtB(->next), Dt6(->metatable), Dt6(->nomm), 1<asize), Dt6(->array), Dt6(->metatable), Dt6(->nomm), 1<asize), Dt6(->array), Dt6(->metatable), Dt6(->nomm), 1<asize), Dt6(->array), 31-3, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->nomm), 1<marked), Dt6(->gclist)); + dasm_put(Dst, 3944, Dt6(->asize), Dt6(->array), 31-3, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->nomm), 1<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<next), Dt6(->metatable), DISPATCH_GL(tmptv), Dt1(->base), Dt6(->nomm), 1<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<next), Dt6(->metatable), DISPATCH_GL(tmptv), Dt1(->base), Dt6(->nomm), 1<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<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<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); diff --git a/src/buildvm_x64.h b/src/buildvm_x64.h index fcff6db3..f6ed666c 100644 --- a/src/buildvm_x64.h +++ b/src/buildvm_x64.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[16103] = { +static const unsigned char build_actionlist[16156] = { 254,1,248,10,252,247,195,237,15,132,244,11,131,227,252,248,41,218,72,141, 76,25,252,248,139,90,252,252,199,68,10,4,237,248,12,131,192,1,137,68,36,4, 252,247,195,237,15,132,244,13,248,14,129,252,243,239,252,247,195,237,15,133, @@ -91,73 +91,74 @@ static const unsigned char build_actionlist[16103] = { 252,234,137,252,253,137,92,36,28,232,251,1,7,139,149,233,133,192,15,132,244, 42,248,44,137,193,41,208,137,89,252,244,141,152,233,184,237,252,233,244,28, 248,56,139,108,36,24,137,149,233,141,52,194,137,252,239,137,92,36,28,232, - 251,1,8,139,149,233,252,233,244,44,248,57,141,76,202,8,248,29,137,76,36,4, - 137,4,36,131,252,233,8,139,108,36,24,137,149,233,255,137,206,141,20,193,137, + 251,1,8,139,149,233,255,133,192,15,133,244,44,15,183,67,252,254,139,60,194, + 252,233,244,57,255,252,233,244,44,255,248,58,141,76,202,8,248,29,137,76,36, + 4,137,4,36,131,252,233,8,139,108,36,24,137,149,233,137,206,141,20,193,137, 252,239,137,92,36,28,232,251,1,9,139,149,233,139,76,36,4,139,4,36,139,105, - 252,248,131,192,1,65,57,215,15,132,244,58,137,202,137,90,252,252,139,157, + 252,248,131,192,1,65,57,215,15,132,244,59,137,202,137,90,252,252,139,157, 233,139,11,15,182,252,233,15,182,205,131,195,4,65,252,255,36,252,238,248, - 59,139,108,36,24,137,149,233,137,206,137,252,239,137,92,36,28,232,251,1,10, + 60,139,108,36,24,137,149,233,137,206,137,252,239,137,92,36,28,232,251,1,10, 139,149,233,139,67,252,252,15,182,204,15,182,232,193,232,16,65,252,255,164, - 253,252,238,233,248,60,129,252,248,239,15,130,244,61,139,106,4,129,252,253, - 239,15,131,244,61,139,90,252,252,137,68,36,4,137,106,252,252,139,42,137,106, - 252,248,131,232,2,15,132,244,248,137,209,248,1,131,193,8,72,139,41,72,137, - 105,252,248,131,232,1,15,133,244,1,248,2,255,139,68,36,4,252,233,244,62,248, - 63,129,252,248,239,15,130,244,61,139,106,4,137,252,233,193,252,249,15,131, + 253,252,238,233,248,61,129,252,248,239,15,130,244,62,139,106,4,129,252,253, + 239,15,131,244,62,139,90,252,252,137,68,36,4,137,106,252,252,139,42,137,106, + 252,248,131,232,2,15,132,244,248,255,137,209,248,1,131,193,8,72,139,41,72, + 137,105,252,248,131,232,1,15,133,244,1,248,2,139,68,36,4,252,233,244,63,248, + 64,129,252,248,239,15,130,244,62,139,106,4,137,252,233,193,252,249,15,131, 252,249,252,254,15,132,244,249,184,237,252,247,213,57,232,255,15,71,197,255, 15,134,244,247,137,232,248,1,255,248,2,139,106,252,248,139,132,253,197,233, - 139,90,252,252,199,66,252,252,237,137,66,252,248,252,233,244,64,248,3,184, - 237,252,233,244,2,248,65,129,252,248,239,15,130,244,61,139,106,4,139,90,252, + 139,90,252,252,199,66,252,252,237,137,66,252,248,252,233,244,65,248,3,184, + 237,252,233,244,2,248,66,129,252,248,239,15,130,244,62,139,106,4,139,90,252, 252,129,252,253,239,15,133,244,252,248,1,139,42,139,173,233,248,2,133,252, - 237,199,66,252,252,237,255,15,132,244,64,65,139,134,233,199,66,252,252,237, + 237,199,66,252,252,237,255,15,132,244,65,65,139,134,233,199,66,252,252,237, 137,106,252,248,139,141,233,35,136,233,105,201,239,3,141,233,248,3,129,185, 233,239,15,133,244,250,57,129,233,15,132,244,251,248,4,139,137,233,133,201, - 15,133,244,3,255,252,233,244,64,248,5,139,105,4,129,252,253,239,15,132,244, - 64,139,1,137,106,252,252,137,66,252,248,252,233,244,64,248,6,129,252,253, + 15,133,244,3,255,252,233,244,65,248,5,139,105,4,129,252,253,239,15,132,244, + 65,139,1,137,106,252,252,137,66,252,248,252,233,244,65,248,6,129,252,253, 239,15,132,244,1,129,252,253,239,15,135,244,254,129,252,253,239,15,134,244, 253,189,237,252,233,244,254,248,7,255,189,237,248,8,252,247,213,65,139,172, - 253,174,233,252,233,244,2,248,66,129,252,248,239,15,130,244,61,129,122,253, - 4,239,15,133,244,61,139,42,131,189,233,0,15,133,244,61,129,122,253,12,239, - 15,133,244,61,139,66,8,137,133,233,139,90,252,252,199,66,252,252,237,255, + 253,174,233,252,233,244,2,248,67,129,252,248,239,15,130,244,62,129,122,253, + 4,239,15,133,244,62,139,42,131,189,233,0,15,133,244,62,129,122,253,12,239, + 15,133,244,62,139,66,8,137,133,233,139,90,252,252,199,66,252,252,237,255, 137,106,252,248,252,246,133,233,235,15,132,244,247,128,165,233,235,65,139, - 134,233,65,137,174,233,137,133,233,248,1,252,233,244,64,248,67,129,252,248, - 239,15,130,244,61,129,122,253,4,239,15,133,244,61,137,213,139,50,141,82,8, + 134,233,65,137,174,233,137,133,233,248,1,252,233,244,65,248,68,129,252,248, + 239,15,130,244,62,129,122,253,4,239,15,133,244,62,137,213,139,50,141,82,8, 139,124,36,24,232,251,1,11,137,252,234,72,139,40,139,90,252,252,72,137,106, - 252,248,252,233,244,64,248,68,255,129,252,248,239,15,133,244,61,129,122,253, - 4,239,255,15,133,244,247,139,42,252,233,244,69,248,1,15,135,244,61,255,15, - 131,244,61,255,252,242,15,16,2,252,233,244,70,255,221,2,252,233,244,71,255, - 248,72,129,252,248,239,15,130,244,61,139,90,252,252,129,122,253,4,239,15, - 133,244,249,139,2,248,2,199,66,252,252,237,137,66,252,248,252,233,244,64, - 248,3,129,122,253,4,239,15,135,244,61,65,131,190,233,0,15,133,244,61,65,139, - 174,233,65,59,174,233,255,15,130,244,247,232,244,73,248,1,139,108,36,24,137, + 252,248,252,233,244,65,248,69,255,129,252,248,239,15,133,244,62,129,122,253, + 4,239,255,15,133,244,247,139,42,252,233,244,70,248,1,15,135,244,62,255,15, + 131,244,62,255,252,242,15,16,2,252,233,244,71,255,221,2,252,233,244,72,255, + 248,73,129,252,248,239,15,130,244,62,139,90,252,252,129,122,253,4,239,15, + 133,244,249,139,2,248,2,199,66,252,252,237,137,66,252,248,252,233,244,65, + 248,3,129,122,253,4,239,15,135,244,62,65,131,190,233,0,15,133,244,62,65,139, + 174,233,65,59,174,233,255,15,130,244,247,232,244,74,248,1,139,108,36,24,137, 149,233,137,92,36,28,137,214,137,252,239,255,232,251,1,12,255,232,251,1,13, - 255,139,149,233,252,233,244,2,248,74,129,252,248,239,15,130,244,61,15,132, - 244,248,248,1,129,122,253,4,239,15,133,244,61,139,108,36,24,137,149,233,137, + 255,139,149,233,252,233,244,2,248,75,129,252,248,239,15,130,244,62,15,132, + 244,248,248,1,129,122,253,4,239,15,133,244,62,139,108,36,24,137,149,233,137, 149,233,139,90,252,252,139,50,141,82,8,137,252,239,137,92,36,28,232,251,1, 14,139,149,233,133,192,15,132,244,249,72,139,106,8,72,139,66,16,72,137,106, - 252,248,72,137,2,248,75,184,237,255,252,233,244,76,248,2,199,66,12,237,252, - 233,244,1,248,3,199,66,252,252,237,252,233,244,64,248,77,129,252,248,239, - 15,130,244,61,139,42,129,122,253,4,239,15,133,244,61,255,131,189,233,0,15, - 133,244,61,255,139,106,252,248,139,133,233,139,90,252,252,199,66,252,252, - 237,137,66,252,248,199,66,12,237,184,237,252,233,244,76,248,78,129,252,248, - 239,15,130,244,61,129,122,253,4,239,15,133,244,61,129,122,253,12,239,255, + 252,248,72,137,2,248,76,184,237,255,252,233,244,77,248,2,199,66,12,237,252, + 233,244,1,248,3,199,66,252,252,237,252,233,244,65,248,78,129,252,248,239, + 15,130,244,62,139,42,129,122,253,4,239,15,133,244,62,255,131,189,233,0,15, + 133,244,62,255,139,106,252,248,139,133,233,139,90,252,252,199,66,252,252, + 237,137,66,252,248,199,66,12,237,184,237,252,233,244,77,248,79,129,252,248, + 239,15,130,244,62,129,122,253,4,239,15,133,244,62,129,122,253,12,239,255, 139,90,252,252,255,139,66,8,131,192,1,199,66,252,252,237,137,66,252,248,255, 252,242,15,16,66,8,72,189,237,237,102,72,15,110,205,252,242,15,88,193,252, 242,15,45,192,252,242,15,17,66,252,248,255,139,42,59,133,233,15,131,244,248, - 193,224,3,3,133,233,248,1,129,120,253,4,239,15,132,244,79,72,139,40,72,137, - 42,252,233,244,75,248,2,131,189,233,0,15,132,244,79,137,252,239,137,213,137, - 198,232,251,1,15,137,252,234,133,192,15,133,244,1,248,79,184,237,252,233, - 244,76,248,80,255,139,106,252,248,139,133,233,139,90,252,252,199,66,252,252, + 193,224,3,3,133,233,248,1,129,120,253,4,239,15,132,244,80,72,139,40,72,137, + 42,252,233,244,76,248,2,131,189,233,0,15,132,244,80,137,252,239,137,213,137, + 198,232,251,1,15,137,252,234,133,192,15,133,244,1,248,80,184,237,252,233, + 244,77,248,81,255,139,106,252,248,139,133,233,139,90,252,252,199,66,252,252, 237,137,66,252,248,255,199,66,12,237,199,66,8,0,0,0,0,255,15,87,192,252,242, - 15,17,66,8,255,217,252,238,221,90,8,255,184,237,252,233,244,76,248,81,129, - 252,248,239,15,130,244,61,141,74,8,131,232,1,187,237,248,1,65,15,182,174, - 233,193,252,237,235,131,229,1,1,252,235,252,233,244,28,248,82,129,252,248, - 239,15,130,244,61,129,122,253,12,239,15,133,244,61,255,139,106,4,137,106, + 15,17,66,8,255,217,252,238,221,90,8,255,184,237,252,233,244,77,248,82,129, + 252,248,239,15,130,244,62,141,74,8,131,232,1,187,237,248,1,65,15,182,174, + 233,193,252,237,235,131,229,1,1,252,235,252,233,244,28,248,83,129,252,248, + 239,15,130,244,62,129,122,253,12,239,15,133,244,62,255,139,106,4,137,106, 12,199,66,4,237,139,42,139,90,8,137,106,8,137,26,141,74,16,131,232,2,187, - 237,252,233,244,1,248,83,129,252,248,239,15,130,244,61,139,42,139,90,252, - 252,137,92,36,28,137,44,36,129,122,253,4,239,15,133,244,61,72,131,189,233, - 0,15,133,244,61,128,189,233,235,15,135,244,61,139,141,233,15,132,244,247, - 255,59,141,233,15,132,244,61,248,1,141,92,193,252,240,59,157,233,15,135,244, - 61,137,157,233,139,108,36,24,137,149,233,131,194,8,137,149,233,141,108,194, + 237,252,233,244,1,248,84,129,252,248,239,15,130,244,62,139,42,139,90,252, + 252,137,92,36,28,137,44,36,129,122,253,4,239,15,133,244,62,72,131,189,233, + 0,15,133,244,62,128,189,233,235,15,135,244,62,139,141,233,15,132,244,247, + 255,59,141,233,15,132,244,62,248,1,141,92,193,252,240,59,157,233,15,135,244, + 62,137,157,233,139,108,36,24,137,149,233,131,194,8,137,149,233,141,108,194, 232,72,41,221,57,203,15,132,244,249,248,2,72,139,4,43,72,137,67,252,248,131, 252,235,8,57,203,15,133,244,2,248,3,137,206,139,60,36,232,244,25,65,199,134, 233,237,255,139,108,36,24,139,28,36,139,149,233,129,252,248,239,15,135,244, @@ -168,10 +169,10 @@ static const unsigned char build_actionlist[16103] = { 248,252,255,252,255,252,255,252,247,195,237,255,15,132,244,13,252,233,244, 14,248,8,199,66,252,252,237,139,139,233,131,252,233,8,137,139,233,72,139, 1,72,137,2,184,237,252,233,244,7,248,9,139,12,36,68,137,185,233,137,222,137, - 252,239,232,251,1,0,139,28,36,139,149,233,252,233,244,4,248,84,139,106,252, + 252,239,232,251,1,0,139,28,36,139,149,233,252,233,244,4,248,85,139,106,252, 248,139,173,233,139,90,252,252,137,92,36,28,137,44,36,72,131,189,233,0,15, - 133,244,61,255,128,189,233,235,15,135,244,61,139,141,233,15,132,244,247,59, - 141,233,15,132,244,61,248,1,141,92,193,252,248,59,157,233,15,135,244,61,137, + 133,244,62,255,128,189,233,235,15,135,244,62,139,141,233,15,132,244,247,59, + 141,233,15,132,244,62,248,1,141,92,193,252,248,59,157,233,15,135,244,62,137, 157,233,139,108,36,24,137,149,233,137,149,233,141,108,194,252,240,72,41,221, 57,203,15,132,244,249,248,2,255,72,139,4,43,72,137,67,252,248,131,252,235, 8,57,203,15,133,244,2,248,3,137,206,139,60,36,232,244,25,65,199,134,233,237, @@ -182,209 +183,209 @@ static const unsigned char build_actionlist[16103] = { 1,248,7,139,92,36,28,137,68,36,4,49,201,252,247,195,237,15,132,244,13,252, 233,244,14,248,8,137,222,137,252,239,232,251,1,16,248,9,139,12,36,68,137, 185,233,137,222,137,252,239,232,251,1,0,139,28,36,139,149,233,252,233,244, - 4,248,85,139,108,36,24,72,252,247,133,233,237,15,132,244,61,255,137,149,233, + 4,248,86,139,108,36,24,72,252,247,133,233,237,15,132,244,62,255,137,149,233, 141,68,194,252,248,137,133,233,49,192,72,137,133,233,176,235,136,133,233, - 252,233,244,16,255,248,69,255,248,71,139,90,252,252,221,90,252,248,252,233, - 244,64,255,248,86,129,252,248,239,15,130,244,61,255,129,122,253,4,239,15, - 133,244,248,139,42,131,252,253,0,15,137,244,69,252,247,221,15,136,244,247, - 248,87,248,69,139,90,252,252,199,66,252,252,237,137,106,252,248,252,233,244, - 64,248,1,139,90,252,252,199,66,252,252,0,0,224,65,199,66,252,248,0,0,0,0, - 252,233,244,64,248,2,15,135,244,61,255,129,122,253,4,239,15,131,244,61,255, - 252,242,15,16,2,72,184,237,237,102,72,15,110,200,15,84,193,248,70,139,90, - 252,252,252,242,15,17,66,252,248,255,221,2,217,225,248,70,248,71,139,90,252, - 252,221,90,252,248,255,248,64,184,237,248,76,137,68,36,4,248,62,252,247,195, + 252,233,244,16,255,248,70,255,248,72,139,90,252,252,221,90,252,248,252,233, + 244,65,255,248,87,129,252,248,239,15,130,244,62,255,129,122,253,4,239,15, + 133,244,248,139,42,131,252,253,0,15,137,244,70,252,247,221,15,136,244,247, + 248,88,248,70,139,90,252,252,199,66,252,252,237,137,106,252,248,252,233,244, + 65,248,1,139,90,252,252,199,66,252,252,0,0,224,65,199,66,252,248,0,0,0,0, + 252,233,244,65,248,2,15,135,244,62,255,129,122,253,4,239,15,131,244,62,255, + 252,242,15,16,2,72,184,237,237,102,72,15,110,200,15,84,193,248,71,139,90, + 252,252,252,242,15,17,66,252,248,255,221,2,217,225,248,71,248,72,139,90,252, + 252,221,90,252,248,255,248,65,184,237,248,77,137,68,36,4,248,63,252,247,195, 237,15,133,244,253,248,5,56,67,252,255,15,135,244,252,15,182,75,252,253,72, 252,247,209,141,20,202,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65, 252,255,36,252,238,248,6,199,68,194,252,244,237,131,192,1,252,233,244,5,248, - 7,72,199,193,252,248,252,255,252,255,252,255,252,233,244,14,248,88,255,129, - 122,253,4,239,15,133,244,247,139,42,252,233,244,69,248,1,15,135,244,61,255, - 252,242,15,16,2,232,244,89,255,252,242,15,45,232,129,252,253,0,0,0,128,15, - 133,244,69,252,242,15,42,205,102,15,46,193,15,138,244,70,15,132,244,69,255, - 221,2,232,244,89,255,248,90,255,252,242,15,16,2,232,244,91,255,221,2,232, - 244,91,255,248,92,129,252,248,239,15,130,244,61,129,122,253,4,239,15,131, - 244,61,252,242,15,81,2,252,233,244,70,255,248,92,129,252,248,239,15,130,244, - 61,129,122,253,4,239,15,131,244,61,221,2,217,252,250,252,233,244,71,255,248, - 93,129,252,248,239,15,130,244,61,129,122,253,4,239,15,131,244,61,217,252, - 237,221,2,217,252,241,252,233,244,71,248,94,129,252,248,239,15,130,244,61, - 129,122,253,4,239,15,131,244,61,217,252,236,221,2,217,252,241,252,233,244, - 71,248,95,129,252,248,239,255,15,130,244,61,129,122,253,4,239,15,131,244, - 61,221,2,232,244,96,252,233,244,71,248,97,129,252,248,239,15,130,244,61,129, - 122,253,4,239,15,131,244,61,221,2,217,252,254,252,233,244,71,248,98,129,252, - 248,239,255,15,130,244,61,129,122,253,4,239,15,131,244,61,221,2,217,252,255, - 252,233,244,71,248,99,129,252,248,239,15,130,244,61,129,122,253,4,239,15, - 131,244,61,221,2,217,252,242,221,216,252,233,244,71,248,100,129,252,248,239, - 15,130,244,61,255,129,122,253,4,239,15,131,244,61,221,2,217,192,216,200,217, - 232,222,225,217,252,250,217,252,243,252,233,244,71,248,101,129,252,248,239, - 15,130,244,61,129,122,253,4,239,15,131,244,61,221,2,217,192,216,200,217,232, - 222,225,217,252,250,217,201,217,252,243,252,233,244,71,248,102,129,252,248, - 239,15,130,244,61,129,122,253,4,239,15,131,244,61,255,221,2,217,232,217,252, - 243,252,233,244,71,255,248,103,129,252,248,239,15,130,244,61,129,122,253, - 4,239,15,131,244,61,252,242,15,16,2,255,137,213,232,251,1,17,137,252,234, - 252,233,244,70,255,248,104,129,252,248,239,15,130,244,61,129,122,253,4,239, - 15,131,244,61,252,242,15,16,2,255,137,213,232,251,1,18,137,252,234,252,233, - 244,70,255,248,105,129,252,248,239,15,130,244,61,129,122,253,4,239,15,131, - 244,61,252,242,15,16,2,255,137,213,232,251,1,19,137,252,234,252,233,244,70, - 248,106,255,248,107,129,252,248,239,15,130,244,61,129,122,253,4,239,15,131, - 244,61,252,242,15,16,2,139,106,252,248,252,242,15,89,133,233,252,233,244, - 70,255,248,107,129,252,248,239,15,130,244,61,129,122,253,4,239,15,131,244, - 61,221,2,139,106,252,248,220,141,233,252,233,244,71,255,248,108,129,252,248, - 239,15,130,244,61,129,122,253,4,239,15,131,244,61,129,122,253,12,239,15,131, - 244,61,221,2,221,66,8,217,252,243,252,233,244,71,248,109,129,252,248,239, - 15,130,244,61,129,122,253,4,239,15,131,244,61,129,122,253,12,239,255,15,131, - 244,61,221,66,8,221,2,217,252,253,221,217,252,233,244,71,248,110,129,252, - 248,239,15,130,244,61,139,106,4,129,252,253,239,15,131,244,61,139,90,252, + 7,72,199,193,252,248,252,255,252,255,252,255,252,233,244,14,248,89,255,129, + 122,253,4,239,15,133,244,247,139,42,252,233,244,70,248,1,15,135,244,62,255, + 252,242,15,16,2,232,244,90,255,252,242,15,45,232,129,252,253,0,0,0,128,15, + 133,244,70,252,242,15,42,205,102,15,46,193,15,138,244,71,15,132,244,70,255, + 221,2,232,244,90,255,248,91,255,252,242,15,16,2,232,244,92,255,221,2,232, + 244,92,255,248,93,129,252,248,239,15,130,244,62,129,122,253,4,239,15,131, + 244,62,252,242,15,81,2,252,233,244,71,255,248,93,129,252,248,239,15,130,244, + 62,129,122,253,4,239,15,131,244,62,221,2,217,252,250,252,233,244,72,255,248, + 94,129,252,248,239,15,130,244,62,129,122,253,4,239,15,131,244,62,217,252, + 237,221,2,217,252,241,252,233,244,72,248,95,129,252,248,239,15,130,244,62, + 129,122,253,4,239,15,131,244,62,217,252,236,221,2,217,252,241,252,233,244, + 72,248,96,129,252,248,239,255,15,130,244,62,129,122,253,4,239,15,131,244, + 62,221,2,232,244,97,252,233,244,72,248,98,129,252,248,239,15,130,244,62,129, + 122,253,4,239,15,131,244,62,221,2,217,252,254,252,233,244,72,248,99,129,252, + 248,239,255,15,130,244,62,129,122,253,4,239,15,131,244,62,221,2,217,252,255, + 252,233,244,72,248,100,129,252,248,239,15,130,244,62,129,122,253,4,239,15, + 131,244,62,221,2,217,252,242,221,216,252,233,244,72,248,101,129,252,248,239, + 15,130,244,62,255,129,122,253,4,239,15,131,244,62,221,2,217,192,216,200,217, + 232,222,225,217,252,250,217,252,243,252,233,244,72,248,102,129,252,248,239, + 15,130,244,62,129,122,253,4,239,15,131,244,62,221,2,217,192,216,200,217,232, + 222,225,217,252,250,217,201,217,252,243,252,233,244,72,248,103,129,252,248, + 239,15,130,244,62,129,122,253,4,239,15,131,244,62,255,221,2,217,232,217,252, + 243,252,233,244,72,255,248,104,129,252,248,239,15,130,244,62,129,122,253, + 4,239,15,131,244,62,252,242,15,16,2,255,137,213,232,251,1,17,137,252,234, + 252,233,244,71,255,248,105,129,252,248,239,15,130,244,62,129,122,253,4,239, + 15,131,244,62,252,242,15,16,2,255,137,213,232,251,1,18,137,252,234,252,233, + 244,71,255,248,106,129,252,248,239,15,130,244,62,129,122,253,4,239,15,131, + 244,62,252,242,15,16,2,255,137,213,232,251,1,19,137,252,234,252,233,244,71, + 248,107,255,248,108,129,252,248,239,15,130,244,62,129,122,253,4,239,15,131, + 244,62,252,242,15,16,2,139,106,252,248,252,242,15,89,133,233,252,233,244, + 71,255,248,108,129,252,248,239,15,130,244,62,129,122,253,4,239,15,131,244, + 62,221,2,139,106,252,248,220,141,233,252,233,244,72,255,248,109,129,252,248, + 239,15,130,244,62,129,122,253,4,239,15,131,244,62,129,122,253,12,239,15,131, + 244,62,221,2,221,66,8,217,252,243,252,233,244,72,248,110,129,252,248,239, + 15,130,244,62,129,122,253,4,239,15,131,244,62,129,122,253,12,239,255,15,131, + 244,62,221,66,8,221,2,217,252,253,221,217,252,233,244,72,248,111,129,252, + 248,239,15,130,244,62,139,106,4,129,252,253,239,15,131,244,62,139,90,252, 252,139,2,137,106,252,252,137,66,252,248,209,229,129,252,253,0,0,224,252, 255,15,131,244,249,9,232,15,132,244,249,184,252,254,3,0,0,129,252,253,0,0, 32,0,15,130,244,250,248,1,193,252,237,21,41,197,255,252,242,15,42,197,255, 137,44,36,219,4,36,255,139,106,252,252,129,229,252,255,252,255,15,128,129, 205,0,0,224,63,137,106,252,252,248,2,255,252,242,15,17,2,255,221,26,255,184, - 237,252,233,244,76,248,3,255,15,87,192,252,233,244,2,255,217,252,238,252, + 237,252,233,244,77,248,3,255,15,87,192,252,233,244,2,255,217,252,238,252, 233,244,2,255,248,4,255,252,242,15,16,2,72,189,237,237,102,72,15,110,205, 252,242,15,89,193,252,242,15,17,66,252,248,255,221,2,199,4,36,0,0,128,90, 216,12,36,221,90,252,248,255,139,106,252,252,184,52,4,0,0,209,229,252,233, - 244,1,255,248,111,129,252,248,239,15,130,244,61,129,122,253,4,239,15,131, - 244,61,252,242,15,16,2,255,248,111,129,252,248,239,15,130,244,61,129,122, - 253,4,239,15,131,244,61,221,2,255,139,106,4,139,90,252,252,209,229,129,252, - 253,0,0,224,252,255,15,132,244,250,255,15,40,224,232,244,112,252,242,15,92, - 224,248,1,252,242,15,17,66,252,248,252,242,15,17,34,255,217,192,232,244,112, + 244,1,255,248,112,129,252,248,239,15,130,244,62,129,122,253,4,239,15,131, + 244,62,252,242,15,16,2,255,248,112,129,252,248,239,15,130,244,62,129,122, + 253,4,239,15,131,244,62,221,2,255,139,106,4,139,90,252,252,209,229,129,252, + 253,0,0,224,252,255,15,132,244,250,255,15,40,224,232,244,113,252,242,15,92, + 224,248,1,252,242,15,17,66,252,248,252,242,15,17,34,255,217,192,232,244,113, 220,252,233,248,1,221,90,252,248,221,26,255,139,66,252,252,139,106,4,49,232, - 15,136,244,249,248,2,184,237,252,233,244,76,248,3,129,252,245,0,0,0,128,137, + 15,136,244,249,248,2,184,237,252,233,244,77,248,3,129,252,245,0,0,0,128,137, 106,4,252,233,244,2,248,4,255,15,87,228,252,233,244,1,255,217,252,238,217, - 201,252,233,244,1,255,248,113,129,252,248,239,15,130,244,61,129,122,253,4, - 239,15,131,244,61,129,122,253,12,239,15,131,244,61,221,66,8,221,2,248,1,217, - 252,248,223,224,158,15,138,244,1,221,217,252,233,244,71,255,248,114,129,252, - 248,239,15,130,244,61,129,122,253,4,239,15,131,244,61,129,122,253,12,239, - 15,131,244,61,252,242,15,16,2,252,242,15,16,74,8,232,244,115,252,233,244, - 70,255,248,114,129,252,248,239,15,130,244,61,129,122,253,4,239,15,131,244, - 61,129,122,253,12,239,15,131,244,61,221,2,221,66,8,232,244,115,252,233,244, - 71,255,248,116,185,2,0,0,0,129,122,253,4,239,255,15,133,244,250,139,42,248, - 1,57,193,15,131,244,69,129,124,253,202,252,252,239,15,133,244,249,59,108, + 201,252,233,244,1,255,248,114,129,252,248,239,15,130,244,62,129,122,253,4, + 239,15,131,244,62,129,122,253,12,239,15,131,244,62,221,66,8,221,2,248,1,217, + 252,248,223,224,158,15,138,244,1,221,217,252,233,244,72,255,248,115,129,252, + 248,239,15,130,244,62,129,122,253,4,239,15,131,244,62,129,122,253,12,239, + 15,131,244,62,252,242,15,16,2,252,242,15,16,74,8,232,244,116,252,233,244, + 71,255,248,115,129,252,248,239,15,130,244,62,129,122,253,4,239,15,131,244, + 62,129,122,253,12,239,15,131,244,62,221,2,221,66,8,232,244,116,252,233,244, + 72,255,248,117,185,2,0,0,0,129,122,253,4,239,255,15,133,244,250,139,42,248, + 1,57,193,15,131,244,70,129,124,253,202,252,252,239,15,133,244,249,59,108, 202,252,248,15,79,108,202,252,248,131,193,1,252,233,244,1,248,3,15,135,244, - 61,255,252,233,244,252,248,4,15,135,244,61,255,252,242,15,16,2,248,5,57,193, - 15,131,244,70,129,124,253,202,252,252,239,255,15,130,244,252,15,135,244,61, + 62,255,252,233,244,252,248,4,15,135,244,62,255,252,242,15,16,2,248,5,57,193, + 15,131,244,71,129,124,253,202,252,252,239,255,15,130,244,252,15,135,244,62, 252,242,15,42,76,202,252,248,252,233,244,253,255,248,6,252,242,15,16,76,202, - 252,248,248,7,252,242,15,93,193,131,193,1,252,233,244,5,255,248,117,185,2, + 252,248,248,7,252,242,15,93,193,131,193,1,252,233,244,5,255,248,118,185,2, 0,0,0,129,122,253,4,239,255,15,133,244,250,139,42,248,1,57,193,15,131,244, - 69,129,124,253,202,252,252,239,15,133,244,249,59,108,202,252,248,15,76,108, - 202,252,248,131,193,1,252,233,244,1,248,3,15,135,244,61,255,248,6,252,242, + 70,129,124,253,202,252,252,239,15,133,244,249,59,108,202,252,248,15,76,108, + 202,252,248,131,193,1,252,233,244,1,248,3,15,135,244,62,255,248,6,252,242, 15,16,76,202,252,248,248,7,252,242,15,95,193,131,193,1,252,233,244,5,255, - 248,9,221,216,252,233,244,61,255,248,118,129,252,248,239,15,130,244,61,129, - 122,253,4,239,15,133,244,61,139,42,255,139,173,233,252,233,244,69,255,252, - 242,15,42,133,233,252,233,244,70,255,219,133,233,252,233,244,71,255,248,119, - 129,252,248,239,15,133,244,61,129,122,253,4,239,15,133,244,61,139,42,139, - 90,252,252,131,189,233,1,15,130,244,79,15,182,173,233,255,252,242,15,42,197, - 252,233,244,70,255,137,44,36,219,4,36,252,233,244,71,255,248,120,65,139,174, - 233,65,59,174,233,15,130,244,247,232,244,73,248,1,129,252,248,239,15,133, - 244,61,129,122,253,4,239,255,15,133,244,61,139,42,129,252,253,252,255,0,0, - 0,15,135,244,61,137,108,36,4,255,15,131,244,61,252,242,15,44,42,129,252,253, - 252,255,0,0,0,15,135,244,61,137,108,36,4,255,15,131,244,61,221,2,219,92,36, - 4,129,124,36,4,252,255,0,0,0,15,135,244,61,255,199,68,36,8,1,0,0,0,72,141, - 68,36,4,248,121,139,108,36,24,137,149,233,139,84,36,8,72,137,198,137,252, + 248,9,221,216,252,233,244,62,255,248,119,129,252,248,239,15,130,244,62,129, + 122,253,4,239,15,133,244,62,139,42,255,139,173,233,252,233,244,70,255,252, + 242,15,42,133,233,252,233,244,71,255,219,133,233,252,233,244,72,255,248,120, + 129,252,248,239,15,133,244,62,129,122,253,4,239,15,133,244,62,139,42,139, + 90,252,252,131,189,233,1,15,130,244,80,15,182,173,233,255,252,242,15,42,197, + 252,233,244,71,255,137,44,36,219,4,36,252,233,244,72,255,248,121,65,139,174, + 233,65,59,174,233,15,130,244,247,232,244,74,248,1,129,252,248,239,15,133, + 244,62,129,122,253,4,239,255,15,133,244,62,139,42,129,252,253,252,255,0,0, + 0,15,135,244,62,137,108,36,4,255,15,131,244,62,252,242,15,44,42,129,252,253, + 252,255,0,0,0,15,135,244,62,137,108,36,4,255,15,131,244,62,221,2,219,92,36, + 4,129,124,36,4,252,255,0,0,0,15,135,244,62,255,199,68,36,8,1,0,0,0,72,141, + 68,36,4,248,122,139,108,36,24,137,149,233,139,84,36,8,72,137,198,137,252, 239,137,92,36,28,232,251,1,20,139,149,233,139,90,252,252,199,66,252,252,237, - 137,66,252,248,252,233,244,64,248,122,65,139,174,233,65,59,174,233,15,130, - 244,247,232,244,73,248,1,199,68,36,4,252,255,252,255,252,255,252,255,129, - 252,248,239,15,130,244,61,15,134,244,247,129,122,253,20,239,255,15,133,244, - 61,139,106,16,137,108,36,4,255,15,131,244,61,252,242,15,44,106,16,137,108, - 36,4,255,15,131,244,61,221,66,16,219,92,36,4,255,248,1,129,122,253,4,239, - 15,133,244,61,129,122,253,12,239,255,139,42,137,108,36,8,139,173,233,255, + 137,66,252,248,252,233,244,65,248,123,65,139,174,233,65,59,174,233,15,130, + 244,247,232,244,74,248,1,199,68,36,4,252,255,252,255,252,255,252,255,129, + 252,248,239,15,130,244,62,15,134,244,247,129,122,253,20,239,255,15,133,244, + 62,139,106,16,137,108,36,4,255,15,131,244,62,252,242,15,44,106,16,137,108, + 36,4,255,15,131,244,62,221,66,16,219,92,36,4,255,248,1,129,122,253,4,239, + 15,133,244,62,129,122,253,12,239,255,139,42,137,108,36,8,139,173,233,255, 139,74,8,255,252,242,15,44,74,8,255,139,68,36,4,57,197,15,130,244,251,248, - 2,133,201,15,142,244,253,248,3,139,108,36,8,41,200,15,140,244,123,141,172, - 253,13,233,131,192,1,248,4,137,68,36,8,137,232,252,233,244,121,248,5,15,140, + 2,133,201,15,142,244,253,248,3,139,108,36,8,41,200,15,140,244,124,141,172, + 253,13,233,131,192,1,248,4,137,68,36,8,137,232,252,233,244,122,248,5,15,140, 244,252,141,68,40,1,252,233,244,2,248,6,137,232,252,233,244,2,248,7,255,15, 132,244,254,1,252,233,131,193,1,15,143,244,3,248,8,185,1,0,0,0,252,233,244, - 3,248,123,49,192,252,233,244,4,248,124,129,252,248,239,15,130,244,61,65,139, - 174,233,65,59,174,233,15,130,244,247,232,244,73,248,1,255,129,122,253,4,239, - 15,133,244,61,129,122,253,12,239,139,42,255,15,133,244,61,139,66,8,255,15, - 131,244,61,252,242,15,44,66,8,255,15,131,244,61,221,66,8,219,92,36,4,139, - 68,36,4,255,133,192,15,142,244,123,131,189,233,1,15,130,244,123,15,133,244, - 125,65,57,134,233,15,130,244,125,15,182,141,233,65,139,174,233,137,68,36, + 3,248,124,49,192,252,233,244,4,248,125,129,252,248,239,15,130,244,62,65,139, + 174,233,65,59,174,233,15,130,244,247,232,244,74,248,1,255,129,122,253,4,239, + 15,133,244,62,129,122,253,12,239,139,42,255,15,133,244,62,139,66,8,255,15, + 131,244,62,252,242,15,44,66,8,255,15,131,244,62,221,66,8,219,92,36,4,139, + 68,36,4,255,133,192,15,142,244,124,131,189,233,1,15,130,244,124,15,133,244, + 126,65,57,134,233,15,130,244,126,15,182,141,233,65,139,174,233,137,68,36, 8,248,1,136,77,0,131,197,1,131,232,1,15,133,244,1,65,139,134,233,252,233, - 244,121,248,126,129,252,248,239,255,15,130,244,61,65,139,174,233,65,59,174, - 233,15,130,244,247,232,244,73,248,1,129,122,253,4,239,15,133,244,61,139,42, - 139,133,233,133,192,15,132,244,123,65,57,134,233,15,130,244,127,129,197,239, + 244,122,248,127,129,252,248,239,255,15,130,244,62,65,139,174,233,65,59,174, + 233,15,130,244,247,232,244,74,248,1,129,122,253,4,239,15,133,244,62,139,42, + 139,133,233,133,192,15,132,244,124,65,57,134,233,15,130,244,128,129,197,239, 137,92,36,4,137,68,36,8,65,139,158,233,248,1,255,15,182,77,0,131,197,1,131, - 232,1,136,12,3,15,133,244,1,137,216,139,92,36,4,252,233,244,121,248,128,129, - 252,248,239,15,130,244,61,65,139,174,233,65,59,174,233,15,130,244,247,232, - 244,73,248,1,129,122,253,4,239,15,133,244,61,139,42,139,133,233,65,57,134, - 233,255,15,130,244,127,129,197,239,137,92,36,4,137,68,36,8,65,139,158,233, + 232,1,136,12,3,15,133,244,1,137,216,139,92,36,4,252,233,244,122,248,129,129, + 252,248,239,15,130,244,62,65,139,174,233,65,59,174,233,15,130,244,247,232, + 244,74,248,1,129,122,253,4,239,15,133,244,62,139,42,139,133,233,65,57,134, + 233,255,15,130,244,128,129,197,239,137,92,36,4,137,68,36,8,65,139,158,233, 252,233,244,249,248,1,15,182,76,5,0,131,252,249,65,15,130,244,248,131,252, 249,90,15,135,244,248,131,252,241,32,248,2,136,12,3,248,3,131,232,1,15,137, - 244,1,137,216,139,92,36,4,252,233,244,121,248,129,129,252,248,239,15,130, - 244,61,255,65,139,174,233,65,59,174,233,15,130,244,247,232,244,73,248,1,129, - 122,253,4,239,15,133,244,61,139,42,139,133,233,65,57,134,233,15,130,244,127, + 244,1,137,216,139,92,36,4,252,233,244,122,248,130,129,252,248,239,15,130, + 244,62,255,65,139,174,233,65,59,174,233,15,130,244,247,232,244,74,248,1,129, + 122,253,4,239,15,133,244,62,139,42,139,133,233,65,57,134,233,15,130,244,128, 129,197,239,137,92,36,4,137,68,36,8,65,139,158,233,252,233,244,249,248,1, 15,182,76,5,0,131,252,249,97,15,130,244,248,255,131,252,249,122,15,135,244, 248,131,252,241,32,248,2,136,12,3,248,3,131,232,1,15,137,244,1,137,216,139, - 92,36,4,252,233,244,121,248,130,129,252,248,239,15,130,244,61,129,122,253, - 4,239,15,133,244,61,137,213,139,58,232,251,1,21,137,252,234,255,137,197,252, - 233,244,69,255,252,242,15,42,192,252,233,244,70,255,248,131,129,252,248,239, - 15,130,244,61,129,122,253,4,239,255,15,133,244,247,139,42,252,233,244,87, - 248,1,15,135,244,61,255,252,242,15,16,2,72,189,237,237,102,72,15,110,205, - 252,242,15,88,193,102,15,126,197,255,252,233,244,87,255,248,132,129,252,248, - 239,15,130,244,61,255,72,189,237,237,102,72,15,110,205,255,199,4,36,0,0,192, - 89,255,15,133,244,247,139,42,252,233,244,248,248,1,15,135,244,61,255,252, + 92,36,4,252,233,244,122,248,131,129,252,248,239,15,130,244,62,129,122,253, + 4,239,15,133,244,62,137,213,139,58,232,251,1,21,137,252,234,255,137,197,252, + 233,244,70,255,252,242,15,42,192,252,233,244,71,255,248,132,129,252,248,239, + 15,130,244,62,129,122,253,4,239,255,15,133,244,247,139,42,252,233,244,88, + 248,1,15,135,244,62,255,252,242,15,16,2,72,189,237,237,102,72,15,110,205, + 252,242,15,88,193,102,15,126,197,255,252,233,244,88,255,248,133,129,252,248, + 239,15,130,244,62,255,72,189,237,237,102,72,15,110,205,255,199,4,36,0,0,192, + 89,255,15,133,244,247,139,42,252,233,244,248,248,1,15,135,244,62,255,252, 242,15,16,2,252,242,15,88,193,102,15,126,197,255,248,2,137,68,36,4,141,68, - 194,252,240,248,1,57,208,15,134,244,87,129,120,253,4,239,255,15,133,244,248, - 35,40,131,232,8,252,233,244,1,248,2,15,135,244,133,255,15,131,244,133,255, + 194,252,240,248,1,57,208,15,134,244,88,129,120,253,4,239,255,15,133,244,248, + 35,40,131,232,8,252,233,244,1,248,2,15,135,244,134,255,15,131,244,134,255, 252,242,15,16,0,252,242,15,88,193,102,15,126,193,33,205,255,131,232,8,252, - 233,244,1,248,134,129,252,248,239,15,130,244,61,255,15,133,244,248,11,40, - 131,232,8,252,233,244,1,248,2,15,135,244,133,255,252,242,15,16,0,252,242, - 15,88,193,102,15,126,193,9,205,255,131,232,8,252,233,244,1,248,135,129,252, - 248,239,15,130,244,61,255,15,133,244,248,51,40,131,232,8,252,233,244,1,248, - 2,15,135,244,133,255,252,242,15,16,0,252,242,15,88,193,102,15,126,193,49, - 205,255,131,232,8,252,233,244,1,248,136,129,252,248,239,15,130,244,61,129, - 122,253,4,239,255,248,2,15,205,252,233,244,87,248,137,129,252,248,239,15, - 130,244,61,129,122,253,4,239,255,248,2,252,247,213,255,248,87,252,242,15, - 42,197,252,233,244,70,255,248,133,139,68,36,4,252,233,244,61,255,248,138, - 129,252,248,239,15,130,244,61,129,122,253,4,239,255,248,2,129,122,253,12, - 239,15,133,244,61,139,74,8,255,248,138,129,252,248,239,15,130,244,61,129, - 122,253,4,239,15,131,244,61,129,122,253,12,239,15,131,244,61,252,242,15,16, + 233,244,1,248,135,129,252,248,239,15,130,244,62,255,15,133,244,248,11,40, + 131,232,8,252,233,244,1,248,2,15,135,244,134,255,252,242,15,16,0,252,242, + 15,88,193,102,15,126,193,9,205,255,131,232,8,252,233,244,1,248,136,129,252, + 248,239,15,130,244,62,255,15,133,244,248,51,40,131,232,8,252,233,244,1,248, + 2,15,135,244,134,255,252,242,15,16,0,252,242,15,88,193,102,15,126,193,49, + 205,255,131,232,8,252,233,244,1,248,137,129,252,248,239,15,130,244,62,129, + 122,253,4,239,255,248,2,15,205,252,233,244,88,248,138,129,252,248,239,15, + 130,244,62,129,122,253,4,239,255,248,2,252,247,213,255,248,88,252,242,15, + 42,197,252,233,244,71,255,248,134,139,68,36,4,252,233,244,62,255,248,139, + 129,252,248,239,15,130,244,62,129,122,253,4,239,255,248,2,129,122,253,12, + 239,15,133,244,62,139,74,8,255,248,139,129,252,248,239,15,130,244,62,129, + 122,253,4,239,15,131,244,62,129,122,253,12,239,15,131,244,62,252,242,15,16, 2,252,242,15,16,74,8,72,189,237,237,102,72,15,110,213,252,242,15,88,194,252, - 242,15,88,202,102,15,126,197,102,15,126,201,255,211,229,252,233,244,87,255, - 248,139,129,252,248,239,15,130,244,61,129,122,253,4,239,255,248,139,129,252, - 248,239,15,130,244,61,129,122,253,4,239,15,131,244,61,129,122,253,12,239, - 15,131,244,61,252,242,15,16,2,252,242,15,16,74,8,72,189,237,237,102,72,15, + 242,15,88,202,102,15,126,197,102,15,126,201,255,211,229,252,233,244,88,255, + 248,140,129,252,248,239,15,130,244,62,129,122,253,4,239,255,248,140,129,252, + 248,239,15,130,244,62,129,122,253,4,239,15,131,244,62,129,122,253,12,239, + 15,131,244,62,252,242,15,16,2,252,242,15,16,74,8,72,189,237,237,102,72,15, 110,213,252,242,15,88,194,252,242,15,88,202,102,15,126,197,102,15,126,201, - 255,211,252,237,252,233,244,87,255,248,140,129,252,248,239,15,130,244,61, - 129,122,253,4,239,255,248,140,129,252,248,239,15,130,244,61,129,122,253,4, - 239,15,131,244,61,129,122,253,12,239,15,131,244,61,252,242,15,16,2,252,242, + 255,211,252,237,252,233,244,88,255,248,141,129,252,248,239,15,130,244,62, + 129,122,253,4,239,255,248,141,129,252,248,239,15,130,244,62,129,122,253,4, + 239,15,131,244,62,129,122,253,12,239,15,131,244,62,252,242,15,16,2,252,242, 15,16,74,8,72,189,237,237,102,72,15,110,213,252,242,15,88,194,252,242,15, - 88,202,102,15,126,197,102,15,126,201,255,211,252,253,252,233,244,87,255,248, - 141,129,252,248,239,15,130,244,61,129,122,253,4,239,255,248,141,129,252,248, - 239,15,130,244,61,129,122,253,4,239,15,131,244,61,129,122,253,12,239,15,131, - 244,61,252,242,15,16,2,252,242,15,16,74,8,72,189,237,237,102,72,15,110,213, + 88,202,102,15,126,197,102,15,126,201,255,211,252,253,252,233,244,88,255,248, + 142,129,252,248,239,15,130,244,62,129,122,253,4,239,255,248,142,129,252,248, + 239,15,130,244,62,129,122,253,4,239,15,131,244,62,129,122,253,12,239,15,131, + 244,62,252,242,15,16,2,252,242,15,16,74,8,72,189,237,237,102,72,15,110,213, 252,242,15,88,194,252,242,15,88,202,102,15,126,197,102,15,126,201,255,211, - 197,252,233,244,87,255,248,142,129,252,248,239,15,130,244,61,129,122,253, - 4,239,255,248,142,129,252,248,239,15,130,244,61,129,122,253,4,239,15,131, - 244,61,129,122,253,12,239,15,131,244,61,252,242,15,16,2,252,242,15,16,74, + 197,252,233,244,88,255,248,143,129,252,248,239,15,130,244,62,129,122,253, + 4,239,255,248,143,129,252,248,239,15,130,244,62,129,122,253,4,239,15,131, + 244,62,129,122,253,12,239,15,131,244,62,252,242,15,16,2,252,242,15,16,74, 8,72,189,237,237,102,72,15,110,213,252,242,15,88,194,252,242,15,88,202,102, - 15,126,197,102,15,126,201,255,211,205,252,233,244,87,248,125,184,237,252, - 233,244,61,248,127,184,237,248,61,139,108,36,24,139,90,252,252,137,92,36, + 15,126,197,102,15,126,201,255,211,205,252,233,244,88,248,126,184,237,252, + 233,244,62,248,128,184,237,248,62,139,108,36,24,139,90,252,252,137,92,36, 28,137,149,233,141,68,194,252,248,141,136,233,137,133,233,139,66,252,248, 59,141,233,15,135,244,251,137,252,239,252,255,144,233,139,149,233,133,192, - 15,143,244,76,248,1,255,139,141,233,41,209,193,252,233,3,133,192,141,65,1, + 15,143,244,77,248,1,255,139,141,233,41,209,193,252,233,3,133,192,141,65,1, 139,106,252,248,15,133,244,32,139,157,233,139,11,15,182,252,233,15,182,205, 131,195,4,65,252,255,36,252,238,248,32,137,209,252,247,195,237,15,133,244, 249,15,182,107,252,253,72,252,247,213,141,20,252,234,252,233,244,28,248,3, 137,221,131,229,252,248,41,252,234,252,233,244,28,248,5,190,237,137,252,239, - 232,251,1,0,139,149,233,49,192,252,233,244,1,248,73,93,72,137,108,36,8,139, + 232,251,1,0,139,149,233,49,192,252,233,244,1,248,74,93,72,137,108,36,8,139, 108,36,24,137,92,36,28,137,149,233,255,141,68,194,252,248,137,252,239,137, 133,233,232,251,1,22,139,149,233,139,133,233,41,208,193,232,3,131,192,1,72, - 139,108,36,8,85,195,248,143,255,65,15,182,134,233,168,235,15,133,244,251, + 139,108,36,8,85,195,248,144,255,65,15,182,134,233,168,235,15,133,244,251, 168,235,15,133,244,247,168,235,15,132,244,247,65,252,255,142,233,252,233, - 244,247,255,248,144,65,15,182,134,233,168,235,15,133,244,251,252,233,244, - 247,248,145,65,15,182,134,233,168,235,15,133,244,251,168,235,15,132,244,251, + 244,247,255,248,145,65,15,182,134,233,168,235,15,133,244,251,252,233,244, + 247,248,146,65,15,182,134,233,168,235,15,133,244,251,168,235,15,132,244,251, 65,252,255,142,233,15,132,244,247,168,235,15,132,244,251,248,1,255,139,108, 36,24,137,149,233,137,222,137,252,239,232,251,1,23,248,3,139,149,233,248, 4,15,182,75,252,253,248,5,15,182,107,252,252,15,183,67,252,254,65,252,255, - 164,253,252,238,233,248,146,131,195,4,139,77,232,137,76,36,4,252,233,244, - 4,248,147,255,139,106,252,248,139,173,233,15,182,133,233,141,4,194,139,108, + 164,253,252,238,233,248,147,131,195,4,139,77,232,137,76,36,4,252,233,244, + 4,248,148,255,139,106,252,248,139,173,233,15,182,133,233,141,4,194,139,108, 36,24,137,149,233,137,133,233,137,222,65,141,190,233,73,137,174,233,137,92, - 36,28,232,251,1,24,252,233,244,3,255,248,148,137,92,36,28,255,248,149,255, + 36,28,232,251,1,24,252,233,244,3,255,248,149,137,92,36,28,255,248,150,255, 137,92,36,28,131,203,1,248,1,255,141,68,194,252,248,139,108,36,24,137,149, 233,137,133,233,137,222,137,252,239,232,251,1,25,199,68,36,28,0,0,0,0,255, 131,227,252,254,255,139,149,233,72,137,193,139,133,233,41,208,72,137,205, - 15,182,75,252,253,193,232,3,131,192,1,252,255,229,248,150,255,65,85,65,84, + 15,182,75,252,253,193,232,3,131,192,1,252,255,229,248,151,255,65,85,65,84, 65,83,65,82,65,81,65,80,87,86,85,72,141,108,36,88,85,83,82,81,80,15,182,69, 252,248,138,101,252,240,76,137,125,252,248,76,137,117,252,240,68,139,117, 0,65,139,142,233,65,199,134,233,237,65,137,134,233,65,137,142,233,72,129, @@ -396,30 +397,30 @@ static const unsigned char build_actionlist[16103] = { 17,77,136,252,242,15,17,69,128,65,139,174,233,65,139,150,233,73,137,174,233, 65,199,134,233,0,0,0,0,137,149,233,72,137,230,65,141,190,233,232,251,1,26, 72,139,141,233,72,129,225,239,72,137,204,137,169,233,139,149,233,139,153, - 233,252,233,244,247,255,248,151,255,72,131,196,16,248,1,76,139,108,36,8,76, + 233,252,233,244,247,255,248,152,255,72,131,196,16,248,1,76,139,108,36,8,76, 139,36,36,133,192,15,136,244,249,137,68,36,4,68,139,122,252,248,69,139,191, 233,69,139,191,233,65,199,134,233,0,0,0,0,65,199,134,233,237,139,3,15,182, 204,15,182,232,131,195,4,193,232,16,129,252,253,239,15,130,244,248,139,68, 36,4,248,2,65,252,255,36,252,238,248,3,252,247,216,137,252,239,137,198,232, - 251,1,1,255,248,89,255,217,124,36,4,137,68,36,8,102,184,0,4,102,11,68,36, + 251,1,1,255,248,90,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,152,72,184,237,237,102,72,15,110,208,72,184, + 36,4,139,68,36,8,195,255,248,153,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,91,255,217,124,36,4,137,68,36,8,102,184,0,8,102, + 200,15,40,193,248,1,195,248,92,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,153,72,184,237,237,102,72,15,110,208, + 217,108,36,4,139,68,36,8,195,255,248,154,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,112,255,217,124,36,4,137,68,36,8,102,184, + 15,92,200,15,40,193,248,1,195,248,113,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,154,72,184,237,237,102,72,15,110,208,72,184,237,237, + 139,68,36,8,195,255,248,155,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,155,255,15,40,232,252,242,15,94,193,72,184, + 86,202,15,40,193,248,1,195,248,156,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, @@ -427,12 +428,12 @@ static const unsigned char build_actionlist[16103] = { 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,96,217,252,234,222,201,248,156,217,84,36,252,248,129, + 252,233,195,255,248,97,217,252,234,222,201,248,157,217,84,36,252,248,129, 124,36,252,248,0,0,128,127,15,132,244,247,129,124,36,252,248,0,0,128,252, - 255,15,132,244,248,248,157,217,192,217,252,252,220,252,233,217,201,217,252, + 255,15,132,244,248,248,158,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,115,255,248,158,252,242,15,45,193,252,242,15,42,208,102,15,46, - 202,15,133,244,254,15,138,244,255,248,159,131,252,248,1,15,142,244,252,248, + 195,255,248,116,255,248,159,252,242,15,45,193,252,242,15,42,208,102,15,46, + 202,15,133,244,254,15,138,244,255,248,160,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, @@ -449,28 +450,28 @@ static const unsigned char build_actionlist[16103] = { 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,160,255, - 131,252,255,1,15,130,244,89,15,132,244,91,131,252,255,3,15,130,244,112,15, + 192,195,248,5,102,15,80,193,133,192,15,132,244,3,15,87,192,195,248,161,255, + 131,252,255,1,15,130,244,90,15,132,244,92,131,252,255,3,15,130,244,113,15, 135,244,248,252,242,15,81,192,195,248,2,252,242,15,17,68,36,252,248,221,68, - 36,252,248,131,252,255,5,15,135,244,248,15,132,244,247,232,244,96,252,233, - 244,253,248,1,232,244,156,255,252,233,244,253,248,2,131,252,255,7,15,132, + 36,252,248,131,252,255,5,15,135,244,248,15,132,244,247,232,244,97,252,233, + 244,253,248,1,232,244,157,255,252,233,244,253,248,2,131,252,255,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,255,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,255,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,252,248,252,242,15,16,68,36,252,248,195,255,139,124,36,12,221,68,36, - 4,131,252,255,1,15,130,244,89,15,132,244,91,131,252,255,3,15,130,244,112, - 15,135,244,248,217,252,250,195,248,2,131,252,255,5,15,130,244,96,15,132,244, - 156,131,252,255,7,15,132,244,247,15,135,244,248,217,252,237,217,201,217,252, + 4,131,252,255,1,15,130,244,90,15,132,244,92,131,252,255,3,15,130,244,113, + 15,135,244,248,217,252,250,195,248,2,131,252,255,5,15,130,244,97,15,132,244, + 157,131,252,255,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,255,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,255,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,255,248,161,255,131,252,255, + 195,248,1,217,252,242,221,216,195,255,248,9,204,255,248,162,255,131,252,255, 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,131,252,255,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,131,252,255,5,15,130,244,155,15,132, - 244,115,131,252,255,7,15,132,244,247,15,135,244,248,72,184,237,237,255,102, + 195,248,1,252,242,15,94,193,195,248,2,131,252,255,5,15,130,244,156,15,132, + 244,116,131,252,255,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,131,252,255,9,15,135,244,248,252,242,15,17,68,36,252,248,252, 242,15,17,76,36,252,240,221,68,36,252,248,221,68,36,252,240,15,132,244,247, @@ -480,14 +481,14 @@ static const unsigned char build_actionlist[16103] = { 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,155,15,132,244,115,131,252,248,7,15,132,244,247,15,135, + 252,248,5,15,130,244,156,15,132,244,116,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, - 162,137,252,248,83,15,162,137,6,137,94,4,137,78,8,137,86,12,91,195,248,163, + 163,137,252,248,83,15,162,137,6,137,94,4,137,78,8,137,86,12,91,195,248,164, 255,85,72,137,229,83,72,137,252,251,139,131,233,72,41,196,255,15,182,139, 233,131,252,233,1,15,136,244,248,248,1,72,139,132,253,203,233,72,137,132, 253,204,233,131,252,233,1,15,137,244,1,248,2,15,182,131,233,72,139,187,233, @@ -495,7 +496,7 @@ static const unsigned char build_actionlist[16103] = { 133,192,15,132,244,251,15,40,131,233,15,40,139,233,255,15,40,147,233,15,40, 155,233,131,252,248,4,15,134,244,251,15,40,163,233,15,40,171,233,15,40,179, 233,15,40,187,233,248,5,252,255,147,233,72,137,131,233,15,41,131,233,72,137, - 147,233,15,41,139,233,255,72,139,93,252,248,201,195,255,248,164,255,249,255, + 147,233,15,41,139,233,255,72,139,93,252,248,201,195,255,248,165,255,249,255, 129,124,253,202,4,239,15,133,244,253,129,124,253,194,4,239,15,133,244,254, 139,44,202,131,195,4,59,44,194,255,15,141,244,255,255,15,140,244,255,255, 15,143,244,255,255,15,142,244,255,255,248,6,15,183,67,252,254,141,156,253, @@ -556,240 +557,242 @@ static const unsigned char build_actionlist[16103] = { 133,244,248,139,4,194,255,139,128,233,248,1,199,68,202,4,237,137,4,202,255, 15,87,192,252,242,15,42,128,233,248,1,252,242,15,17,4,202,255,219,128,233, 248,1,221,28,202,255,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65, - 252,255,36,252,238,248,2,129,124,253,194,4,239,15,133,244,56,139,60,194,137, - 213,232,251,1,21,255,252,242,15,42,192,255,137,252,234,15,182,75,252,253, - 252,233,244,1,255,15,182,252,236,15,182,192,255,129,124,253,252,234,4,239, - 15,133,244,50,65,129,124,253,199,4,239,15,133,244,50,139,44,252,234,65,3, - 44,199,15,128,244,49,255,129,124,253,252,234,4,239,15,133,244,52,65,129,124, - 253,199,4,239,15,133,244,52,65,139,4,199,3,4,252,234,15,128,244,51,255,129, - 124,253,252,234,4,239,15,133,244,55,129,124,253,194,4,239,15,133,244,55,139, - 44,252,234,3,44,194,15,128,244,54,255,199,68,202,4,237,255,129,124,253,252, - 234,4,239,15,131,244,50,255,65,129,124,253,199,4,239,15,131,244,50,255,252, - 242,15,16,4,252,234,252,242,65,15,88,4,199,255,221,4,252,234,65,220,4,199, - 255,129,124,253,252,234,4,239,15,131,244,52,255,65,129,124,253,199,4,239, - 15,131,244,52,255,252,242,65,15,16,4,199,252,242,15,88,4,252,234,255,65,221, - 4,199,220,4,252,234,255,129,124,253,252,234,4,239,15,131,244,55,129,124,253, - 194,4,239,15,131,244,55,255,252,242,15,16,4,252,234,252,242,15,88,4,194,255, - 221,4,252,234,220,4,194,255,129,124,253,252,234,4,239,15,133,244,50,65,129, - 124,253,199,4,239,15,133,244,50,139,44,252,234,65,43,44,199,15,128,244,49, - 255,129,124,253,252,234,4,239,15,133,244,52,65,129,124,253,199,4,239,15,133, - 244,52,65,139,4,199,43,4,252,234,15,128,244,51,255,129,124,253,252,234,4, - 239,15,133,244,55,129,124,253,194,4,239,15,133,244,55,139,44,252,234,43,44, - 194,15,128,244,54,255,252,242,15,16,4,252,234,252,242,65,15,92,4,199,255, - 221,4,252,234,65,220,36,199,255,252,242,65,15,16,4,199,252,242,15,92,4,252, - 234,255,65,221,4,199,220,36,252,234,255,252,242,15,16,4,252,234,252,242,15, - 92,4,194,255,221,4,252,234,220,36,194,255,129,124,253,252,234,4,239,15,133, - 244,50,65,129,124,253,199,4,239,15,133,244,50,139,44,252,234,65,15,175,44, - 199,15,128,244,49,255,129,124,253,252,234,4,239,15,133,244,52,65,129,124, - 253,199,4,239,15,133,244,52,65,139,4,199,15,175,4,252,234,15,128,244,51,255, - 129,124,253,252,234,4,239,15,133,244,55,129,124,253,194,4,239,15,133,244, - 55,139,44,252,234,15,175,44,194,15,128,244,54,255,252,242,15,16,4,252,234, - 252,242,65,15,89,4,199,255,221,4,252,234,65,220,12,199,255,252,242,65,15, - 16,4,199,252,242,15,89,4,252,234,255,65,221,4,199,220,12,252,234,255,252, - 242,15,16,4,252,234,252,242,15,89,4,194,255,221,4,252,234,220,12,194,255, - 252,242,15,16,4,252,234,252,242,65,15,94,4,199,255,221,4,252,234,65,220,52, - 199,255,252,242,65,15,16,4,199,252,242,15,94,4,252,234,255,65,221,4,199,220, - 52,252,234,255,252,242,15,16,4,252,234,252,242,15,94,4,194,255,221,4,252, - 234,220,52,194,255,252,242,15,16,4,252,234,252,242,65,15,16,12,199,255,221, - 4,252,234,65,221,4,199,255,252,242,65,15,16,4,199,252,242,15,16,12,252,234, - 255,65,221,4,199,221,4,252,234,255,252,242,15,16,4,252,234,252,242,15,16, - 12,194,255,221,4,252,234,221,4,194,255,248,165,232,244,155,255,252,233,244, - 165,255,232,244,115,255,15,182,252,236,15,182,192,139,124,36,24,137,151,233, - 141,52,194,137,194,41,252,234,248,35,137,252,253,137,92,36,28,232,251,1,27, - 139,149,233,133,192,15,133,244,44,15,182,107,252,255,15,182,75,252,253,72, - 139,4,252,234,72,137,4,202,139,3,15,182,204,15,182,232,131,195,4,193,232, - 16,65,252,255,36,252,238,255,72,252,247,208,65,139,4,135,199,68,202,4,237, - 137,4,202,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36, - 252,238,255,15,191,192,199,68,202,4,237,137,4,202,255,15,191,192,252,242, - 15,42,192,252,242,15,17,4,202,255,223,67,252,254,221,28,202,255,252,242,65, - 15,16,4,199,252,242,15,17,4,202,255,65,221,4,199,221,28,202,255,72,252,247, - 208,137,68,202,4,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65,252, - 255,36,252,238,255,141,76,202,12,141,68,194,4,189,237,137,105,252,248,248, - 1,137,41,131,193,8,57,193,15,134,244,1,139,3,15,182,204,15,182,232,131,195, - 4,193,232,16,65,252,255,36,252,238,255,139,106,252,248,139,172,253,133,233, - 139,173,233,72,139,69,0,72,137,4,202,139,3,15,182,204,15,182,232,131,195, - 4,193,232,16,65,252,255,36,252,238,255,139,106,252,248,139,172,253,141,233, - 128,189,233,0,139,173,233,139,12,194,139,68,194,4,137,77,0,137,69,4,15,132, - 244,247,252,246,133,233,235,15,133,244,248,248,1,139,3,15,182,204,15,182, - 232,131,195,4,193,232,16,65,252,255,36,252,238,248,2,129,232,239,129,252, - 248,239,15,134,244,1,252,246,129,233,235,15,132,244,1,137,252,238,137,213, - 65,141,190,233,255,232,251,1,28,137,252,234,252,233,244,1,255,72,252,247, - 208,139,106,252,248,139,172,253,141,233,65,139,12,135,139,133,233,137,8,199, - 64,4,237,252,246,133,233,235,15,133,244,248,248,1,139,3,15,182,204,15,182, - 232,131,195,4,193,232,16,65,252,255,36,252,238,248,2,252,246,129,233,235, - 15,132,244,1,128,189,233,0,15,132,244,1,137,213,137,198,65,141,190,233,232, - 251,1,28,137,252,234,252,233,244,1,255,139,106,252,248,255,252,242,65,15, - 16,4,199,255,139,172,253,141,233,139,141,233,255,252,242,15,17,1,255,221, - 25,255,72,252,247,208,139,106,252,248,139,172,253,141,233,139,141,233,137, - 65,4,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36,252,238, - 255,141,156,253,131,233,139,108,36,24,131,189,233,0,15,132,244,247,137,149, - 233,141,52,202,137,252,239,232,251,1,29,139,149,233,248,1,139,3,15,182,204, - 15,182,232,131,195,4,193,232,16,65,252,255,36,252,238,255,72,252,247,208, - 139,108,36,24,137,149,233,139,82,252,248,65,139,52,135,137,252,239,137,92, - 36,28,232,251,1,30,139,149,233,15,182,75,252,253,137,4,202,199,68,202,4,237, - 139,3,15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36,252,238,255, - 139,108,36,24,137,149,233,65,139,142,233,65,59,142,233,137,92,36,28,15,131, - 244,251,248,1,137,194,37,252,255,7,0,0,193,252,234,11,61,252,255,7,0,0,15, - 132,244,249,248,2,137,252,239,137,198,232,251,1,31,139,149,233,15,182,75, - 252,253,137,4,202,199,68,202,4,237,139,3,15,182,204,15,182,232,131,195,4, - 193,232,16,65,252,255,36,252,238,248,3,184,1,8,0,0,252,233,244,2,248,5,137, - 252,239,232,251,1,32,15,183,67,252,254,252,233,244,1,255,72,252,247,208,139, - 108,36,24,65,139,142,233,137,92,36,28,65,59,142,233,137,149,233,15,131,244, - 249,248,2,65,139,52,135,137,252,239,232,251,1,33,139,149,233,15,182,75,252, - 253,137,4,202,199,68,202,4,237,139,3,15,182,204,15,182,232,131,195,4,193, - 232,16,65,252,255,36,252,238,248,3,137,252,239,232,251,1,32,15,183,67,252, - 254,72,252,247,208,252,233,244,2,255,72,252,247,208,139,106,252,248,139,173, - 233,65,139,4,135,252,233,244,166,255,72,252,247,208,139,106,252,248,139,173, - 233,65,139,4,135,252,233,244,167,255,15,182,252,236,15,182,192,129,124,253, - 252,234,4,239,15,133,244,38,139,44,252,234,255,129,124,253,194,4,239,15,133, - 244,251,139,4,194,255,129,124,253,194,4,239,15,131,244,251,255,252,242,15, - 16,4,194,252,242,15,45,192,252,242,15,42,200,102,15,46,193,255,15,133,244, - 38,255,59,133,233,15,131,244,38,193,224,3,3,133,233,129,120,253,4,239,15, - 132,244,248,72,139,40,72,137,44,202,248,1,139,3,15,182,204,15,182,232,131, - 195,4,193,232,16,65,252,255,36,252,238,248,2,131,189,233,0,15,132,244,249, - 139,141,233,252,246,129,233,235,15,132,244,38,15,182,75,252,253,248,3,199, - 68,202,4,237,252,233,244,1,248,5,255,129,124,253,194,4,239,15,133,244,38, - 139,4,194,252,233,244,166,255,15,182,252,236,15,182,192,72,252,247,208,65, - 139,4,135,129,124,253,252,234,4,239,15,133,244,36,139,44,252,234,248,166, - 139,141,233,35,136,233,105,201,239,3,141,233,248,1,129,185,233,239,15,133, - 244,250,57,129,233,15,133,244,250,129,121,253,4,239,15,132,244,251,15,182, - 67,252,253,72,139,41,72,137,44,194,248,2,255,139,3,15,182,204,15,182,232, - 131,195,4,193,232,16,65,252,255,36,252,238,248,3,15,182,67,252,253,199,68, - 194,4,237,252,233,244,2,248,4,139,137,233,133,201,15,133,244,1,248,5,139, - 141,233,133,201,15,132,244,3,252,246,129,233,235,15,133,244,3,252,233,244, - 36,255,15,182,252,236,15,182,192,129,124,253,252,234,4,239,15,133,244,37, - 139,44,252,234,59,133,233,15,131,244,37,193,224,3,3,133,233,129,120,253,4, - 239,15,132,244,248,72,139,40,72,137,44,202,248,1,139,3,15,182,204,15,182, - 232,131,195,4,193,232,16,65,252,255,36,252,238,248,2,131,189,233,0,15,132, - 244,249,139,141,233,252,246,129,233,235,15,132,244,37,255,15,182,75,252,253, - 248,3,199,68,202,4,237,252,233,244,1,255,15,182,252,236,15,182,192,129,124, - 253,252,234,4,239,15,133,244,41,139,44,252,234,255,15,133,244,41,255,59,133, - 233,15,131,244,41,193,224,3,3,133,233,129,120,253,4,239,15,132,244,249,248, - 1,252,246,133,233,235,15,133,244,253,248,2,72,139,44,202,72,137,40,139,3, - 15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36,252,238,248,3,131, - 189,233,0,15,132,244,1,139,141,233,252,246,129,233,235,255,15,132,244,41, - 15,182,75,252,253,252,233,244,1,248,5,129,124,253,194,4,239,15,133,244,41, - 139,4,194,252,233,244,167,248,7,128,165,233,235,65,139,142,233,65,137,174, - 233,137,141,233,15,182,75,252,253,252,233,244,2,255,15,182,252,236,15,182, - 192,72,252,247,208,65,139,4,135,129,124,253,252,234,4,239,15,133,244,39,139, - 44,252,234,248,167,139,141,233,35,136,233,105,201,239,198,133,233,0,3,141, - 233,248,1,129,185,233,239,15,133,244,251,57,129,233,15,133,244,251,129,121, - 253,4,239,15,132,244,250,248,2,255,252,246,133,233,235,15,133,244,253,248, - 3,15,182,67,252,253,72,139,44,194,72,137,41,139,3,15,182,204,15,182,232,131, - 195,4,193,232,16,65,252,255,36,252,238,248,4,131,189,233,0,15,132,244,2,137, - 12,36,139,141,233,252,246,129,233,235,15,132,244,39,139,12,36,252,233,244, - 2,248,5,139,137,233,133,201,15,133,244,1,255,139,141,233,133,201,15,132,244, - 252,252,246,129,233,235,15,132,244,39,248,6,137,4,36,199,68,36,4,237,137, - 108,36,8,139,124,36,24,137,151,233,72,141,20,36,137,252,238,137,252,253,137, - 92,36,28,232,251,1,34,139,149,233,139,108,36,8,137,193,252,233,244,2,248, - 7,128,165,233,235,65,139,134,233,65,137,174,233,137,133,233,252,233,244,3, - 255,15,182,252,236,15,182,192,129,124,253,252,234,4,239,15,133,244,40,139, - 44,252,234,59,133,233,15,131,244,40,193,224,3,3,133,233,129,120,253,4,239, - 15,132,244,249,248,1,252,246,133,233,235,15,133,244,253,248,2,72,139,12,202, - 72,137,8,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36,252, - 238,248,3,131,189,233,0,15,132,244,1,255,139,141,233,252,246,129,233,235, - 15,132,244,40,15,182,75,252,253,252,233,244,1,248,7,128,165,233,235,65,139, - 142,233,65,137,174,233,137,141,233,15,182,75,252,253,252,233,244,2,255,68, - 137,60,36,69,139,60,199,248,1,141,12,202,139,105,252,248,252,246,133,233, - 235,15,133,244,253,248,2,139,68,36,4,131,232,1,15,132,244,250,68,1,252,248, - 59,133,233,15,135,244,251,68,41,252,248,65,193,231,3,68,3,189,233,248,3,72, - 139,41,131,193,8,73,137,47,65,131,199,8,131,232,1,15,133,244,3,248,4,68,139, - 60,36,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36,252, - 238,248,5,139,124,36,24,137,151,233,137,252,238,137,194,137,252,253,137,92, - 36,28,232,251,1,35,139,149,233,15,182,75,252,253,252,233,244,1,248,7,255, - 128,165,233,235,65,139,134,233,65,137,174,233,137,133,233,252,233,244,2,255, - 3,68,36,4,255,129,124,253,202,4,239,139,44,202,15,133,244,57,141,84,202,8, - 137,90,252,252,139,157,233,139,11,15,182,252,233,15,182,205,131,195,4,65, - 252,255,36,252,238,255,141,76,202,8,65,137,215,139,105,252,248,129,121,253, - 252,252,239,15,133,244,29,248,58,139,90,252,252,252,247,195,237,15,133,244, - 253,248,1,137,106,252,248,137,68,36,4,131,232,1,15,132,244,249,248,2,72,139, - 41,131,193,8,73,137,47,65,131,199,8,131,232,1,15,133,244,2,139,106,252,248, - 248,3,139,68,36,4,128,189,233,1,15,135,244,251,248,4,139,157,233,139,11,15, - 182,252,233,15,182,205,131,195,4,65,252,255,36,252,238,248,5,255,252,247, - 195,237,15,133,244,4,15,182,75,252,253,72,252,247,209,141,12,202,68,139,121, - 252,248,69,139,191,233,69,139,191,233,252,233,244,4,248,7,129,252,235,239, - 252,247,195,237,15,133,244,254,41,218,65,137,215,139,90,252,252,252,233,244, - 1,248,8,129,195,239,252,233,244,1,255,141,76,202,8,72,139,105,232,72,139, - 65,252,240,72,137,41,72,137,65,8,139,105,224,139,65,228,137,105,252,248,137, - 65,252,252,129,252,248,239,184,237,15,133,244,29,137,202,137,90,252,252,139, + 252,255,36,252,238,248,2,129,124,253,194,4,239,15,133,244,56,139,60,194,255, + 139,175,233,131,252,253,0,15,133,244,255,248,3,255,248,57,137,213,232,251, + 1,21,255,252,242,15,42,192,255,137,252,234,15,182,75,252,253,252,233,244, + 1,255,248,9,252,246,133,233,235,15,133,244,3,252,233,244,56,255,15,182,252, + 236,15,182,192,255,129,124,253,252,234,4,239,15,133,244,50,65,129,124,253, + 199,4,239,15,133,244,50,139,44,252,234,65,3,44,199,15,128,244,49,255,129, + 124,253,252,234,4,239,15,133,244,52,65,129,124,253,199,4,239,15,133,244,52, + 65,139,4,199,3,4,252,234,15,128,244,51,255,129,124,253,252,234,4,239,15,133, + 244,55,129,124,253,194,4,239,15,133,244,55,139,44,252,234,3,44,194,15,128, + 244,54,255,199,68,202,4,237,255,129,124,253,252,234,4,239,15,131,244,50,255, + 65,129,124,253,199,4,239,15,131,244,50,255,252,242,15,16,4,252,234,252,242, + 65,15,88,4,199,255,221,4,252,234,65,220,4,199,255,129,124,253,252,234,4,239, + 15,131,244,52,255,65,129,124,253,199,4,239,15,131,244,52,255,252,242,65,15, + 16,4,199,252,242,15,88,4,252,234,255,65,221,4,199,220,4,252,234,255,129,124, + 253,252,234,4,239,15,131,244,55,129,124,253,194,4,239,15,131,244,55,255,252, + 242,15,16,4,252,234,252,242,15,88,4,194,255,221,4,252,234,220,4,194,255,129, + 124,253,252,234,4,239,15,133,244,50,65,129,124,253,199,4,239,15,133,244,50, + 139,44,252,234,65,43,44,199,15,128,244,49,255,129,124,253,252,234,4,239,15, + 133,244,52,65,129,124,253,199,4,239,15,133,244,52,65,139,4,199,43,4,252,234, + 15,128,244,51,255,129,124,253,252,234,4,239,15,133,244,55,129,124,253,194, + 4,239,15,133,244,55,139,44,252,234,43,44,194,15,128,244,54,255,252,242,15, + 16,4,252,234,252,242,65,15,92,4,199,255,221,4,252,234,65,220,36,199,255,252, + 242,65,15,16,4,199,252,242,15,92,4,252,234,255,65,221,4,199,220,36,252,234, + 255,252,242,15,16,4,252,234,252,242,15,92,4,194,255,221,4,252,234,220,36, + 194,255,129,124,253,252,234,4,239,15,133,244,50,65,129,124,253,199,4,239, + 15,133,244,50,139,44,252,234,65,15,175,44,199,15,128,244,49,255,129,124,253, + 252,234,4,239,15,133,244,52,65,129,124,253,199,4,239,15,133,244,52,65,139, + 4,199,15,175,4,252,234,15,128,244,51,255,129,124,253,252,234,4,239,15,133, + 244,55,129,124,253,194,4,239,15,133,244,55,139,44,252,234,15,175,44,194,15, + 128,244,54,255,252,242,15,16,4,252,234,252,242,65,15,89,4,199,255,221,4,252, + 234,65,220,12,199,255,252,242,65,15,16,4,199,252,242,15,89,4,252,234,255, + 65,221,4,199,220,12,252,234,255,252,242,15,16,4,252,234,252,242,15,89,4,194, + 255,221,4,252,234,220,12,194,255,252,242,15,16,4,252,234,252,242,65,15,94, + 4,199,255,221,4,252,234,65,220,52,199,255,252,242,65,15,16,4,199,252,242, + 15,94,4,252,234,255,65,221,4,199,220,52,252,234,255,252,242,15,16,4,252,234, + 252,242,15,94,4,194,255,221,4,252,234,220,52,194,255,252,242,15,16,4,252, + 234,252,242,65,15,16,12,199,255,221,4,252,234,65,221,4,199,255,252,242,65, + 15,16,4,199,252,242,15,16,12,252,234,255,65,221,4,199,221,4,252,234,255,252, + 242,15,16,4,252,234,252,242,15,16,12,194,255,221,4,252,234,221,4,194,255, + 248,166,232,244,156,255,252,233,244,166,255,232,244,116,255,15,182,252,236, + 15,182,192,139,124,36,24,137,151,233,141,52,194,137,194,41,252,234,248,35, + 137,252,253,137,92,36,28,232,251,1,27,139,149,233,133,192,15,133,244,44,15, + 182,107,252,255,15,182,75,252,253,72,139,4,252,234,72,137,4,202,139,3,15, + 182,204,15,182,232,131,195,4,193,232,16,65,252,255,36,252,238,255,72,252, + 247,208,65,139,4,135,199,68,202,4,237,137,4,202,139,3,15,182,204,15,182,232, + 131,195,4,193,232,16,65,252,255,36,252,238,255,15,191,192,199,68,202,4,237, + 137,4,202,255,15,191,192,252,242,15,42,192,252,242,15,17,4,202,255,223,67, + 252,254,221,28,202,255,252,242,65,15,16,4,199,252,242,15,17,4,202,255,65, + 221,4,199,221,28,202,255,72,252,247,208,137,68,202,4,139,3,15,182,204,15, + 182,232,131,195,4,193,232,16,65,252,255,36,252,238,255,141,76,202,12,141, + 68,194,4,189,237,137,105,252,248,248,1,137,41,131,193,8,57,193,15,134,244, + 1,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36,252,238, + 255,139,106,252,248,139,172,253,133,233,139,173,233,72,139,69,0,72,137,4, + 202,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36,252,238, + 255,139,106,252,248,139,172,253,141,233,128,189,233,0,139,173,233,139,12, + 194,139,68,194,4,137,77,0,137,69,4,15,132,244,247,252,246,133,233,235,15, + 133,244,248,248,1,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65,252, + 255,36,252,238,248,2,129,232,239,129,252,248,239,15,134,244,1,252,246,129, + 233,235,15,132,244,1,137,252,238,137,213,65,141,190,233,255,232,251,1,28, + 137,252,234,252,233,244,1,255,72,252,247,208,139,106,252,248,139,172,253, + 141,233,65,139,12,135,139,133,233,137,8,199,64,4,237,252,246,133,233,235, + 15,133,244,248,248,1,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65, + 252,255,36,252,238,248,2,252,246,129,233,235,15,132,244,1,128,189,233,0,15, + 132,244,1,137,213,137,198,65,141,190,233,232,251,1,28,137,252,234,252,233, + 244,1,255,139,106,252,248,255,252,242,65,15,16,4,199,255,139,172,253,141, + 233,139,141,233,255,252,242,15,17,1,255,221,25,255,72,252,247,208,139,106, + 252,248,139,172,253,141,233,139,141,233,137,65,4,139,3,15,182,204,15,182, + 232,131,195,4,193,232,16,65,252,255,36,252,238,255,141,156,253,131,233,139, + 108,36,24,131,189,233,0,15,132,244,247,137,149,233,141,52,202,137,252,239, + 232,251,1,29,139,149,233,248,1,139,3,15,182,204,15,182,232,131,195,4,193, + 232,16,65,252,255,36,252,238,255,72,252,247,208,139,108,36,24,137,149,233, + 139,82,252,248,65,139,52,135,137,252,239,137,92,36,28,232,251,1,30,139,149, + 233,15,182,75,252,253,137,4,202,199,68,202,4,237,139,3,15,182,204,15,182, + 232,131,195,4,193,232,16,65,252,255,36,252,238,255,139,108,36,24,137,149, + 233,65,139,142,233,65,59,142,233,137,92,36,28,15,131,244,251,248,1,137,194, + 37,252,255,7,0,0,193,252,234,11,61,252,255,7,0,0,15,132,244,249,248,2,137, + 252,239,137,198,232,251,1,31,139,149,233,15,182,75,252,253,137,4,202,199, + 68,202,4,237,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65,252,255, + 36,252,238,248,3,184,1,8,0,0,252,233,244,2,248,5,137,252,239,232,251,1,32, + 15,183,67,252,254,252,233,244,1,255,72,252,247,208,139,108,36,24,65,139,142, + 233,137,92,36,28,65,59,142,233,137,149,233,15,131,244,249,248,2,65,139,52, + 135,137,252,239,232,251,1,33,139,149,233,15,182,75,252,253,137,4,202,199, + 68,202,4,237,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65,252,255, + 36,252,238,248,3,137,252,239,232,251,1,32,15,183,67,252,254,72,252,247,208, + 252,233,244,2,255,72,252,247,208,139,106,252,248,139,173,233,65,139,4,135, + 252,233,244,167,255,72,252,247,208,139,106,252,248,139,173,233,65,139,4,135, + 252,233,244,168,255,15,182,252,236,15,182,192,129,124,253,252,234,4,239,15, + 133,244,38,139,44,252,234,255,129,124,253,194,4,239,15,133,244,251,139,4, + 194,255,129,124,253,194,4,239,15,131,244,251,255,252,242,15,16,4,194,252, + 242,15,45,192,252,242,15,42,200,102,15,46,193,255,15,133,244,38,255,59,133, + 233,15,131,244,38,193,224,3,3,133,233,129,120,253,4,239,15,132,244,248,72, + 139,40,72,137,44,202,248,1,139,3,15,182,204,15,182,232,131,195,4,193,232, + 16,65,252,255,36,252,238,248,2,131,189,233,0,15,132,244,249,139,141,233,252, + 246,129,233,235,15,132,244,38,15,182,75,252,253,248,3,199,68,202,4,237,252, + 233,244,1,248,5,255,129,124,253,194,4,239,15,133,244,38,139,4,194,252,233, + 244,167,255,15,182,252,236,15,182,192,72,252,247,208,65,139,4,135,129,124, + 253,252,234,4,239,15,133,244,36,139,44,252,234,248,167,139,141,233,35,136, + 233,105,201,239,3,141,233,248,1,129,185,233,239,15,133,244,250,57,129,233, + 15,133,244,250,129,121,253,4,239,15,132,244,251,15,182,67,252,253,72,139, + 41,72,137,44,194,248,2,255,139,3,15,182,204,15,182,232,131,195,4,193,232, + 16,65,252,255,36,252,238,248,3,15,182,67,252,253,199,68,194,4,237,252,233, + 244,2,248,4,139,137,233,133,201,15,133,244,1,248,5,139,141,233,133,201,15, + 132,244,3,252,246,129,233,235,15,133,244,3,252,233,244,36,255,15,182,252, + 236,15,182,192,129,124,253,252,234,4,239,15,133,244,37,139,44,252,234,59, + 133,233,15,131,244,37,193,224,3,3,133,233,129,120,253,4,239,15,132,244,248, + 72,139,40,72,137,44,202,248,1,139,3,15,182,204,15,182,232,131,195,4,193,232, + 16,65,252,255,36,252,238,248,2,131,189,233,0,15,132,244,249,139,141,233,252, + 246,129,233,235,15,132,244,37,255,15,182,75,252,253,248,3,199,68,202,4,237, + 252,233,244,1,255,15,182,252,236,15,182,192,129,124,253,252,234,4,239,15, + 133,244,41,139,44,252,234,255,15,133,244,41,255,59,133,233,15,131,244,41, + 193,224,3,3,133,233,129,120,253,4,239,15,132,244,249,248,1,252,246,133,233, + 235,15,133,244,253,248,2,72,139,44,202,72,137,40,139,3,15,182,204,15,182, + 232,131,195,4,193,232,16,65,252,255,36,252,238,248,3,131,189,233,0,15,132, + 244,1,139,141,233,252,246,129,233,235,255,15,132,244,41,15,182,75,252,253, + 252,233,244,1,248,5,129,124,253,194,4,239,15,133,244,41,139,4,194,252,233, + 244,168,248,7,128,165,233,235,65,139,142,233,65,137,174,233,137,141,233,15, + 182,75,252,253,252,233,244,2,255,15,182,252,236,15,182,192,72,252,247,208, + 65,139,4,135,129,124,253,252,234,4,239,15,133,244,39,139,44,252,234,248,168, + 139,141,233,35,136,233,105,201,239,198,133,233,0,3,141,233,248,1,129,185, + 233,239,15,133,244,251,57,129,233,15,133,244,251,129,121,253,4,239,15,132, + 244,250,248,2,255,252,246,133,233,235,15,133,244,253,248,3,15,182,67,252, + 253,72,139,44,194,72,137,41,139,3,15,182,204,15,182,232,131,195,4,193,232, + 16,65,252,255,36,252,238,248,4,131,189,233,0,15,132,244,2,137,12,36,139,141, + 233,252,246,129,233,235,15,132,244,39,139,12,36,252,233,244,2,248,5,139,137, + 233,133,201,15,133,244,1,255,139,141,233,133,201,15,132,244,252,252,246,129, + 233,235,15,132,244,39,248,6,137,4,36,199,68,36,4,237,137,108,36,8,139,124, + 36,24,137,151,233,72,141,20,36,137,252,238,137,252,253,137,92,36,28,232,251, + 1,34,139,149,233,139,108,36,8,137,193,252,233,244,2,248,7,128,165,233,235, + 65,139,134,233,65,137,174,233,137,133,233,252,233,244,3,255,15,182,252,236, + 15,182,192,129,124,253,252,234,4,239,15,133,244,40,139,44,252,234,59,133, + 233,15,131,244,40,193,224,3,3,133,233,129,120,253,4,239,15,132,244,249,248, + 1,252,246,133,233,235,15,133,244,253,248,2,72,139,12,202,72,137,8,139,3,15, + 182,204,15,182,232,131,195,4,193,232,16,65,252,255,36,252,238,248,3,131,189, + 233,0,15,132,244,1,255,139,141,233,252,246,129,233,235,15,132,244,40,15,182, + 75,252,253,252,233,244,1,248,7,128,165,233,235,65,139,142,233,65,137,174, + 233,137,141,233,15,182,75,252,253,252,233,244,2,255,68,137,60,36,69,139,60, + 199,248,1,141,12,202,139,105,252,248,252,246,133,233,235,15,133,244,253,248, + 2,139,68,36,4,131,232,1,15,132,244,250,68,1,252,248,59,133,233,15,135,244, + 251,68,41,252,248,65,193,231,3,68,3,189,233,248,3,72,139,41,131,193,8,73, + 137,47,65,131,199,8,131,232,1,15,133,244,3,248,4,68,139,60,36,139,3,15,182, + 204,15,182,232,131,195,4,193,232,16,65,252,255,36,252,238,248,5,139,124,36, + 24,137,151,233,137,252,238,137,194,137,252,253,137,92,36,28,232,251,1,35, + 139,149,233,15,182,75,252,253,252,233,244,1,248,7,255,128,165,233,235,65, + 139,134,233,65,137,174,233,137,133,233,252,233,244,2,255,3,68,36,4,255,129, + 124,253,202,4,239,139,44,202,15,133,244,58,141,84,202,8,137,90,252,252,139, 157,233,139,11,15,182,252,233,15,182,205,131,195,4,65,252,255,36,252,238, - 255,68,137,60,36,68,137,116,36,4,139,108,202,252,240,139,68,202,252,248,68, - 139,181,233,131,195,4,68,139,189,233,248,1,68,57,252,240,15,131,244,251,65, - 129,124,253,199,4,239,15,132,244,250,255,219,68,202,252,248,255,73,139,44, - 199,72,137,108,202,8,131,192,1,255,137,68,202,252,248,248,2,15,183,67,252, - 254,141,156,253,131,233,248,3,68,139,116,36,4,68,139,60,36,139,3,15,182,204, - 15,182,232,131,195,4,193,232,16,65,252,255,36,252,238,248,4,131,192,1,255, - 137,68,202,252,248,255,252,233,244,1,248,5,68,41,252,240,248,6,59,133,233, - 15,135,244,3,68,105,252,248,239,68,3,189,233,65,129,191,233,239,15,132,244, - 253,70,141,116,48,1,73,139,175,233,73,139,135,233,72,137,44,202,72,137,68, - 202,8,68,137,116,202,252,248,252,233,244,2,248,7,131,192,1,252,233,244,6, - 255,129,124,253,202,252,236,239,15,133,244,251,139,108,202,232,129,124,253, - 202,252,244,239,15,133,244,251,129,124,253,202,252,252,239,15,133,244,251, - 128,189,233,235,15,133,244,251,141,156,253,131,233,199,68,202,252,248,0,0, - 0,0,248,1,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36, - 252,238,248,5,198,67,252,252,235,141,156,253,131,233,198,3,235,252,233,244, - 1,255,15,182,252,236,15,182,192,68,137,60,36,68,141,188,253,194,233,141,12, - 202,68,43,122,252,252,133,252,237,15,132,244,251,141,108,252,233,252,248, - 65,57,215,15,131,244,248,248,1,73,139,71,252,248,65,131,199,8,72,137,1,131, - 193,8,57,252,233,15,131,244,249,65,57,215,15,130,244,1,248,2,199,65,4,237, - 131,193,8,57,252,233,15,130,244,2,248,3,68,139,60,36,139,3,15,182,204,15, - 182,232,131,195,4,193,232,16,65,252,255,36,252,238,248,5,199,68,36,4,1,0, - 0,0,137,208,68,41,252,248,15,134,244,3,137,197,193,252,237,3,131,197,1,137, - 108,36,4,139,108,36,24,1,200,59,133,233,15,135,244,253,248,6,255,73,139,71, - 252,248,65,131,199,8,72,137,1,131,193,8,65,57,215,15,130,244,6,252,233,244, - 3,248,7,137,149,233,137,141,233,137,92,36,28,65,41,215,139,116,36,4,131,252, - 238,1,137,252,239,232,251,1,0,139,149,233,139,141,233,65,1,215,252,233,244, - 6,255,193,225,3,255,248,1,139,90,252,252,137,68,36,4,252,247,195,237,15,133, - 244,253,255,248,13,65,137,215,131,232,1,15,132,244,249,248,2,73,139,44,15, - 73,137,111,252,248,65,131,199,8,131,232,1,15,133,244,2,248,3,139,68,36,4, - 15,182,107,252,255,248,5,57,197,15,135,244,252,255,72,139,44,10,72,137,106, - 252,248,255,248,5,56,67,252,255,15,135,244,252,255,15,182,75,252,253,72,252, - 247,209,141,20,202,68,139,122,252,248,69,139,191,233,69,139,191,233,139,3, - 15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36,252,238,248,6,255, - 65,199,71,252,252,237,65,131,199,8,255,199,68,194,252,244,237,255,131,192, - 1,252,233,244,5,248,7,141,171,233,252,247,197,237,15,133,244,14,41,252,234, - 255,1,252,233,255,137,221,209,252,237,129,229,239,102,65,131,172,253,46,233, - 1,15,132,244,147,255,141,12,202,255,129,121,253,4,239,15,133,244,255,255, - 129,121,253,12,239,15,133,244,59,129,121,253,20,239,15,133,244,59,139,41, - 131,121,16,0,15,140,244,251,255,129,121,253,12,239,15,133,244,164,129,121, - 253,20,239,15,133,244,164,255,139,105,16,133,252,237,15,136,244,251,3,41, - 15,128,244,247,137,41,255,59,105,8,199,65,28,237,137,105,24,255,15,142,244, - 253,248,1,248,6,141,156,253,131,233,255,141,156,253,131,233,15,183,67,252, - 254,15,142,245,248,1,248,6,255,15,143,244,253,248,6,141,156,253,131,233,248, - 1,255,248,7,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36, - 252,238,248,5,255,3,41,15,128,244,1,137,41,255,15,141,244,7,255,141,156,253, - 131,233,15,183,67,252,254,15,141,245,255,15,140,244,7,255,252,233,244,6,248, - 9,255,129,121,253,4,239,255,15,131,244,59,129,121,253,12,239,15,131,244,59, - 255,129,121,253,12,239,15,131,244,164,129,121,253,20,239,15,131,244,164,255, - 139,105,20,255,129,252,253,239,15,131,244,59,255,252,242,15,16,1,252,242, - 15,16,73,8,255,252,242,15,88,65,16,252,242,15,17,1,133,252,237,15,136,244, - 249,255,15,140,244,249,255,102,15,46,200,248,1,252,242,15,17,65,24,255,221, - 65,8,221,1,255,220,65,16,221,17,221,81,24,133,252,237,15,136,244,247,255, - 221,81,24,15,140,244,247,255,217,201,248,1,255,15,183,67,252,254,255,15,131, - 244,7,255,15,131,244,248,141,156,253,131,233,255,141,156,253,131,233,15,183, - 67,252,254,15,131,245,255,15,130,244,7,255,15,130,244,248,141,156,253,131, - 233,255,248,3,102,15,46,193,252,233,244,1,255,141,12,202,139,105,4,129,252, - 253,239,15,132,244,247,255,137,105,252,252,139,41,137,105,252,248,252,233, - 245,255,141,156,253,131,233,139,1,137,105,252,252,137,65,252,248,255,65,139, - 142,233,139,4,129,72,139,128,233,139,108,36,24,65,137,150,233,65,137,174, - 233,76,137,36,36,76,137,108,36,8,72,131,252,236,16,252,255,224,255,141,156, - 253,131,233,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36, - 252,238,255,137,221,209,252,237,129,229,239,102,65,131,172,253,46,233,1,15, - 132,244,149,255,68,139,187,233,139,108,36,24,141,12,202,59,141,233,15,135, - 244,24,15,182,139,233,57,200,15,134,244,249,248,2,255,15,183,67,252,254,252, - 233,245,255,248,3,199,68,194,252,252,237,131,192,1,57,200,15,134,244,3,252, - 233,244,2,255,141,44,197,237,141,4,194,68,139,122,252,248,137,104,252,252, - 68,137,120,252,248,139,108,36,24,141,12,200,59,141,233,15,135,244,23,137, - 209,137,194,15,182,171,233,133,252,237,15,132,244,248,248,1,131,193,8,57, - 209,15,131,244,249,68,139,121,252,248,68,137,56,68,139,121,252,252,68,137, - 120,4,131,192,8,199,65,252,252,237,131,252,237,1,15,133,244,1,248,2,255,68, - 139,187,233,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36, - 252,238,255,248,3,199,64,4,237,131,192,8,131,252,237,1,15,133,244,3,252,233, - 244,2,255,139,106,252,248,76,139,189,233,139,108,36,24,141,68,194,252,248, - 137,149,233,141,136,233,59,141,233,137,133,233,255,76,137,252,254,137,252, - 239,255,15,135,244,22,65,199,134,233,237,255,65,252,255,215,255,65,252,255, - 150,233,255,65,199,134,233,237,139,149,233,141,12,194,252,247,217,3,141,233, - 139,90,252,252,252,233,244,12,255,254,0 + 255,141,76,202,8,65,137,215,139,105,252,248,129,121,253,252,252,239,15,133, + 244,29,248,59,139,90,252,252,252,247,195,237,15,133,244,253,248,1,137,106, + 252,248,137,68,36,4,131,232,1,15,132,244,249,248,2,72,139,41,131,193,8,73, + 137,47,65,131,199,8,131,232,1,15,133,244,2,139,106,252,248,248,3,139,68,36, + 4,128,189,233,1,15,135,244,251,248,4,139,157,233,139,11,15,182,252,233,15, + 182,205,131,195,4,65,252,255,36,252,238,248,5,255,252,247,195,237,15,133, + 244,4,15,182,75,252,253,72,252,247,209,141,12,202,68,139,121,252,248,69,139, + 191,233,69,139,191,233,252,233,244,4,248,7,129,252,235,239,252,247,195,237, + 15,133,244,254,41,218,65,137,215,139,90,252,252,252,233,244,1,248,8,129,195, + 239,252,233,244,1,255,141,76,202,8,72,139,105,232,72,139,65,252,240,72,137, + 41,72,137,65,8,139,105,224,139,65,228,137,105,252,248,137,65,252,252,129, + 252,248,239,184,237,15,133,244,29,137,202,137,90,252,252,139,157,233,139, + 11,15,182,252,233,15,182,205,131,195,4,65,252,255,36,252,238,255,68,137,60, + 36,68,137,116,36,4,139,108,202,252,240,139,68,202,252,248,68,139,181,233, + 131,195,4,68,139,189,233,248,1,68,57,252,240,15,131,244,251,65,129,124,253, + 199,4,239,15,132,244,250,255,219,68,202,252,248,255,73,139,44,199,72,137, + 108,202,8,131,192,1,255,137,68,202,252,248,248,2,15,183,67,252,254,141,156, + 253,131,233,248,3,68,139,116,36,4,68,139,60,36,139,3,15,182,204,15,182,232, + 131,195,4,193,232,16,65,252,255,36,252,238,248,4,131,192,1,255,137,68,202, + 252,248,255,252,233,244,1,248,5,68,41,252,240,248,6,59,133,233,15,135,244, + 3,68,105,252,248,239,68,3,189,233,65,129,191,233,239,15,132,244,253,70,141, + 116,48,1,73,139,175,233,73,139,135,233,72,137,44,202,72,137,68,202,8,68,137, + 116,202,252,248,252,233,244,2,248,7,131,192,1,252,233,244,6,255,129,124,253, + 202,252,236,239,15,133,244,251,139,108,202,232,129,124,253,202,252,244,239, + 15,133,244,251,129,124,253,202,252,252,239,15,133,244,251,128,189,233,235, + 15,133,244,251,141,156,253,131,233,199,68,202,252,248,0,0,0,0,248,1,139,3, + 15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36,252,238,248,5,198, + 67,252,252,235,141,156,253,131,233,198,3,235,252,233,244,1,255,15,182,252, + 236,15,182,192,68,137,60,36,68,141,188,253,194,233,141,12,202,68,43,122,252, + 252,133,252,237,15,132,244,251,141,108,252,233,252,248,65,57,215,15,131,244, + 248,248,1,73,139,71,252,248,65,131,199,8,72,137,1,131,193,8,57,252,233,15, + 131,244,249,65,57,215,15,130,244,1,248,2,199,65,4,237,131,193,8,57,252,233, + 15,130,244,2,248,3,68,139,60,36,139,3,15,182,204,15,182,232,131,195,4,193, + 232,16,65,252,255,36,252,238,248,5,199,68,36,4,1,0,0,0,137,208,68,41,252, + 248,15,134,244,3,137,197,193,252,237,3,131,197,1,137,108,36,4,139,108,36, + 24,1,200,59,133,233,15,135,244,253,248,6,255,73,139,71,252,248,65,131,199, + 8,72,137,1,131,193,8,65,57,215,15,130,244,6,252,233,244,3,248,7,137,149,233, + 137,141,233,137,92,36,28,65,41,215,139,116,36,4,131,252,238,1,137,252,239, + 232,251,1,0,139,149,233,139,141,233,65,1,215,252,233,244,6,255,193,225,3, + 255,248,1,139,90,252,252,137,68,36,4,252,247,195,237,15,133,244,253,255,248, + 13,65,137,215,131,232,1,15,132,244,249,248,2,73,139,44,15,73,137,111,252, + 248,65,131,199,8,131,232,1,15,133,244,2,248,3,139,68,36,4,15,182,107,252, + 255,248,5,57,197,15,135,244,252,255,72,139,44,10,72,137,106,252,248,255,248, + 5,56,67,252,255,15,135,244,252,255,15,182,75,252,253,72,252,247,209,141,20, + 202,68,139,122,252,248,69,139,191,233,69,139,191,233,139,3,15,182,204,15, + 182,232,131,195,4,193,232,16,65,252,255,36,252,238,248,6,255,65,199,71,252, + 252,237,65,131,199,8,255,199,68,194,252,244,237,255,131,192,1,252,233,244, + 5,248,7,141,171,233,252,247,197,237,15,133,244,14,41,252,234,255,1,252,233, + 255,137,221,209,252,237,129,229,239,102,65,131,172,253,46,233,1,15,132,244, + 148,255,141,12,202,255,129,121,253,4,239,15,133,244,255,255,129,121,253,12, + 239,15,133,244,60,129,121,253,20,239,15,133,244,60,139,41,131,121,16,0,15, + 140,244,251,255,129,121,253,12,239,15,133,244,165,129,121,253,20,239,15,133, + 244,165,255,139,105,16,133,252,237,15,136,244,251,3,41,15,128,244,247,137, + 41,255,59,105,8,199,65,28,237,137,105,24,255,15,142,244,253,248,1,248,6,141, + 156,253,131,233,255,141,156,253,131,233,15,183,67,252,254,15,142,245,248, + 1,248,6,255,15,143,244,253,248,6,141,156,253,131,233,248,1,255,248,7,139, + 3,15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36,252,238,248,5, + 255,3,41,15,128,244,1,137,41,255,15,141,244,7,255,141,156,253,131,233,15, + 183,67,252,254,15,141,245,255,15,140,244,7,255,252,233,244,6,248,9,255,129, + 121,253,4,239,255,15,131,244,60,129,121,253,12,239,15,131,244,60,255,129, + 121,253,12,239,15,131,244,165,129,121,253,20,239,15,131,244,165,255,139,105, + 20,255,129,252,253,239,15,131,244,60,255,252,242,15,16,1,252,242,15,16,73, + 8,255,252,242,15,88,65,16,252,242,15,17,1,133,252,237,15,136,244,249,255, + 15,140,244,249,255,102,15,46,200,248,1,252,242,15,17,65,24,255,221,65,8,221, + 1,255,220,65,16,221,17,221,81,24,133,252,237,15,136,244,247,255,221,81,24, + 15,140,244,247,255,217,201,248,1,255,15,183,67,252,254,255,15,131,244,7,255, + 15,131,244,248,141,156,253,131,233,255,141,156,253,131,233,15,183,67,252, + 254,15,131,245,255,15,130,244,7,255,15,130,244,248,141,156,253,131,233,255, + 248,3,102,15,46,193,252,233,244,1,255,141,12,202,139,105,4,129,252,253,239, + 15,132,244,247,255,137,105,252,252,139,41,137,105,252,248,252,233,245,255, + 141,156,253,131,233,139,1,137,105,252,252,137,65,252,248,255,65,139,142,233, + 139,4,129,72,139,128,233,139,108,36,24,65,137,150,233,65,137,174,233,76,137, + 36,36,76,137,108,36,8,72,131,252,236,16,252,255,224,255,141,156,253,131,233, + 139,3,15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36,252,238,255, + 137,221,209,252,237,129,229,239,102,65,131,172,253,46,233,1,15,132,244,150, + 255,68,139,187,233,139,108,36,24,141,12,202,59,141,233,15,135,244,24,15,182, + 139,233,57,200,15,134,244,249,248,2,255,15,183,67,252,254,252,233,245,255, + 248,3,199,68,194,252,252,237,131,192,1,57,200,15,134,244,3,252,233,244,2, + 255,141,44,197,237,141,4,194,68,139,122,252,248,137,104,252,252,68,137,120, + 252,248,139,108,36,24,141,12,200,59,141,233,15,135,244,23,137,209,137,194, + 15,182,171,233,133,252,237,15,132,244,248,248,1,131,193,8,57,209,15,131,244, + 249,68,139,121,252,248,68,137,56,68,139,121,252,252,68,137,120,4,131,192, + 8,199,65,252,252,237,131,252,237,1,15,133,244,1,248,2,255,68,139,187,233, + 139,3,15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36,252,238,255, + 248,3,199,64,4,237,131,192,8,131,252,237,1,15,133,244,3,252,233,244,2,255, + 139,106,252,248,76,139,189,233,139,108,36,24,141,68,194,252,248,137,149,233, + 141,136,233,59,141,233,137,133,233,255,76,137,252,254,137,252,239,255,15, + 135,244,22,65,199,134,233,237,255,65,252,255,215,255,65,252,255,150,233,255, + 65,199,134,233,237,139,149,233,141,12,194,252,247,217,3,141,233,139,90,252, + 252,252,233,244,12,255,254,0 }; enum { @@ -840,6 +843,7 @@ enum { GLOB_vmeta_arith_vvo, GLOB_vmeta_arith_vv, GLOB_vmeta_len, + GLOB_BC_LEN_Z, GLOB_vmeta_call_ra, GLOB_BC_CALLT_Z, GLOB_vmeta_for, @@ -1001,6 +1005,7 @@ static const char *const globnames[] = { "vmeta_arith_vvo", "vmeta_arith_vv", "vmeta_len", + "BC_LEN_Z", "vmeta_call_ra", "BC_CALLT_Z", "vmeta_for", @@ -1216,637 +1221,642 @@ static void build_subroutines(BuildCtx *ctx, int cmov, int sse) #if LJ_DUALNUM dasm_put(Dst, 1474); #endif - dasm_put(Dst, 1522, Dt1(->base), Dt1(->base), FRAME_CONT, 2+1, Dt1(->base), Dt1(->base), Dt1(->base)); - dasm_put(Dst, 1654, Dt1(->base), Dt7(->pc), Dt1(->base), Dt1(->base), GG_DISP2STATIC, 1+1, LJ_TISTRUECOND); - dasm_put(Dst, 1838, 1+1, ~LJ_TNUMX); + dasm_put(Dst, 1522, Dt1(->base), Dt1(->base), FRAME_CONT, 2+1, Dt1(->base), Dt1(->base)); +#ifdef LUAJIT_ENABLE_LUA52COMPAT + dasm_put(Dst, 1624); +#else + dasm_put(Dst, 1643); +#endif + dasm_put(Dst, 1648, Dt1(->base), Dt1(->base), Dt7(->pc), Dt1(->base), Dt1(->base), GG_DISP2STATIC, 1+1, LJ_TISTRUECOND); + dasm_put(Dst, 1834, 1+1, ~LJ_TNUMX); if (cmov) { - dasm_put(Dst, 1883); + dasm_put(Dst, 1903); } else { - dasm_put(Dst, 1887); + dasm_put(Dst, 1907); } - dasm_put(Dst, 1896, ((char *)(&((GCfuncC *)0)->upvalue)), LJ_TSTR, ~LJ_TLIGHTUD, 1+1, LJ_TTAB, Dt6(->metatable), LJ_TNIL); - dasm_put(Dst, 1975, DISPATCH_GL(gcroot)+4*(GCROOT_MMNAME+MM_metatable), LJ_TTAB, Dt6(->hmask), Dt5(->hash), sizeof(Node), Dt6(->node), DtB(->key.it), LJ_TSTR, DtB(->key.gcr), DtB(->next)); - dasm_put(Dst, 2033, LJ_TNIL, LJ_TUDATA, LJ_TNUMX, LJ_TISNUM, LJ_TLIGHTUD); - dasm_put(Dst, 2099, LJ_TNUMX, DISPATCH_GL(gcroot[GCROOT_BASEMT]), 2+1, LJ_TTAB, Dt6(->metatable), LJ_TTAB, Dt6(->metatable), LJ_TTAB); - dasm_put(Dst, 2170, Dt6(->marked), LJ_GC_BLACK, Dt6(->marked), (uint8_t)~LJ_GC_BLACK, DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist), 2+1, LJ_TTAB); - dasm_put(Dst, 2260, 1+1, LJ_TISNUM); + dasm_put(Dst, 1916, ((char *)(&((GCfuncC *)0)->upvalue)), LJ_TSTR, ~LJ_TLIGHTUD, 1+1, LJ_TTAB, Dt6(->metatable), LJ_TNIL); + dasm_put(Dst, 1995, DISPATCH_GL(gcroot)+4*(GCROOT_MMNAME+MM_metatable), LJ_TTAB, Dt6(->hmask), Dt5(->hash), sizeof(Node), Dt6(->node), DtB(->key.it), LJ_TSTR, DtB(->key.gcr), DtB(->next)); + dasm_put(Dst, 2053, LJ_TNIL, LJ_TUDATA, LJ_TNUMX, LJ_TISNUM, LJ_TLIGHTUD); + dasm_put(Dst, 2119, LJ_TNUMX, DISPATCH_GL(gcroot[GCROOT_BASEMT]), 2+1, LJ_TTAB, Dt6(->metatable), LJ_TTAB, Dt6(->metatable), LJ_TTAB); + dasm_put(Dst, 2190, Dt6(->marked), LJ_GC_BLACK, Dt6(->marked), (uint8_t)~LJ_GC_BLACK, DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist), 2+1, LJ_TTAB); + dasm_put(Dst, 2280, 1+1, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 2274); + dasm_put(Dst, 2294); } else { - dasm_put(Dst, 2291); + dasm_put(Dst, 2311); } if (sse) { - dasm_put(Dst, 2296); + dasm_put(Dst, 2316); } else { - dasm_put(Dst, 2306); + dasm_put(Dst, 2326); } - dasm_put(Dst, 2313, 1+1, LJ_TSTR, LJ_TSTR, LJ_TISNUM, DISPATCH_GL(gcroot[GCROOT_BASEMT_NUM]), DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold)); - dasm_put(Dst, 2382, Dt1(->base)); + dasm_put(Dst, 2333, 1+1, LJ_TSTR, LJ_TSTR, LJ_TISNUM, DISPATCH_GL(gcroot[GCROOT_BASEMT_NUM]), DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold)); + dasm_put(Dst, 2402, Dt1(->base)); if (LJ_DUALNUM) { - dasm_put(Dst, 2408); + dasm_put(Dst, 2428); } else { - dasm_put(Dst, 2413); + dasm_put(Dst, 2433); } - dasm_put(Dst, 2418, Dt1(->base), 1+1, LJ_TTAB, Dt1(->base), Dt1(->top), Dt1(->base), 1+2); - dasm_put(Dst, 2510, LJ_TNIL, LJ_TNIL, 1+1, LJ_TTAB); + dasm_put(Dst, 2438, Dt1(->base), 1+1, LJ_TTAB, Dt1(->base), Dt1(->top), Dt1(->base), 1+2); + dasm_put(Dst, 2530, LJ_TNIL, LJ_TNIL, 1+1, LJ_TTAB); #ifdef LUAJIT_ENABLE_LUA52COMPAT - dasm_put(Dst, 2557, Dt6(->metatable)); + dasm_put(Dst, 2577, Dt6(->metatable)); #endif - dasm_put(Dst, 2566, Dt8(->upvalue[0]), LJ_TFUNC, LJ_TNIL, 1+3, 1+1, LJ_TTAB, LJ_TISNUM); + dasm_put(Dst, 2586, Dt8(->upvalue[0]), LJ_TFUNC, LJ_TNIL, 1+3, 1+1, LJ_TTAB, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 2552); + dasm_put(Dst, 2572); } else { - dasm_put(Dst, 2291); + dasm_put(Dst, 2311); } - dasm_put(Dst, 2621); + dasm_put(Dst, 2641); if (LJ_DUALNUM) { - dasm_put(Dst, 2626, LJ_TISNUM); + dasm_put(Dst, 2646, LJ_TISNUM); } else if (sse) { - dasm_put(Dst, 2642, (unsigned int)(U64x(3ff00000,00000000)), (unsigned int)((U64x(3ff00000,00000000))>>32)); + dasm_put(Dst, 2662, (unsigned int)(U64x(3ff00000,00000000)), (unsigned int)((U64x(3ff00000,00000000))>>32)); } else { } - dasm_put(Dst, 2675, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->hmask), 1+0); - dasm_put(Dst, 2537, 1+1, LJ_TTAB); + dasm_put(Dst, 2695, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->hmask), 1+0); + dasm_put(Dst, 2557, 1+1, LJ_TTAB); #ifdef LUAJIT_ENABLE_LUA52COMPAT - dasm_put(Dst, 2557, Dt6(->metatable)); + dasm_put(Dst, 2577, Dt6(->metatable)); #endif - dasm_put(Dst, 2752, Dt8(->upvalue[0]), LJ_TFUNC); + dasm_put(Dst, 2772, Dt8(->upvalue[0]), LJ_TFUNC); if (LJ_DUALNUM) { - dasm_put(Dst, 2773, LJ_TISNUM); + dasm_put(Dst, 2793, LJ_TISNUM); } else if (sse) { - dasm_put(Dst, 2785); + dasm_put(Dst, 2805); } else { - dasm_put(Dst, 2795); + dasm_put(Dst, 2815); } - dasm_put(Dst, 2802, 1+3, 1+1, 8+FRAME_PCALL, DISPATCH_GL(hookmask), HOOK_ACTIVE_SHIFT, 2+1, LJ_TFUNC); - dasm_put(Dst, 2867, LJ_TFUNC, 16+FRAME_PCALL, 1+1, LJ_TTHREAD, Dt1(->cframe), Dt1(->status), LUA_YIELD, Dt1(->top)); - dasm_put(Dst, 2956, Dt1(->base), Dt1(->maxstack), Dt1(->top), Dt1(->base), Dt1(->top), DISPATCH_GL(vmstate), ~LJ_VMST_INTERP); - dasm_put(Dst, 3043, Dt1(->base), LUA_YIELD, Dt1(->base), Dt1(->top), Dt1(->top), Dt1(->maxstack), LJ_TTRUE, FRAME_TYPE); - dasm_put(Dst, 3158, LJ_TFALSE, Dt1(->top), Dt1(->top), 1+2, Dt1(->top), Dt1(->base), Dt8(->upvalue[0].gcr), Dt1(->cframe)); - dasm_put(Dst, 3253, Dt1(->status), LUA_YIELD, Dt1(->top), Dt1(->base), Dt1(->maxstack), Dt1(->top), Dt1(->base), Dt1(->top)); - dasm_put(Dst, 3319, DISPATCH_GL(vmstate), ~LJ_VMST_INTERP, Dt1(->base), LUA_YIELD, Dt1(->base), Dt1(->top), Dt1(->top), Dt1(->maxstack)); - dasm_put(Dst, 3408, FRAME_TYPE, Dt1(->top), Dt1(->base), Dt1(->cframe), CFRAME_RESUME); - dasm_put(Dst, 3518, Dt1(->base), Dt1(->top), Dt1(->cframe), LUA_YIELD, Dt1(->status)); + dasm_put(Dst, 2822, 1+3, 1+1, 8+FRAME_PCALL, DISPATCH_GL(hookmask), HOOK_ACTIVE_SHIFT, 2+1, LJ_TFUNC); + dasm_put(Dst, 2887, LJ_TFUNC, 16+FRAME_PCALL, 1+1, LJ_TTHREAD, Dt1(->cframe), Dt1(->status), LUA_YIELD, Dt1(->top)); + dasm_put(Dst, 2976, Dt1(->base), Dt1(->maxstack), Dt1(->top), Dt1(->base), Dt1(->top), DISPATCH_GL(vmstate), ~LJ_VMST_INTERP); + dasm_put(Dst, 3063, Dt1(->base), LUA_YIELD, Dt1(->base), Dt1(->top), Dt1(->top), Dt1(->maxstack), LJ_TTRUE, FRAME_TYPE); + dasm_put(Dst, 3178, LJ_TFALSE, Dt1(->top), Dt1(->top), 1+2, Dt1(->top), Dt1(->base), Dt8(->upvalue[0].gcr), Dt1(->cframe)); + dasm_put(Dst, 3273, Dt1(->status), LUA_YIELD, Dt1(->top), Dt1(->base), Dt1(->maxstack), Dt1(->top), Dt1(->base), Dt1(->top)); + dasm_put(Dst, 3339, DISPATCH_GL(vmstate), ~LJ_VMST_INTERP, Dt1(->base), LUA_YIELD, Dt1(->base), Dt1(->top), Dt1(->top), Dt1(->maxstack)); + dasm_put(Dst, 3428, FRAME_TYPE, Dt1(->top), Dt1(->base), Dt1(->cframe), CFRAME_RESUME); + dasm_put(Dst, 3538, Dt1(->base), Dt1(->top), Dt1(->cframe), LUA_YIELD, Dt1(->status)); if (!LJ_DUALNUM) { - dasm_put(Dst, 3545); + dasm_put(Dst, 3565); } if (sse) { - dasm_put(Dst, 3548); + dasm_put(Dst, 3568); } - dasm_put(Dst, 3563, 1+1); + dasm_put(Dst, 3583, 1+1); if (LJ_DUALNUM) { - dasm_put(Dst, 3574, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 3594, LJ_TISNUM, LJ_TISNUM); } else { - dasm_put(Dst, 3654, LJ_TISNUM); + dasm_put(Dst, 3674, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 3664, (unsigned int)(U64x(7fffffff,ffffffff)), (unsigned int)((U64x(7fffffff,ffffffff))>>32)); + dasm_put(Dst, 3684, (unsigned int)(U64x(7fffffff,ffffffff)), (unsigned int)((U64x(7fffffff,ffffffff))>>32)); } else { - dasm_put(Dst, 3695); + dasm_put(Dst, 3715); } - dasm_put(Dst, 3712, 1+1, FRAME_TYPE, LJ_TNIL); + dasm_put(Dst, 3732, 1+1, FRAME_TYPE, LJ_TNIL); if (LJ_DUALNUM) { - dasm_put(Dst, 3809, LJ_TISNUM); + dasm_put(Dst, 3829, LJ_TISNUM); } else { - dasm_put(Dst, 3654, LJ_TISNUM); + dasm_put(Dst, 3674, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 3831); + dasm_put(Dst, 3851); if (LJ_DUALNUM) { - dasm_put(Dst, 3840); + dasm_put(Dst, 3860); } - dasm_put(Dst, 2301); + dasm_put(Dst, 2321); } else { - dasm_put(Dst, 3874); + dasm_put(Dst, 3894); if (LJ_DUALNUM) { } else { - dasm_put(Dst, 2308); + dasm_put(Dst, 2328); } } - dasm_put(Dst, 3880); + dasm_put(Dst, 3900); if (LJ_DUALNUM) { - dasm_put(Dst, 3809, LJ_TISNUM); + dasm_put(Dst, 3829, LJ_TISNUM); } else { - dasm_put(Dst, 3654, LJ_TISNUM); + dasm_put(Dst, 3674, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 3883); + dasm_put(Dst, 3903); if (LJ_DUALNUM) { - dasm_put(Dst, 3840); + dasm_put(Dst, 3860); } - dasm_put(Dst, 2301); + dasm_put(Dst, 2321); } else { - dasm_put(Dst, 3892); + dasm_put(Dst, 3912); if (LJ_DUALNUM) { } else { - dasm_put(Dst, 2308); + dasm_put(Dst, 2328); } } if (sse) { - dasm_put(Dst, 3898, 1+1, LJ_TISNUM); + dasm_put(Dst, 3918, 1+1, LJ_TISNUM); } else { - dasm_put(Dst, 3927, 1+1, LJ_TISNUM); + dasm_put(Dst, 3947, 1+1, LJ_TISNUM); } - dasm_put(Dst, 3956, 1+1, LJ_TISNUM, 1+1, LJ_TISNUM, 1+1); - dasm_put(Dst, 4025, LJ_TISNUM, 1+1, LJ_TISNUM, 1+1); - dasm_put(Dst, 4082, LJ_TISNUM, 1+1, LJ_TISNUM, 1+1); - dasm_put(Dst, 4145, LJ_TISNUM, 1+1, LJ_TISNUM, 1+1, LJ_TISNUM); - dasm_put(Dst, 4235); + dasm_put(Dst, 3976, 1+1, LJ_TISNUM, 1+1, LJ_TISNUM, 1+1); + dasm_put(Dst, 4045, LJ_TISNUM, 1+1, LJ_TISNUM, 1+1); + dasm_put(Dst, 4102, LJ_TISNUM, 1+1, LJ_TISNUM, 1+1); + dasm_put(Dst, 4165, LJ_TISNUM, 1+1, LJ_TISNUM, 1+1, LJ_TISNUM); + dasm_put(Dst, 4255); if (sse) { - dasm_put(Dst, 4247, 1+1, LJ_TISNUM); + dasm_put(Dst, 4267, 1+1, LJ_TISNUM); } else { } - dasm_put(Dst, 4272); + dasm_put(Dst, 4292); if (sse) { - dasm_put(Dst, 4286, 1+1, LJ_TISNUM); + dasm_put(Dst, 4306, 1+1, LJ_TISNUM); } else { } - dasm_put(Dst, 4311); + dasm_put(Dst, 4331); if (sse) { - dasm_put(Dst, 4325, 1+1, LJ_TISNUM); + dasm_put(Dst, 4345, 1+1, LJ_TISNUM); } else { } - dasm_put(Dst, 4350); + dasm_put(Dst, 4370); if (sse) { - dasm_put(Dst, 4366, 1+1, LJ_TISNUM, Dt8(->upvalue[0])); + dasm_put(Dst, 4386, 1+1, LJ_TISNUM, Dt8(->upvalue[0])); } else { - dasm_put(Dst, 4405, 1+1, LJ_TISNUM, Dt8(->upvalue[0])); + dasm_put(Dst, 4425, 1+1, LJ_TISNUM, Dt8(->upvalue[0])); } - dasm_put(Dst, 4438, 2+1, LJ_TISNUM, LJ_TISNUM, 2+1, LJ_TISNUM, LJ_TISNUM); - dasm_put(Dst, 4503, 1+1, LJ_TISNUM); + dasm_put(Dst, 4458, 2+1, LJ_TISNUM, LJ_TISNUM, 2+1, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 4523, 1+1, LJ_TISNUM); if (sse) { - dasm_put(Dst, 4602); + dasm_put(Dst, 4622); } else { - dasm_put(Dst, 4608); + dasm_put(Dst, 4628); } - dasm_put(Dst, 4615); + dasm_put(Dst, 4635); if (sse) { - dasm_put(Dst, 4640); - } else { - dasm_put(Dst, 4646); - } - dasm_put(Dst, 4649, 1+2); - if (sse) { - dasm_put(Dst, 4658); + dasm_put(Dst, 4660); } else { dasm_put(Dst, 4666); } - dasm_put(Dst, 4674); + dasm_put(Dst, 4669, 1+2); if (sse) { - dasm_put(Dst, 4677, (unsigned int)(U64x(43500000,00000000)), (unsigned int)((U64x(43500000,00000000))>>32)); + dasm_put(Dst, 4678); } else { - dasm_put(Dst, 4704); + dasm_put(Dst, 4686); } - dasm_put(Dst, 4721); + dasm_put(Dst, 4694); if (sse) { - dasm_put(Dst, 4737, 1+1, LJ_TISNUM); + dasm_put(Dst, 4697, (unsigned int)(U64x(43500000,00000000)), (unsigned int)((U64x(43500000,00000000))>>32)); } else { - dasm_put(Dst, 4762, 1+1, LJ_TISNUM); + dasm_put(Dst, 4724); } - dasm_put(Dst, 4784); + dasm_put(Dst, 4741); if (sse) { - dasm_put(Dst, 4806); + dasm_put(Dst, 4757, 1+1, LJ_TISNUM); } else { - dasm_put(Dst, 4832); + dasm_put(Dst, 4782, 1+1, LJ_TISNUM); } - dasm_put(Dst, 4849, 1+2); + dasm_put(Dst, 4804); if (sse) { - dasm_put(Dst, 4889); + dasm_put(Dst, 4826); } else { - dasm_put(Dst, 4897); + dasm_put(Dst, 4852); } - dasm_put(Dst, 4907, 2+1, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 4869, 1+2); if (sse) { - dasm_put(Dst, 4959, 2+1, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 4909); } else { - dasm_put(Dst, 5006, 2+1, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 4917); } - dasm_put(Dst, 5047, LJ_TISNUM); + dasm_put(Dst, 4927, 2+1, LJ_TISNUM, LJ_TISNUM); + if (sse) { + dasm_put(Dst, 4979, 2+1, LJ_TISNUM, LJ_TISNUM); + } else { + dasm_put(Dst, 5026, 2+1, LJ_TISNUM, LJ_TISNUM); + } + dasm_put(Dst, 5067, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 5060, LJ_TISNUM); + dasm_put(Dst, 5080, LJ_TISNUM); if (sse) { - dasm_put(Dst, 4602); + dasm_put(Dst, 4622); } else { } - dasm_put(Dst, 5110); + dasm_put(Dst, 5130); } else { - dasm_put(Dst, 2291); + dasm_put(Dst, 2311); } if (sse) { - dasm_put(Dst, 5121, LJ_TISNUM); + dasm_put(Dst, 5141, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 5142); + dasm_put(Dst, 5162); } else { - dasm_put(Dst, 2291); + dasm_put(Dst, 2311); } - dasm_put(Dst, 5163); + dasm_put(Dst, 5183); } else { } - dasm_put(Dst, 5188, LJ_TISNUM); + dasm_put(Dst, 5208, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 5201, LJ_TISNUM); + dasm_put(Dst, 5221, LJ_TISNUM); if (sse) { - dasm_put(Dst, 4602); + dasm_put(Dst, 4622); } else { } - dasm_put(Dst, 5110); + dasm_put(Dst, 5130); } else { - dasm_put(Dst, 2291); + dasm_put(Dst, 2311); } if (sse) { - dasm_put(Dst, 5121, LJ_TISNUM); + dasm_put(Dst, 5141, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 5142); + dasm_put(Dst, 5162); } else { - dasm_put(Dst, 2291); + dasm_put(Dst, 2311); } - dasm_put(Dst, 5251); + dasm_put(Dst, 5271); } else { } if (!sse) { - dasm_put(Dst, 5276); + dasm_put(Dst, 5296); } - dasm_put(Dst, 5285, 1+1, LJ_TSTR); + dasm_put(Dst, 5305, 1+1, LJ_TSTR); if (LJ_DUALNUM) { - dasm_put(Dst, 5307, Dt5(->len)); + dasm_put(Dst, 5327, Dt5(->len)); } else if (sse) { - dasm_put(Dst, 5315, Dt5(->len)); + dasm_put(Dst, 5335, Dt5(->len)); } else { - dasm_put(Dst, 5326, Dt5(->len)); + dasm_put(Dst, 5346, Dt5(->len)); } - dasm_put(Dst, 5334, 1+1, LJ_TSTR, Dt5(->len), Dt5([1])); + dasm_put(Dst, 5354, 1+1, LJ_TSTR, Dt5(->len), Dt5([1])); if (LJ_DUALNUM) { - dasm_put(Dst, 5310); + dasm_put(Dst, 5330); } else if (sse) { - dasm_put(Dst, 5372); + dasm_put(Dst, 5392); } else { - dasm_put(Dst, 5382); + dasm_put(Dst, 5402); } - dasm_put(Dst, 5393, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), 1+1, LJ_TISNUM); + dasm_put(Dst, 5413, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), 1+1, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 5426); + dasm_put(Dst, 5446); } else if (sse) { - dasm_put(Dst, 5449); + dasm_put(Dst, 5469); } else { - dasm_put(Dst, 5475); + dasm_put(Dst, 5495); } - dasm_put(Dst, 5499, Dt1(->base), Dt1(->base), LJ_TSTR, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), 1+2, LJ_TISNUM); + dasm_put(Dst, 5519, Dt1(->base), Dt1(->base), LJ_TSTR, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), 1+2, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 5608); + dasm_put(Dst, 5628); } else if (sse) { - dasm_put(Dst, 5620); + dasm_put(Dst, 5640); } else { - dasm_put(Dst, 5635); + dasm_put(Dst, 5655); } - dasm_put(Dst, 5647, LJ_TSTR, LJ_TISNUM); + dasm_put(Dst, 5667, LJ_TSTR, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 2552); + dasm_put(Dst, 2572); } else { - dasm_put(Dst, 2291); + dasm_put(Dst, 2311); } - dasm_put(Dst, 5664, Dt5(->len)); + dasm_put(Dst, 5684, Dt5(->len)); if (LJ_DUALNUM) { - dasm_put(Dst, 5674); + dasm_put(Dst, 5694); } else if (sse) { - dasm_put(Dst, 5678); + dasm_put(Dst, 5698); } else { } - dasm_put(Dst, 5685, sizeof(GCstr)-1); - dasm_put(Dst, 5760, 2+1, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold)); - dasm_put(Dst, 5821, LJ_TSTR, LJ_TISNUM); + dasm_put(Dst, 5705, sizeof(GCstr)-1); + dasm_put(Dst, 5780, 2+1, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold)); + dasm_put(Dst, 5841, LJ_TSTR, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 5838); + dasm_put(Dst, 5858); } else if (sse) { - dasm_put(Dst, 5846); + dasm_put(Dst, 5866); } else { - dasm_put(Dst, 5857); + dasm_put(Dst, 5877); } - dasm_put(Dst, 5873, Dt5(->len), DISPATCH_GL(tmpbuf.sz), Dt5([1]), DISPATCH_GL(tmpbuf.buf), DISPATCH_GL(tmpbuf.buf), 1+1); - dasm_put(Dst, 5941, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), LJ_TSTR, Dt5(->len), DISPATCH_GL(tmpbuf.sz), sizeof(GCstr), DISPATCH_GL(tmpbuf.buf)); - dasm_put(Dst, 6008, 1+1, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), LJ_TSTR, Dt5(->len), DISPATCH_GL(tmpbuf.sz)); - dasm_put(Dst, 6081, sizeof(GCstr), DISPATCH_GL(tmpbuf.buf), 1+1); - dasm_put(Dst, 6166, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), LJ_TSTR, Dt5(->len), DISPATCH_GL(tmpbuf.sz), sizeof(GCstr), DISPATCH_GL(tmpbuf.buf)); - dasm_put(Dst, 6240, 1+1, LJ_TTAB); + dasm_put(Dst, 5893, Dt5(->len), DISPATCH_GL(tmpbuf.sz), Dt5([1]), DISPATCH_GL(tmpbuf.buf), DISPATCH_GL(tmpbuf.buf), 1+1); + dasm_put(Dst, 5961, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), LJ_TSTR, Dt5(->len), DISPATCH_GL(tmpbuf.sz), sizeof(GCstr), DISPATCH_GL(tmpbuf.buf)); + dasm_put(Dst, 6028, 1+1, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), LJ_TSTR, Dt5(->len), DISPATCH_GL(tmpbuf.sz)); + dasm_put(Dst, 6101, sizeof(GCstr), DISPATCH_GL(tmpbuf.buf), 1+1); + dasm_put(Dst, 6186, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), LJ_TSTR, Dt5(->len), DISPATCH_GL(tmpbuf.sz), sizeof(GCstr), DISPATCH_GL(tmpbuf.buf)); + dasm_put(Dst, 6260, 1+1, LJ_TTAB); if (LJ_DUALNUM) { - dasm_put(Dst, 6307); + dasm_put(Dst, 6327); } else if (sse) { - dasm_put(Dst, 6314); + dasm_put(Dst, 6334); } else { } - dasm_put(Dst, 6324, 1+1, LJ_TISNUM); + dasm_put(Dst, 6344, 1+1, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 6340); + dasm_put(Dst, 6360); } else { - dasm_put(Dst, 2291); + dasm_put(Dst, 2311); } if (sse) { - dasm_put(Dst, 6357, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); + dasm_put(Dst, 6377, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); } else { } dasm_put(Dst, 106); if (LJ_DUALNUM || sse) { if (!sse) { } - dasm_put(Dst, 6381); + dasm_put(Dst, 6401); } else { } - dasm_put(Dst, 6386, 1+1); + dasm_put(Dst, 6406, 1+1); if (sse) { - dasm_put(Dst, 6397, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); + dasm_put(Dst, 6417, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); } else { - dasm_put(Dst, 6407); + dasm_put(Dst, 6427); } - dasm_put(Dst, 2268, LJ_TISNUM); + dasm_put(Dst, 2288, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 6415); + dasm_put(Dst, 6435); } else { - dasm_put(Dst, 2291); + dasm_put(Dst, 2311); } if (sse) { - dasm_put(Dst, 6432); + dasm_put(Dst, 6452); } else { } - dasm_put(Dst, 6447, LJ_TISNUM); + dasm_put(Dst, 6467, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 6472); - } else { dasm_put(Dst, 6492); + } else { + dasm_put(Dst, 6512); } if (sse) { - dasm_put(Dst, 6497); + dasm_put(Dst, 6517); } else { } - dasm_put(Dst, 6514, 1+1); + dasm_put(Dst, 6534, 1+1); if (sse) { - dasm_put(Dst, 6397, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); + dasm_put(Dst, 6417, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); } else { - dasm_put(Dst, 6407); + dasm_put(Dst, 6427); } - dasm_put(Dst, 2268, LJ_TISNUM); + dasm_put(Dst, 2288, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 6415); + dasm_put(Dst, 6435); } else { - dasm_put(Dst, 2291); + dasm_put(Dst, 2311); } if (sse) { - dasm_put(Dst, 6432); + dasm_put(Dst, 6452); } else { } - dasm_put(Dst, 6447, LJ_TISNUM); + dasm_put(Dst, 6467, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 6532); - } else { - dasm_put(Dst, 6492); - } - if (sse) { dasm_put(Dst, 6552); } else { + dasm_put(Dst, 6512); } - dasm_put(Dst, 6569, 1+1); if (sse) { - dasm_put(Dst, 6397, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); + dasm_put(Dst, 6572); } else { - dasm_put(Dst, 6407); } - dasm_put(Dst, 2268, LJ_TISNUM); + dasm_put(Dst, 6589, 1+1); + if (sse) { + dasm_put(Dst, 6417, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); + } else { + dasm_put(Dst, 6427); + } + dasm_put(Dst, 2288, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 6415); + dasm_put(Dst, 6435); } else { - dasm_put(Dst, 2291); + dasm_put(Dst, 2311); } if (sse) { - dasm_put(Dst, 6432); + dasm_put(Dst, 6452); } else { } - dasm_put(Dst, 6447, LJ_TISNUM); + dasm_put(Dst, 6467, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 6587); - } else { - dasm_put(Dst, 6492); - } - if (sse) { dasm_put(Dst, 6607); } else { - } - dasm_put(Dst, 6624, 1+1, LJ_TISNUM); - if (LJ_DUALNUM) { - dasm_put(Dst, 6415); - } else { - dasm_put(Dst, 2291); + dasm_put(Dst, 6512); } if (sse) { - dasm_put(Dst, 6357, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); + dasm_put(Dst, 6627); } else { } - dasm_put(Dst, 6647, 1+1, LJ_TISNUM); + dasm_put(Dst, 6644, 1+1, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 6415); + dasm_put(Dst, 6435); } else { - dasm_put(Dst, 2291); + dasm_put(Dst, 2311); } if (sse) { - dasm_put(Dst, 6357, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); + dasm_put(Dst, 6377, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); } else { } - dasm_put(Dst, 6671); + dasm_put(Dst, 6667, 1+1, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 6381); + dasm_put(Dst, 6435); + } else { + dasm_put(Dst, 2311); + } + if (sse) { + dasm_put(Dst, 6377, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); + } else { + } + dasm_put(Dst, 6691); + if (LJ_DUALNUM) { + dasm_put(Dst, 6401); } else if (sse) { - dasm_put(Dst, 6677); + dasm_put(Dst, 6697); } else { } - dasm_put(Dst, 6689); + dasm_put(Dst, 6709); if (LJ_DUALNUM) { - dasm_put(Dst, 6700, 1+1, LJ_TISNUM); + dasm_put(Dst, 6720, 1+1, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 6415); + dasm_put(Dst, 6435); } else { - dasm_put(Dst, 2291); + dasm_put(Dst, 2311); } if (sse) { - dasm_put(Dst, 6357, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); + dasm_put(Dst, 6377, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); } else { } - dasm_put(Dst, 6716, LJ_TISNUM); + dasm_put(Dst, 6736, LJ_TISNUM); } else if (sse) { - dasm_put(Dst, 6731, 2+1, LJ_TISNUM, LJ_TISNUM, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); + dasm_put(Dst, 6751, 2+1, LJ_TISNUM, LJ_TISNUM, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); } else { } - dasm_put(Dst, 6798); + dasm_put(Dst, 6818); if (LJ_DUALNUM) { - dasm_put(Dst, 6805, 1+1, LJ_TISNUM); + dasm_put(Dst, 6825, 1+1, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 6415); + dasm_put(Dst, 6435); } else { - dasm_put(Dst, 2291); + dasm_put(Dst, 2311); } if (sse) { - dasm_put(Dst, 6357, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); + dasm_put(Dst, 6377, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); } else { } - dasm_put(Dst, 6716, LJ_TISNUM); + dasm_put(Dst, 6736, LJ_TISNUM); } else if (sse) { - dasm_put(Dst, 6821, 2+1, LJ_TISNUM, LJ_TISNUM, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); + dasm_put(Dst, 6841, 2+1, LJ_TISNUM, LJ_TISNUM, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); } else { } - dasm_put(Dst, 6888); + dasm_put(Dst, 6908); if (LJ_DUALNUM) { - dasm_put(Dst, 6896, 1+1, LJ_TISNUM); + dasm_put(Dst, 6916, 1+1, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 6415); + dasm_put(Dst, 6435); } else { - dasm_put(Dst, 2291); + dasm_put(Dst, 2311); } if (sse) { - dasm_put(Dst, 6357, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); + dasm_put(Dst, 6377, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); } else { } - dasm_put(Dst, 6716, LJ_TISNUM); + dasm_put(Dst, 6736, LJ_TISNUM); } else if (sse) { - dasm_put(Dst, 6912, 2+1, LJ_TISNUM, LJ_TISNUM, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); + dasm_put(Dst, 6932, 2+1, LJ_TISNUM, LJ_TISNUM, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); } else { } - dasm_put(Dst, 6979); + dasm_put(Dst, 6999); if (LJ_DUALNUM) { - dasm_put(Dst, 6987, 1+1, LJ_TISNUM); + dasm_put(Dst, 7007, 1+1, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 6415); + dasm_put(Dst, 6435); } else { - dasm_put(Dst, 2291); + dasm_put(Dst, 2311); } if (sse) { - dasm_put(Dst, 6357, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); + dasm_put(Dst, 6377, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); } else { } - dasm_put(Dst, 6716, LJ_TISNUM); + dasm_put(Dst, 6736, LJ_TISNUM); } else if (sse) { - dasm_put(Dst, 7003, 2+1, LJ_TISNUM, LJ_TISNUM, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); + dasm_put(Dst, 7023, 2+1, LJ_TISNUM, LJ_TISNUM, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); } else { } - dasm_put(Dst, 7070); + dasm_put(Dst, 7090); if (LJ_DUALNUM) { - dasm_put(Dst, 7077, 1+1, LJ_TISNUM); + dasm_put(Dst, 7097, 1+1, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 6415); + dasm_put(Dst, 6435); } else { - dasm_put(Dst, 2291); + dasm_put(Dst, 2311); } if (sse) { - dasm_put(Dst, 6357, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); + dasm_put(Dst, 6377, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); } else { } - dasm_put(Dst, 6716, LJ_TISNUM); + dasm_put(Dst, 6736, LJ_TISNUM); } else if (sse) { - dasm_put(Dst, 7093, 2+1, LJ_TISNUM, LJ_TISNUM, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); + dasm_put(Dst, 7113, 2+1, LJ_TISNUM, LJ_TISNUM, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); } else { } - dasm_put(Dst, 7160, 1+2, 1+1, Dt1(->base), 8*LUA_MINSTACK, Dt1(->top), Dt1(->maxstack), Dt8(->f), Dt1(->base)); - dasm_put(Dst, 7236, Dt1(->top), Dt7(->pc), FRAME_TYPE, LUA_MINSTACK, Dt1(->base), Dt1(->base)); - dasm_put(Dst, 7363, Dt1(->top), Dt1(->base), Dt1(->top)); + dasm_put(Dst, 7180, 1+2, 1+1, Dt1(->base), 8*LUA_MINSTACK, Dt1(->top), Dt1(->maxstack), Dt8(->f), Dt1(->base)); + dasm_put(Dst, 7256, Dt1(->top), Dt7(->pc), FRAME_TYPE, LUA_MINSTACK, Dt1(->base), Dt1(->base)); + dasm_put(Dst, 7383, Dt1(->top), Dt1(->base), Dt1(->top)); #if LJ_HASJIT - dasm_put(Dst, 7402, DISPATCH_GL(hookmask), HOOK_VMEVENT, HOOK_ACTIVE, LUA_MASKLINE|LUA_MASKCOUNT, DISPATCH_GL(hookcount)); + dasm_put(Dst, 7422, DISPATCH_GL(hookmask), HOOK_VMEVENT, HOOK_ACTIVE, LUA_MASKLINE|LUA_MASKCOUNT, DISPATCH_GL(hookcount)); #endif - dasm_put(Dst, 7435, DISPATCH_GL(hookmask), HOOK_ACTIVE, DISPATCH_GL(hookmask), HOOK_ACTIVE, LUA_MASKLINE|LUA_MASKCOUNT, DISPATCH_GL(hookcount), LUA_MASKLINE); - dasm_put(Dst, 7489, Dt1(->base), Dt1(->base), GG_DISP2STATIC); + dasm_put(Dst, 7455, DISPATCH_GL(hookmask), HOOK_ACTIVE, DISPATCH_GL(hookmask), HOOK_ACTIVE, LUA_MASKLINE|LUA_MASKCOUNT, DISPATCH_GL(hookcount), LUA_MASKLINE); + dasm_put(Dst, 7509, Dt1(->base), Dt1(->base), GG_DISP2STATIC); #if LJ_HASJIT - dasm_put(Dst, 7556, Dt7(->pc), PC2PROTO(framesize), Dt1(->base), Dt1(->top), GG_DISP2J, DISPATCH_J(L)); + dasm_put(Dst, 7576, Dt7(->pc), PC2PROTO(framesize), Dt1(->base), Dt1(->top), GG_DISP2J, DISPATCH_J(L)); #endif - dasm_put(Dst, 7603); + dasm_put(Dst, 7623); #if LJ_HASJIT - dasm_put(Dst, 7430); + dasm_put(Dst, 7450); #endif - dasm_put(Dst, 7610); + dasm_put(Dst, 7630); #if LJ_HASJIT - dasm_put(Dst, 7613); + dasm_put(Dst, 7633); #endif - dasm_put(Dst, 7623, Dt1(->base), Dt1(->top)); + dasm_put(Dst, 7643, Dt1(->base), Dt1(->top)); #if LJ_HASJIT - dasm_put(Dst, 7656); + dasm_put(Dst, 7676); #endif - dasm_put(Dst, 7661, Dt1(->base), Dt1(->top)); + dasm_put(Dst, 7681, Dt1(->base), Dt1(->top)); #if LJ_HASJIT - dasm_put(Dst, 7692, DISPATCH_GL(vmstate), DISPATCH_GL(vmstate), ~LJ_VMST_EXIT, DISPATCH_J(exitno), DISPATCH_J(parent), 16*8, DISPATCH_GL(jit_L), DISPATCH_GL(jit_base), DISPATCH_J(L), DISPATCH_GL(jit_L), Dt1(->base), GG_DISP2J, Dt1(->cframe), CFRAME_RAWMASK, CFRAME_OFS_L, Dt1(->base), CFRAME_OFS_PC); + dasm_put(Dst, 7712, DISPATCH_GL(vmstate), DISPATCH_GL(vmstate), ~LJ_VMST_EXIT, DISPATCH_J(exitno), DISPATCH_J(parent), 16*8, DISPATCH_GL(jit_L), DISPATCH_GL(jit_base), DISPATCH_J(L), DISPATCH_GL(jit_L), Dt1(->base), GG_DISP2J, Dt1(->cframe), CFRAME_RAWMASK, CFRAME_OFS_L, Dt1(->base), CFRAME_OFS_PC); #endif - dasm_put(Dst, 7931); + dasm_put(Dst, 7951); #if LJ_HASJIT - dasm_put(Dst, 7934, Dt7(->pc), PC2PROTO(k), DISPATCH_GL(jit_L), DISPATCH_GL(vmstate), ~LJ_VMST_INTERP, BC_FUNCF); + dasm_put(Dst, 7954, Dt7(->pc), PC2PROTO(k), DISPATCH_GL(jit_L), DISPATCH_GL(vmstate), ~LJ_VMST_INTERP, BC_FUNCF); #endif - dasm_put(Dst, 8034); + dasm_put(Dst, 8054); if (!sse) { - dasm_put(Dst, 8037); + dasm_put(Dst, 8057); } - dasm_put(Dst, 8082, (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, 8102, (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, 8168); + dasm_put(Dst, 8188); } - dasm_put(Dst, 8213, (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, 8233, (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, 8299); + dasm_put(Dst, 8319); } - dasm_put(Dst, 8338, (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, 8358, (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, 8427, (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, 8447, (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, 8541); + dasm_put(Dst, 8561); } - dasm_put(Dst, 8588); + dasm_put(Dst, 8608); if (!sse) { } else { - dasm_put(Dst, 8665); + dasm_put(Dst, 8685); } - dasm_put(Dst, 8668); - dasm_put(Dst, 8753, (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, 8856, (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, 9018); + dasm_put(Dst, 8688); + dasm_put(Dst, 8773, (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, 8876, (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, 9038); #if LJ_HASJIT if (sse) { - dasm_put(Dst, 9059); - dasm_put(Dst, 9129); - dasm_put(Dst, 9201); + dasm_put(Dst, 9079); + dasm_put(Dst, 9149); + dasm_put(Dst, 9221); } else { - dasm_put(Dst, 9253); - dasm_put(Dst, 9345); + dasm_put(Dst, 9273); + dasm_put(Dst, 9365); } - dasm_put(Dst, 9391); + dasm_put(Dst, 9411); #endif - dasm_put(Dst, 9395); + dasm_put(Dst, 9415); if (sse) { - dasm_put(Dst, 9398, (unsigned int)(U64x(80000000,00000000)), (unsigned int)((U64x(80000000,00000000))>>32)); - dasm_put(Dst, 9483, (unsigned int)(U64x(7fffffff,ffffffff)), (unsigned int)((U64x(7fffffff,ffffffff))>>32)); + dasm_put(Dst, 9418, (unsigned int)(U64x(80000000,00000000)), (unsigned int)((U64x(80000000,00000000))>>32)); + dasm_put(Dst, 9503, (unsigned int)(U64x(7fffffff,ffffffff)), (unsigned int)((U64x(7fffffff,ffffffff))>>32)); } else { - dasm_put(Dst, 9611); - dasm_put(Dst, 9694); + dasm_put(Dst, 9631); + dasm_put(Dst, 9714); if (cmov) { - dasm_put(Dst, 9749); + dasm_put(Dst, 9769); } else { - dasm_put(Dst, 9768); + dasm_put(Dst, 9788); } - dasm_put(Dst, 9391); + dasm_put(Dst, 9411); } - dasm_put(Dst, 9809); + dasm_put(Dst, 9829); #if LJ_HASFFI #define DtE(_V) (int)(ptrdiff_t)&(((CCallState *)0)_V) - dasm_put(Dst, 9833, DtE(->spadj)); + dasm_put(Dst, 9853, DtE(->spadj)); #if LJ_TARGET_WINDOWS #endif - dasm_put(Dst, 9849, DtE(->nsp), offsetof(CCallState, stack), CCALL_SPS_EXTRA*8, DtE(->nfpr), DtE(->gpr[0]), DtE(->gpr[1]), DtE(->gpr[2]), DtE(->gpr[3]), DtE(->gpr[4]), DtE(->gpr[5]), DtE(->fpr[0]), DtE(->fpr[1])); - dasm_put(Dst, 9928, DtE(->fpr[2]), DtE(->fpr[3]), DtE(->fpr[4]), DtE(->fpr[5]), DtE(->fpr[6]), DtE(->fpr[7]), DtE(->func), DtE(->gpr[0]), DtE(->fpr[0]), DtE(->gpr[1]), DtE(->fpr[1])); + dasm_put(Dst, 9869, DtE(->nsp), offsetof(CCallState, stack), CCALL_SPS_EXTRA*8, DtE(->nfpr), DtE(->gpr[0]), DtE(->gpr[1]), DtE(->gpr[2]), DtE(->gpr[3]), DtE(->gpr[4]), DtE(->gpr[5]), DtE(->fpr[0]), DtE(->fpr[1])); + dasm_put(Dst, 9948, DtE(->fpr[2]), DtE(->fpr[3]), DtE(->fpr[4]), DtE(->fpr[5]), DtE(->fpr[6]), DtE(->fpr[7]), DtE(->func), DtE(->gpr[0]), DtE(->fpr[0]), DtE(->gpr[1]), DtE(->fpr[1])); #if LJ_TARGET_WINDOWS #endif - dasm_put(Dst, 9983); + dasm_put(Dst, 10003); #endif - dasm_put(Dst, 9991); + dasm_put(Dst, 10011); #ifdef LUA_USE_ASSERT - dasm_put(Dst, 9393); + dasm_put(Dst, 9413); #endif - dasm_put(Dst, 9393); + dasm_put(Dst, 9413); } /* 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, 9994, defop); + dasm_put(Dst, 10014, defop); switch (op) { @@ -1857,296 +1867,303 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) case BC_ISLT: case BC_ISGE: case BC_ISLE: case BC_ISGT: if (LJ_DUALNUM) { - dasm_put(Dst, 9996, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 10016, LJ_TISNUM, LJ_TISNUM); switch (op) { case BC_ISLT: - dasm_put(Dst, 10026); + dasm_put(Dst, 10046); break; case BC_ISGE: - dasm_put(Dst, 10031); + dasm_put(Dst, 10051); break; case BC_ISLE: - dasm_put(Dst, 10036); + dasm_put(Dst, 10056); break; case BC_ISGT: - dasm_put(Dst, 10041); + dasm_put(Dst, 10061); break; default: break; /* Shut up GCC. */ } - dasm_put(Dst, 10046, -BCBIAS_J*4, LJ_TISNUM); + dasm_put(Dst, 10066, -BCBIAS_J*4, LJ_TISNUM); if (sse) { - dasm_put(Dst, 10101); + dasm_put(Dst, 10121); } else { - dasm_put(Dst, 10112); + dasm_put(Dst, 10132); } - dasm_put(Dst, 10123); + dasm_put(Dst, 10143); if (sse) { - dasm_put(Dst, 10130); + dasm_put(Dst, 10150); switch (op) { case BC_ISLT: - dasm_put(Dst, 10150); + dasm_put(Dst, 10170); break; case BC_ISGE: - dasm_put(Dst, 10155); + dasm_put(Dst, 10175); break; case BC_ISLE: - dasm_put(Dst, 10160); + dasm_put(Dst, 10180); break; case BC_ISGT: - dasm_put(Dst, 10165); + dasm_put(Dst, 10185); break; default: break; /* Shut up GCC. */ } - dasm_put(Dst, 10170); + dasm_put(Dst, 10190); } else { - dasm_put(Dst, 10175); + dasm_put(Dst, 10195); } } else { - dasm_put(Dst, 10183, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 10203, LJ_TISNUM, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 10204); + dasm_put(Dst, 10224); } else { - dasm_put(Dst, 10225); + dasm_put(Dst, 10245); if (cmov) { - dasm_put(Dst, 10241); + dasm_put(Dst, 10261); } else { - dasm_put(Dst, 10247); + dasm_put(Dst, 10267); } } if (LJ_DUALNUM) { switch (op) { case BC_ISLT: - dasm_put(Dst, 10150); + dasm_put(Dst, 10170); break; case BC_ISGE: - dasm_put(Dst, 10155); + dasm_put(Dst, 10175); break; case BC_ISLE: - dasm_put(Dst, 10160); + dasm_put(Dst, 10180); break; case BC_ISGT: - dasm_put(Dst, 10165); + dasm_put(Dst, 10185); break; default: break; /* Shut up GCC. */ } - dasm_put(Dst, 10170); + dasm_put(Dst, 10190); } else { switch (op) { case BC_ISLT: - dasm_put(Dst, 10254); + dasm_put(Dst, 10274); break; case BC_ISGE: - dasm_put(Dst, 10259); + dasm_put(Dst, 10279); break; case BC_ISLE: - dasm_put(Dst, 10264); + dasm_put(Dst, 10284); break; case BC_ISGT: - dasm_put(Dst, 10269); + dasm_put(Dst, 10289); break; default: break; /* Shut up GCC. */ } - dasm_put(Dst, 10274, -BCBIAS_J*4); + dasm_put(Dst, 10294, -BCBIAS_J*4); } break; case BC_ISEQV: case BC_ISNEV: vk = op == BC_ISEQV; - dasm_put(Dst, 10307); + dasm_put(Dst, 10327); if (LJ_DUALNUM) { - dasm_put(Dst, 10315, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 10335, LJ_TISNUM, LJ_TISNUM); if (vk) { - dasm_put(Dst, 10340); + dasm_put(Dst, 10360); } else { - dasm_put(Dst, 10345); + dasm_put(Dst, 10365); } - dasm_put(Dst, 10350, -BCBIAS_J*4, LJ_TISNUM); + dasm_put(Dst, 10370, -BCBIAS_J*4, LJ_TISNUM); if (sse) { - dasm_put(Dst, 10403); + dasm_put(Dst, 10423); } else { - dasm_put(Dst, 10410); + dasm_put(Dst, 10430); } - dasm_put(Dst, 10414); + dasm_put(Dst, 10434); if (sse) { - dasm_put(Dst, 10425); + dasm_put(Dst, 10445); } else { - dasm_put(Dst, 10437); + dasm_put(Dst, 10457); } - dasm_put(Dst, 10444); + dasm_put(Dst, 10464); } else { - dasm_put(Dst, 10449, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 10469, LJ_TISNUM, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 10468); + dasm_put(Dst, 10488); } else { - dasm_put(Dst, 10486); + dasm_put(Dst, 10506); if (cmov) { - dasm_put(Dst, 10241); + dasm_put(Dst, 10261); } else { - dasm_put(Dst, 10247); + dasm_put(Dst, 10267); } } iseqne_fp: if (vk) { - dasm_put(Dst, 10499); + dasm_put(Dst, 10519); } else { - dasm_put(Dst, 10508); + dasm_put(Dst, 10528); } iseqne_end: if (vk) { - dasm_put(Dst, 10517, -BCBIAS_J*4); + dasm_put(Dst, 10537, -BCBIAS_J*4); if (!LJ_HASFFI) { - dasm_put(Dst, 4655); + dasm_put(Dst, 4675); } } else { if (!LJ_HASFFI) { - dasm_put(Dst, 4655); + dasm_put(Dst, 4675); } - dasm_put(Dst, 10532, -BCBIAS_J*4); + dasm_put(Dst, 10552, -BCBIAS_J*4); } if (LJ_DUALNUM && (op == BC_ISEQV || op == BC_ISNEV || op == BC_ISEQN || op == BC_ISNEN)) { - dasm_put(Dst, 10547); + dasm_put(Dst, 10567); } else { - dasm_put(Dst, 10286); + dasm_put(Dst, 10306); } if (op == BC_ISEQV || op == BC_ISNEV) { - dasm_put(Dst, 10552); + dasm_put(Dst, 10572); if (LJ_HASFFI) { - dasm_put(Dst, 10555, LJ_TCDATA, LJ_TCDATA); + dasm_put(Dst, 10575, LJ_TCDATA, LJ_TCDATA); } - dasm_put(Dst, 10574, LJ_TISPRI, LJ_TISTABUD, Dt6(->metatable), Dt6(->nomm), 1<metatable), Dt6(->nomm), 1<>32)); + dasm_put(Dst, 11165, (unsigned int)(U64x(80000000,00000000)), (unsigned int)((U64x(80000000,00000000))>>32)); } else { - dasm_put(Dst, 11170); + dasm_put(Dst, 11190); } if (LJ_DUALNUM) { - dasm_put(Dst, 10547); + dasm_put(Dst, 10567); } else { - dasm_put(Dst, 10286); + dasm_put(Dst, 10306); } break; case BC_LEN: - dasm_put(Dst, 11179, LJ_TSTR); + dasm_put(Dst, 11199, LJ_TSTR); if (LJ_DUALNUM) { - dasm_put(Dst, 11193, Dt5(->len), LJ_TISNUM); + dasm_put(Dst, 11213, Dt5(->len), LJ_TISNUM); } else if (sse) { - dasm_put(Dst, 11207, Dt5(->len)); + dasm_put(Dst, 11227, Dt5(->len)); } else { - dasm_put(Dst, 11225, Dt5(->len)); + dasm_put(Dst, 11245, Dt5(->len)); } - dasm_put(Dst, 11234, LJ_TTAB); + dasm_put(Dst, 11254, LJ_TTAB); +#ifdef LUAJIT_ENABLE_LUA52COMPAT + dasm_put(Dst, 11290, Dt6(->metatable)); +#endif + dasm_put(Dst, 11304); if (LJ_DUALNUM) { } else if (sse) { - dasm_put(Dst, 11276); + dasm_put(Dst, 11313); } else { } - dasm_put(Dst, 11282); + dasm_put(Dst, 11319); +#ifdef LUAJIT_ENABLE_LUA52COMPAT + dasm_put(Dst, 11332, Dt6(->nomm), 1<base), Dt1(->base)); + dasm_put(Dst, 12109, Dt1(->base), Dt1(->base)); break; /* -- Constant ops ------------------------------------------------------ */ case BC_KSTR: - dasm_put(Dst, 12140, LJ_TSTR); + dasm_put(Dst, 12193, LJ_TSTR); break; case BC_KCDATA: #if LJ_HASFFI - dasm_put(Dst, 12140, LJ_TCDATA); + dasm_put(Dst, 12193, LJ_TCDATA); #endif break; case BC_KSHORT: if (LJ_DUALNUM) { - dasm_put(Dst, 12177, LJ_TISNUM); + dasm_put(Dst, 12230, LJ_TISNUM); } else if (sse) { - dasm_put(Dst, 12189); + dasm_put(Dst, 12242); } else { - dasm_put(Dst, 12204); + dasm_put(Dst, 12257); } - dasm_put(Dst, 10286); + dasm_put(Dst, 10306); break; case BC_KNUM: if (sse) { - dasm_put(Dst, 12212); + dasm_put(Dst, 12265); } else { - dasm_put(Dst, 12226); + dasm_put(Dst, 12279); } - dasm_put(Dst, 10286); + dasm_put(Dst, 10306); break; case BC_KPRI: - dasm_put(Dst, 12234); + dasm_put(Dst, 12287); break; case BC_KNIL: - dasm_put(Dst, 12263, LJ_TNIL); + dasm_put(Dst, 12316, LJ_TNIL); break; /* -- Upvalue and function ops ------------------------------------------ */ case BC_UGET: - dasm_put(Dst, 12311, offsetof(GCfuncL, uvptr), DtA(->v)); + dasm_put(Dst, 12364, offsetof(GCfuncL, uvptr), DtA(->v)); break; case BC_USETV: #define TV2MARKOFS \ ((int32_t)offsetof(GCupval, marked)-(int32_t)offsetof(GCupval, tv)) - dasm_put(Dst, 12352, 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, 12448); + dasm_put(Dst, 12405, 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, 12501); break; #undef TV2MARKOFS case BC_USETS: - dasm_put(Dst, 12460, 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, 12513, 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, 12556); + dasm_put(Dst, 12609); if (sse) { - dasm_put(Dst, 12561); + dasm_put(Dst, 12614); } else { - dasm_put(Dst, 10810); + dasm_put(Dst, 10830); } - dasm_put(Dst, 12569, offsetof(GCfuncL, uvptr), DtA(->v)); + dasm_put(Dst, 12622, offsetof(GCfuncL, uvptr), DtA(->v)); if (sse) { - dasm_put(Dst, 12578); + dasm_put(Dst, 12631); } else { - dasm_put(Dst, 12584); + dasm_put(Dst, 12637); } - dasm_put(Dst, 10286); + dasm_put(Dst, 10306); break; case BC_USETP: - dasm_put(Dst, 12587, offsetof(GCfuncL, uvptr), DtA(->v)); + dasm_put(Dst, 12640, offsetof(GCfuncL, uvptr), DtA(->v)); break; case BC_UCLO: - dasm_put(Dst, 12627, -BCBIAS_J*4, Dt1(->openupval), Dt1(->base), Dt1(->base)); + dasm_put(Dst, 12680, -BCBIAS_J*4, Dt1(->openupval), Dt1(->base), Dt1(->base)); break; case BC_FNEW: - dasm_put(Dst, 12683, Dt1(->base), Dt1(->base), LJ_TFUNC); + dasm_put(Dst, 12736, Dt1(->base), Dt1(->base), LJ_TFUNC); break; /* -- Table ops --------------------------------------------------------- */ case BC_TNEW: - dasm_put(Dst, 12750, Dt1(->base), DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), LJ_TTAB); + dasm_put(Dst, 12803, Dt1(->base), DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), LJ_TTAB); break; case BC_TDUP: - dasm_put(Dst, 12874, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), Dt1(->base), LJ_TTAB); + dasm_put(Dst, 12927, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), Dt1(->base), LJ_TTAB); break; case BC_GGET: - dasm_put(Dst, 12973, Dt7(->env)); + dasm_put(Dst, 13026, Dt7(->env)); break; case BC_GSET: - dasm_put(Dst, 12993, Dt7(->env)); + dasm_put(Dst, 13046, Dt7(->env)); break; case BC_TGETV: - dasm_put(Dst, 13013, LJ_TTAB); + dasm_put(Dst, 13066, LJ_TTAB); if (LJ_DUALNUM) { - dasm_put(Dst, 13036, LJ_TISNUM); + dasm_put(Dst, 13089, LJ_TISNUM); } else { - dasm_put(Dst, 13050, LJ_TISNUM); + dasm_put(Dst, 13103, LJ_TISNUM); if (sse) { - dasm_put(Dst, 13061); + dasm_put(Dst, 13114); } else { } - dasm_put(Dst, 13082); + dasm_put(Dst, 13135); } - dasm_put(Dst, 13087, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<asize), Dt6(->array), LJ_TNIL, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<hmask), Dt5(->hash), sizeof(Node), Dt6(->node), DtB(->key.it), LJ_TSTR, DtB(->key.gcr), LJ_TNIL); - dasm_put(Dst, 13282, LJ_TNIL, DtB(->next), Dt6(->metatable), Dt6(->nomm), 1<hmask), Dt5(->hash), sizeof(Node), Dt6(->node), DtB(->key.it), LJ_TSTR, DtB(->key.gcr), LJ_TNIL); + dasm_put(Dst, 13335, LJ_TNIL, DtB(->next), Dt6(->metatable), Dt6(->nomm), 1<asize), Dt6(->array), LJ_TNIL, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<asize), Dt6(->array), LJ_TNIL, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<asize), Dt6(->array), LJ_TNIL, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<marked), (uint8_t)~LJ_GC_BLACK, DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); + dasm_put(Dst, 13548, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<marked), (uint8_t)~LJ_GC_BLACK, DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); break; case BC_TSETS: - dasm_put(Dst, 13635, 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, 13712, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<next)); - dasm_put(Dst, 13799, Dt6(->metatable), Dt6(->nomm), 1<base), Dt1(->base), Dt6(->marked), (uint8_t)~LJ_GC_BLACK, DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); + dasm_put(Dst, 13688, 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, 13765, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<next)); + dasm_put(Dst, 13852, Dt6(->metatable), Dt6(->nomm), 1<base), Dt1(->base), Dt6(->marked), (uint8_t)~LJ_GC_BLACK, DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); break; case BC_TSETB: - dasm_put(Dst, 13891, LJ_TTAB, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable)); - dasm_put(Dst, 13986, Dt6(->metatable), Dt6(->nomm), 1<marked), (uint8_t)~LJ_GC_BLACK, DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); + dasm_put(Dst, 13944, LJ_TTAB, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable)); + dasm_put(Dst, 14039, Dt6(->metatable), Dt6(->nomm), 1<marked), (uint8_t)~LJ_GC_BLACK, DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); break; case BC_TSETM: - dasm_put(Dst, 14034, Dt6(->marked), LJ_GC_BLACK, Dt6(->asize), Dt6(->array), Dt1(->base), Dt1(->base)); - dasm_put(Dst, 14184, Dt6(->marked), (uint8_t)~LJ_GC_BLACK, DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); + dasm_put(Dst, 14087, Dt6(->marked), LJ_GC_BLACK, Dt6(->asize), Dt6(->array), Dt1(->base), Dt1(->base)); + dasm_put(Dst, 14237, Dt6(->marked), (uint8_t)~LJ_GC_BLACK, DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); break; /* -- Calls and vararg handling ----------------------------------------- */ case BC_CALL: case BC_CALLM: - dasm_put(Dst, 11299); + dasm_put(Dst, 11352); if (op == BC_CALLM) { - dasm_put(Dst, 14204); + dasm_put(Dst, 14257); } - dasm_put(Dst, 14209, LJ_TFUNC, Dt7(->pc)); + dasm_put(Dst, 14262, LJ_TFUNC, Dt7(->pc)); break; case BC_CALLMT: - dasm_put(Dst, 14204); + dasm_put(Dst, 14257); break; case BC_CALLT: - dasm_put(Dst, 14252, LJ_TFUNC, FRAME_TYPE, Dt7(->ffid), Dt7(->pc)); - dasm_put(Dst, 14370, FRAME_TYPE, Dt7(->pc), PC2PROTO(k), FRAME_VARG, FRAME_TYPEP, FRAME_VARG); + dasm_put(Dst, 14305, LJ_TFUNC, FRAME_TYPE, Dt7(->ffid), Dt7(->pc)); + dasm_put(Dst, 14423, FRAME_TYPE, Dt7(->pc), PC2PROTO(k), FRAME_VARG, FRAME_TYPEP, FRAME_VARG); break; case BC_ITERC: - dasm_put(Dst, 14444, LJ_TFUNC, 2+1, Dt7(->pc)); + dasm_put(Dst, 14497, LJ_TFUNC, 2+1, Dt7(->pc)); break; case BC_ITERN: #if LJ_HASJIT #endif - dasm_put(Dst, 14516, Dt6(->asize), Dt6(->array), LJ_TNIL); + dasm_put(Dst, 14569, Dt6(->asize), Dt6(->array), LJ_TNIL); if (LJ_DUALNUM) { - dasm_put(Dst, 11198, LJ_TISNUM); + dasm_put(Dst, 11218, LJ_TISNUM); } else if (sse) { - dasm_put(Dst, 11276); + dasm_put(Dst, 11313); } else { - dasm_put(Dst, 14568); + dasm_put(Dst, 14621); } - dasm_put(Dst, 14574); + dasm_put(Dst, 14627); if (LJ_DUALNUM) { } else if (sse) { - dasm_put(Dst, 11163); + dasm_put(Dst, 11183); } else { - dasm_put(Dst, 11175); + dasm_put(Dst, 11195); } - dasm_put(Dst, 14587, -BCBIAS_J*4); + dasm_put(Dst, 14640, -BCBIAS_J*4); if (!LJ_DUALNUM && !sse) { - dasm_put(Dst, 14641); + dasm_put(Dst, 14694); } - dasm_put(Dst, 14647, Dt6(->hmask), sizeof(Node), Dt6(->node), DtB(->val.it), LJ_TNIL, DtB(->key), DtB(->val)); + dasm_put(Dst, 14700, Dt6(->hmask), sizeof(Node), Dt6(->node), DtB(->val.it), LJ_TNIL, DtB(->key), DtB(->val)); break; case BC_ISNEXT: - dasm_put(Dst, 14726, LJ_TFUNC, LJ_TTAB, LJ_TNIL, Dt8(->ffid), FF_next_N, -BCBIAS_J*4, BC_JMP, -BCBIAS_J*4, BC_ITERC); + dasm_put(Dst, 14779, LJ_TFUNC, LJ_TTAB, LJ_TNIL, Dt8(->ffid), FF_next_N, -BCBIAS_J*4, BC_JMP, -BCBIAS_J*4, BC_ITERC); break; case BC_VARG: - dasm_put(Dst, 14827, (8+FRAME_VARG), LJ_TNIL, Dt1(->maxstack)); - dasm_put(Dst, 14994, Dt1(->base), Dt1(->top), Dt1(->base), Dt1(->top)); + dasm_put(Dst, 14880, (8+FRAME_VARG), LJ_TNIL, Dt1(->maxstack)); + dasm_put(Dst, 15047, Dt1(->base), Dt1(->top), Dt1(->base), Dt1(->top)); break; /* -- Returns ----------------------------------------------------------- */ case BC_RETM: - dasm_put(Dst, 14204); + dasm_put(Dst, 14257); break; case BC_RET: case BC_RET0: case BC_RET1: if (op != BC_RET0) { - dasm_put(Dst, 15064); + dasm_put(Dst, 15117); } - dasm_put(Dst, 15068, FRAME_TYPE); + dasm_put(Dst, 15121, FRAME_TYPE); switch (op) { case BC_RET: - dasm_put(Dst, 15087); + dasm_put(Dst, 15140); break; case BC_RET1: - dasm_put(Dst, 15141); + dasm_put(Dst, 15194); /* fallthrough */ case BC_RET0: - dasm_put(Dst, 15151); + dasm_put(Dst, 15204); default: break; } - dasm_put(Dst, 15162, Dt7(->pc), PC2PROTO(k)); + dasm_put(Dst, 15215, Dt7(->pc), PC2PROTO(k)); if (op == BC_RET) { - dasm_put(Dst, 15210, LJ_TNIL); + dasm_put(Dst, 15263, LJ_TNIL); } else { - dasm_put(Dst, 15221, LJ_TNIL); + dasm_put(Dst, 15274, LJ_TNIL); } - dasm_put(Dst, 15228, -FRAME_VARG, FRAME_TYPEP); + dasm_put(Dst, 15281, -FRAME_VARG, FRAME_TYPEP); if (op != BC_RET0) { - dasm_put(Dst, 15252); + dasm_put(Dst, 15305); } - dasm_put(Dst, 4732); + dasm_put(Dst, 4752); break; /* -- Loops and branches ------------------------------------------------ */ @@ -2760,7 +2777,7 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) case BC_FORL: #if LJ_HASJIT - dasm_put(Dst, 15256, HOTCOUNT_PCMASK, GG_DISP2HOT); + dasm_put(Dst, 15309, HOTCOUNT_PCMASK, GG_DISP2HOT); #endif break; @@ -2772,111 +2789,111 @@ 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, 15277); + dasm_put(Dst, 15330); if (LJ_DUALNUM) { - dasm_put(Dst, 15281, LJ_TISNUM); + dasm_put(Dst, 15334, LJ_TISNUM); if (!vk) { - dasm_put(Dst, 15291, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 15344, LJ_TISNUM, LJ_TISNUM); } else { #ifdef LUA_USE_ASSERT - dasm_put(Dst, 15320, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 15373, LJ_TISNUM, LJ_TISNUM); #endif - dasm_put(Dst, 15339); + dasm_put(Dst, 15392); } - dasm_put(Dst, 15358, LJ_TISNUM); + dasm_put(Dst, 15411, LJ_TISNUM); if (op == BC_FORI) { - dasm_put(Dst, 15369, -BCBIAS_J*4); + dasm_put(Dst, 15422, -BCBIAS_J*4); } else if (op == BC_JFORI) { - dasm_put(Dst, 15383, -BCBIAS_J*4, BC_JLOOP); + dasm_put(Dst, 15436, -BCBIAS_J*4, BC_JLOOP); } else if (op == BC_IFORL) { - dasm_put(Dst, 15401, -BCBIAS_J*4); + dasm_put(Dst, 15454, -BCBIAS_J*4); } else { - dasm_put(Dst, 15393, BC_JLOOP); + dasm_put(Dst, 15446, BC_JLOOP); } - dasm_put(Dst, 15415); + dasm_put(Dst, 15468); if (vk) { - dasm_put(Dst, 15440); + dasm_put(Dst, 15493); } - dasm_put(Dst, 15358, LJ_TISNUM); + dasm_put(Dst, 15411, LJ_TISNUM); if (op == BC_FORI) { - dasm_put(Dst, 15449); + dasm_put(Dst, 15502); } else if (op == BC_JFORI) { - dasm_put(Dst, 15454, -BCBIAS_J*4, BC_JLOOP); + dasm_put(Dst, 15507, -BCBIAS_J*4, BC_JLOOP); } else if (op == BC_IFORL) { - dasm_put(Dst, 15468); + dasm_put(Dst, 15521); } else { - dasm_put(Dst, 15464, BC_JLOOP); + dasm_put(Dst, 15517, BC_JLOOP); } - dasm_put(Dst, 15473); + dasm_put(Dst, 15526); } else if (!vk) { - dasm_put(Dst, 15480, LJ_TISNUM); + dasm_put(Dst, 15533, LJ_TISNUM); } if (!vk) { - dasm_put(Dst, 15486, LJ_TISNUM); + dasm_put(Dst, 15539, LJ_TISNUM); } else { #ifdef LUA_USE_ASSERT - dasm_put(Dst, 15500, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 15553, LJ_TISNUM, LJ_TISNUM); #endif } - dasm_put(Dst, 15519); + dasm_put(Dst, 15572); if (!vk) { - dasm_put(Dst, 15523, LJ_TISNUM); + dasm_put(Dst, 15576, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 15532); + dasm_put(Dst, 15585); if (vk) { - dasm_put(Dst, 15544); + dasm_put(Dst, 15597); } else { - dasm_put(Dst, 15563); + dasm_put(Dst, 15616); } - dasm_put(Dst, 15568); + dasm_put(Dst, 15621); } else { - dasm_put(Dst, 15581); + dasm_put(Dst, 15634); if (vk) { - dasm_put(Dst, 15587); + dasm_put(Dst, 15640); } else { - dasm_put(Dst, 15603); + dasm_put(Dst, 15656); } - dasm_put(Dst, 15611); + dasm_put(Dst, 15664); if (cmov) { - dasm_put(Dst, 10241); + dasm_put(Dst, 10261); } else { - dasm_put(Dst, 10247); + dasm_put(Dst, 10267); } if (!cmov) { - dasm_put(Dst, 15616); + dasm_put(Dst, 15669); } } if (op == BC_FORI) { if (LJ_DUALNUM) { - dasm_put(Dst, 15622); + dasm_put(Dst, 15675); } else { - dasm_put(Dst, 15627, -BCBIAS_J*4); + dasm_put(Dst, 15680, -BCBIAS_J*4); } } else if (op == BC_JFORI) { - dasm_put(Dst, 15637, -BCBIAS_J*4, BC_JLOOP); + dasm_put(Dst, 15690, -BCBIAS_J*4, BC_JLOOP); } else if (op == BC_IFORL) { if (LJ_DUALNUM) { - dasm_put(Dst, 15651); + dasm_put(Dst, 15704); } else { - dasm_put(Dst, 15656, -BCBIAS_J*4); + dasm_put(Dst, 15709, -BCBIAS_J*4); } } else { - dasm_put(Dst, 15647, BC_JLOOP); + dasm_put(Dst, 15700, BC_JLOOP); } if (LJ_DUALNUM) { - dasm_put(Dst, 10170); + dasm_put(Dst, 10190); } else { - dasm_put(Dst, 10944); + dasm_put(Dst, 10964); } if (sse) { - dasm_put(Dst, 15666); + dasm_put(Dst, 15719); } break; case BC_ITERL: #if LJ_HASJIT - dasm_put(Dst, 15256, HOTCOUNT_PCMASK, GG_DISP2HOT); + dasm_put(Dst, 15309, HOTCOUNT_PCMASK, GG_DISP2HOT); #endif break; @@ -2885,33 +2902,33 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) break; #endif case BC_IITERL: - dasm_put(Dst, 15677, LJ_TNIL); + dasm_put(Dst, 15730, LJ_TNIL); if (op == BC_JITERL) { - dasm_put(Dst, 15692, BC_JLOOP); + dasm_put(Dst, 15745, BC_JLOOP); } else { - dasm_put(Dst, 15706, -BCBIAS_J*4); + dasm_put(Dst, 15759, -BCBIAS_J*4); } - dasm_put(Dst, 10284); + dasm_put(Dst, 10304); break; case BC_LOOP: #if LJ_HASJIT - dasm_put(Dst, 15256, HOTCOUNT_PCMASK, GG_DISP2HOT); + dasm_put(Dst, 15309, HOTCOUNT_PCMASK, GG_DISP2HOT); #endif break; case BC_ILOOP: - dasm_put(Dst, 10286); + dasm_put(Dst, 10306); break; case BC_JLOOP: #if LJ_HASJIT - dasm_put(Dst, 15722, DISPATCH_J(trace), DtD(->mcode), DISPATCH_GL(jit_base), DISPATCH_GL(jit_L)); + dasm_put(Dst, 15775, DISPATCH_J(trace), DtD(->mcode), DISPATCH_GL(jit_base), DISPATCH_GL(jit_L)); #endif break; case BC_JMP: - dasm_put(Dst, 15763, -BCBIAS_J*4); + dasm_put(Dst, 15816, -BCBIAS_J*4); break; /* -- Function headers -------------------------------------------------- */ @@ -2925,7 +2942,7 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) case BC_FUNCF: #if LJ_HASJIT - dasm_put(Dst, 15789, HOTCOUNT_PCMASK, GG_DISP2HOT); + dasm_put(Dst, 15842, HOTCOUNT_PCMASK, GG_DISP2HOT); #endif case BC_FUNCV: /* NYI: compiled vararg functions. */ break; @@ -2935,47 +2952,47 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) break; #endif case BC_IFUNCF: - dasm_put(Dst, 15810, -4+PC2PROTO(k), Dt1(->maxstack), -4+PC2PROTO(numparams)); + dasm_put(Dst, 15863, -4+PC2PROTO(k), Dt1(->maxstack), -4+PC2PROTO(numparams)); if (op == BC_JFUNCF) { - dasm_put(Dst, 15841, BC_JLOOP); + dasm_put(Dst, 15894, BC_JLOOP); } else { - dasm_put(Dst, 10286); + dasm_put(Dst, 10306); } - dasm_put(Dst, 15850, LJ_TNIL); + dasm_put(Dst, 15903, LJ_TNIL); break; case BC_JFUNCV: #if !LJ_HASJIT break; #endif - dasm_put(Dst, 9393); + dasm_put(Dst, 9413); break; /* NYI: compiled vararg functions. */ case BC_IFUNCV: - dasm_put(Dst, 15872, FRAME_VARG, Dt1(->maxstack), -4+PC2PROTO(numparams), LJ_TNIL); + dasm_put(Dst, 15925, FRAME_VARG, Dt1(->maxstack), -4+PC2PROTO(numparams), LJ_TNIL); if (op == BC_JFUNCV) { - dasm_put(Dst, 15841, BC_JLOOP); + dasm_put(Dst, 15894, BC_JLOOP); } else { - dasm_put(Dst, 15969, -4+PC2PROTO(k)); + dasm_put(Dst, 16022, -4+PC2PROTO(k)); } - dasm_put(Dst, 15994, LJ_TNIL); + dasm_put(Dst, 16047, LJ_TNIL); break; case BC_FUNCC: case BC_FUNCCW: - dasm_put(Dst, 16016, Dt8(->f), Dt1(->base), 8*LUA_MINSTACK, Dt1(->maxstack), Dt1(->top)); + dasm_put(Dst, 16069, Dt8(->f), Dt1(->base), 8*LUA_MINSTACK, Dt1(->maxstack), Dt1(->top)); if (op == BC_FUNCC) { - dasm_put(Dst, 2404); + dasm_put(Dst, 2424); } else { - dasm_put(Dst, 16046); + dasm_put(Dst, 16099); } - dasm_put(Dst, 16054, DISPATCH_GL(vmstate), ~LJ_VMST_C); + dasm_put(Dst, 16107, DISPATCH_GL(vmstate), ~LJ_VMST_C); if (op == BC_FUNCC) { - dasm_put(Dst, 16064); + dasm_put(Dst, 16117); } else { - dasm_put(Dst, 16069, DISPATCH_GL(wrapf)); + dasm_put(Dst, 16122, DISPATCH_GL(wrapf)); } - dasm_put(Dst, 16075, DISPATCH_GL(vmstate), ~LJ_VMST_INTERP, Dt1(->base), Dt1(->top)); + dasm_put(Dst, 16128, DISPATCH_GL(vmstate), ~LJ_VMST_INTERP, Dt1(->base), Dt1(->top)); break; /* ---------------------------------------------------------------------- */ @@ -3003,7 +3020,7 @@ static int build_backend(BuildCtx *ctx) build_subroutines(ctx, cmov, sse); - dasm_put(Dst, 16101); + dasm_put(Dst, 16154); for (op = 0; op < BC__MAX; op++) build_ins(ctx, (BCOp)op, op, cmov, sse); diff --git a/src/buildvm_x64win.h b/src/buildvm_x64win.h index 9e6c72bb..bb813284 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[15958] = { +static const unsigned char build_actionlist[16011] = { 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,129,252,246,239,252,247,198,237, @@ -89,73 +89,74 @@ static const unsigned char build_actionlist[15958] = { 252,252,137,68,36,32,139,108,36,96,137,149,233,137,202,137,252,233,137,116, 36,100,232,251,1,6,139,149,233,133,192,15,132,244,42,248,44,137,193,41,208, 137,113,252,244,141,176,233,184,237,252,233,244,28,248,56,139,108,36,96,137, - 149,233,141,20,194,137,252,233,137,116,36,100,232,251,1,7,139,149,233,252, - 233,244,44,248,57,141,76,202,8,248,29,137,76,36,84,137,68,36,80,131,252,233, - 8,139,108,36,96,137,149,233,255,137,202,68,141,4,193,137,252,233,137,116, + 149,233,141,20,194,137,252,233,137,116,36,100,232,251,1,7,139,149,233,255, + 133,192,15,133,244,44,15,183,70,252,254,139,12,194,252,233,244,57,255,252, + 233,244,44,255,248,58,141,76,202,8,248,29,137,76,36,84,137,68,36,80,131,252, + 233,8,139,108,36,96,137,149,233,137,202,68,141,4,193,137,252,233,137,116, 36,100,232,251,1,8,139,149,233,139,76,36,84,139,68,36,80,139,105,252,248, - 131,192,1,57,215,15,132,244,58,137,202,137,114,252,252,139,181,233,139,14, - 15,182,252,233,15,182,205,131,198,4,252,255,36,252,235,248,59,139,108,36, + 131,192,1,57,215,15,132,244,59,137,202,137,114,252,252,139,181,233,139,14, + 15,182,252,233,15,182,205,131,198,4,252,255,36,252,235,248,60,139,108,36, 96,137,149,233,137,202,137,252,233,137,116,36,100,232,251,1,9,139,149,233, 139,70,252,252,15,182,204,15,182,232,193,232,16,252,255,164,253,252,235,233, - 248,60,129,252,248,239,15,130,244,61,139,106,4,129,252,253,239,15,131,244, - 61,139,114,252,252,137,68,36,84,137,106,252,252,139,42,137,106,252,248,131, - 232,2,15,132,244,248,137,209,248,1,131,193,8,72,139,41,72,137,105,252,248, - 131,232,1,15,133,244,1,248,2,255,139,68,36,84,252,233,244,62,248,63,129,252, - 248,239,15,130,244,61,139,106,4,137,252,233,193,252,249,15,131,252,249,252, + 248,61,129,252,248,239,15,130,244,62,139,106,4,129,252,253,239,15,131,244, + 62,139,114,252,252,137,68,36,84,137,106,252,252,139,42,137,106,252,248,131, + 232,2,15,132,244,248,255,137,209,248,1,131,193,8,72,139,41,72,137,105,252, + 248,131,232,1,15,133,244,1,248,2,139,68,36,84,252,233,244,63,248,64,129,252, + 248,239,15,130,244,62,139,106,4,137,252,233,193,252,249,15,131,252,249,252, 254,15,132,244,249,184,237,252,247,213,57,232,255,15,71,197,255,15,134,244, 247,137,232,248,1,255,248,2,139,106,252,248,139,132,253,197,233,139,114,252, - 252,199,66,252,252,237,137,66,252,248,252,233,244,64,248,3,184,237,252,233, - 244,2,248,65,129,252,248,239,15,130,244,61,139,106,4,139,114,252,252,129, + 252,199,66,252,252,237,137,66,252,248,252,233,244,65,248,3,184,237,252,233, + 244,2,248,66,129,252,248,239,15,130,244,62,139,106,4,139,114,252,252,129, 252,253,239,15,133,244,252,248,1,139,42,139,173,233,248,2,133,252,237,199, - 66,252,252,237,255,15,132,244,64,139,131,233,199,66,252,252,237,137,106,252, + 66,252,252,237,255,15,132,244,65,139,131,233,199,66,252,252,237,137,106,252, 248,139,141,233,35,136,233,105,201,239,3,141,233,248,3,129,185,233,239,15, 133,244,250,57,129,233,15,132,244,251,248,4,139,137,233,133,201,15,133,244, - 3,255,252,233,244,64,248,5,139,105,4,129,252,253,239,15,132,244,64,139,1, - 137,106,252,252,137,66,252,248,252,233,244,64,248,6,129,252,253,239,15,132, + 3,255,252,233,244,65,248,5,139,105,4,129,252,253,239,15,132,244,65,139,1, + 137,106,252,252,137,66,252,248,252,233,244,65,248,6,129,252,253,239,15,132, 244,1,129,252,253,239,15,135,244,254,129,252,253,239,15,134,244,253,189,237, 252,233,244,254,248,7,255,189,237,248,8,252,247,213,139,172,253,171,233,252, - 233,244,2,248,66,129,252,248,239,15,130,244,61,129,122,253,4,239,15,133,244, - 61,139,42,131,189,233,0,15,133,244,61,129,122,253,12,239,15,133,244,61,139, + 233,244,2,248,67,129,252,248,239,15,130,244,62,129,122,253,4,239,15,133,244, + 62,139,42,131,189,233,0,15,133,244,62,129,122,253,12,239,15,133,244,62,139, 66,8,137,133,233,139,114,252,252,199,66,252,252,237,255,137,106,252,248,252, 246,133,233,235,15,132,244,247,128,165,233,235,139,131,233,137,171,233,137, - 133,233,248,1,252,233,244,64,248,67,129,252,248,239,15,130,244,61,129,122, - 253,4,239,15,133,244,61,137,213,68,141,66,8,139,18,139,76,36,96,232,251,1, - 10,137,252,234,72,139,40,139,114,252,252,72,137,106,252,248,252,233,244,64, - 248,68,255,129,252,248,239,15,133,244,61,129,122,253,4,239,255,15,133,244, - 247,139,42,252,233,244,69,248,1,15,135,244,61,255,15,131,244,61,255,252,242, - 15,16,2,252,233,244,70,255,221,2,252,233,244,71,255,248,72,129,252,248,239, - 15,130,244,61,139,114,252,252,129,122,253,4,239,15,133,244,249,139,2,248, - 2,199,66,252,252,237,137,66,252,248,252,233,244,64,248,3,129,122,253,4,239, - 15,135,244,61,131,187,233,0,15,133,244,61,139,171,233,59,171,233,255,15,130, - 244,247,232,244,73,248,1,139,108,36,96,137,149,233,137,116,36,100,137,252, - 233,255,232,251,1,11,255,232,251,1,12,255,139,149,233,252,233,244,2,248,74, - 129,252,248,239,15,130,244,61,15,132,244,248,248,1,129,122,253,4,239,15,133, - 244,61,139,108,36,96,137,149,233,137,149,233,139,114,252,252,68,141,66,8, + 133,233,248,1,252,233,244,65,248,68,129,252,248,239,15,130,244,62,129,122, + 253,4,239,15,133,244,62,137,213,68,141,66,8,139,18,139,76,36,96,232,251,1, + 10,137,252,234,72,139,40,139,114,252,252,72,137,106,252,248,252,233,244,65, + 248,69,255,129,252,248,239,15,133,244,62,129,122,253,4,239,255,15,133,244, + 247,139,42,252,233,244,70,248,1,15,135,244,62,255,15,131,244,62,255,252,242, + 15,16,2,252,233,244,71,255,221,2,252,233,244,72,255,248,73,129,252,248,239, + 15,130,244,62,139,114,252,252,129,122,253,4,239,15,133,244,249,139,2,248, + 2,199,66,252,252,237,137,66,252,248,252,233,244,65,248,3,129,122,253,4,239, + 15,135,244,62,131,187,233,0,15,133,244,62,139,171,233,59,171,233,255,15,130, + 244,247,232,244,74,248,1,139,108,36,96,137,149,233,137,116,36,100,137,252, + 233,255,232,251,1,11,255,232,251,1,12,255,139,149,233,252,233,244,2,248,75, + 129,252,248,239,15,130,244,62,15,132,244,248,248,1,129,122,253,4,239,15,133, + 244,62,139,108,36,96,137,149,233,137,149,233,139,114,252,252,68,141,66,8, 139,18,137,252,233,137,116,36,100,232,251,1,13,139,149,233,133,192,15,132, - 244,249,72,139,106,8,72,139,66,16,72,137,106,252,248,72,137,2,248,75,184, - 237,255,252,233,244,76,248,2,199,66,12,237,252,233,244,1,248,3,199,66,252, - 252,237,252,233,244,64,248,77,129,252,248,239,15,130,244,61,139,42,129,122, - 253,4,239,15,133,244,61,255,131,189,233,0,15,133,244,61,255,139,106,252,248, + 244,249,72,139,106,8,72,139,66,16,72,137,106,252,248,72,137,2,248,76,184, + 237,255,252,233,244,77,248,2,199,66,12,237,252,233,244,1,248,3,199,66,252, + 252,237,252,233,244,65,248,78,129,252,248,239,15,130,244,62,139,42,129,122, + 253,4,239,15,133,244,62,255,131,189,233,0,15,133,244,62,255,139,106,252,248, 139,133,233,139,114,252,252,199,66,252,252,237,137,66,252,248,199,66,12,237, - 184,237,252,233,244,76,248,78,129,252,248,239,15,130,244,61,129,122,253,4, - 239,15,133,244,61,129,122,253,12,239,255,139,114,252,252,255,139,66,8,131, + 184,237,252,233,244,77,248,79,129,252,248,239,15,130,244,62,129,122,253,4, + 239,15,133,244,62,129,122,253,12,239,255,139,114,252,252,255,139,66,8,131, 192,1,199,66,252,252,237,137,66,252,248,255,252,242,15,16,66,8,72,189,237, 237,102,72,15,110,205,252,242,15,88,193,252,242,15,45,192,252,242,15,17,66, 252,248,255,139,42,59,133,233,15,131,244,248,193,224,3,3,133,233,248,1,129, - 120,253,4,239,15,132,244,79,72,139,40,72,137,42,252,233,244,75,248,2,131, - 189,233,0,15,132,244,79,137,252,233,137,213,137,194,232,251,1,14,137,252, - 234,133,192,15,133,244,1,248,79,184,237,252,233,244,76,248,80,255,139,106, + 120,253,4,239,15,132,244,80,72,139,40,72,137,42,252,233,244,76,248,2,131, + 189,233,0,15,132,244,80,137,252,233,137,213,137,194,232,251,1,14,137,252, + 234,133,192,15,133,244,1,248,80,184,237,252,233,244,77,248,81,255,139,106, 252,248,139,133,233,139,114,252,252,199,66,252,252,237,137,66,252,248,255, 199,66,12,237,199,66,8,0,0,0,0,255,15,87,192,252,242,15,17,66,8,255,217,252, - 238,221,90,8,255,184,237,252,233,244,76,248,81,129,252,248,239,15,130,244, - 61,141,74,8,131,232,1,190,237,248,1,15,182,171,233,193,252,237,235,131,229, - 1,1,252,238,252,233,244,28,248,82,129,252,248,239,15,130,244,61,129,122,253, - 12,239,15,133,244,61,255,139,106,4,137,106,12,199,66,4,237,139,42,139,114, - 8,137,106,8,137,50,141,74,16,131,232,2,190,237,252,233,244,1,248,83,129,252, - 248,239,15,130,244,61,139,42,139,114,252,252,137,116,36,100,137,108,36,80, - 129,122,253,4,239,15,133,244,61,72,131,189,233,0,15,133,244,61,128,189,233, - 235,15,135,244,61,139,141,233,15,132,244,247,255,59,141,233,15,132,244,61, - 248,1,141,116,193,252,240,59,181,233,15,135,244,61,137,181,233,139,108,36, + 238,221,90,8,255,184,237,252,233,244,77,248,82,129,252,248,239,15,130,244, + 62,141,74,8,131,232,1,190,237,248,1,15,182,171,233,193,252,237,235,131,229, + 1,1,252,238,252,233,244,28,248,83,129,252,248,239,15,130,244,62,129,122,253, + 12,239,15,133,244,62,255,139,106,4,137,106,12,199,66,4,237,139,42,139,114, + 8,137,106,8,137,50,141,74,16,131,232,2,190,237,252,233,244,1,248,84,129,252, + 248,239,15,130,244,62,139,42,139,114,252,252,137,116,36,100,137,108,36,80, + 129,122,253,4,239,15,133,244,62,72,131,189,233,0,15,133,244,62,128,189,233, + 235,15,135,244,62,139,141,233,15,132,244,247,255,59,141,233,15,132,244,62, + 248,1,141,116,193,252,240,59,181,233,15,135,244,62,137,181,233,139,108,36, 96,137,149,233,131,194,8,137,149,233,141,108,194,232,72,41,252,245,57,206, 15,132,244,249,248,2,72,139,4,46,72,137,70,252,248,131,252,238,8,57,206,15, 133,244,2,248,3,137,202,139,76,36,80,232,244,25,199,131,233,237,255,139,108, @@ -167,10 +168,10 @@ static const unsigned char build_actionlist[15958] = { 252,255,252,247,198,237,255,15,132,244,13,252,233,244,14,248,8,199,66,252, 252,237,139,142,233,131,252,233,8,137,142,233,72,139,1,72,137,2,184,237,252, 233,244,7,248,9,139,76,36,80,137,185,233,137,252,242,137,252,233,232,251, - 1,0,139,116,36,80,139,149,233,252,233,244,4,248,84,139,106,252,248,139,173, + 1,0,139,116,36,80,139,149,233,252,233,244,4,248,85,139,106,252,248,139,173, 233,139,114,252,252,137,116,36,100,137,108,36,80,72,131,189,233,0,15,133, - 244,61,255,128,189,233,235,15,135,244,61,139,141,233,15,132,244,247,59,141, - 233,15,132,244,61,248,1,141,116,193,252,248,59,181,233,15,135,244,61,137, + 244,62,255,128,189,233,235,15,135,244,62,139,141,233,15,132,244,247,59,141, + 233,15,132,244,62,248,1,141,116,193,252,248,59,181,233,15,135,244,62,137, 181,233,139,108,36,96,137,149,233,137,149,233,141,108,194,252,240,72,41,252, 245,57,206,15,132,244,249,248,2,255,72,139,4,46,72,137,70,252,248,131,252, 238,8,57,206,15,133,244,2,248,3,137,202,139,76,36,80,232,244,25,199,131,233, @@ -181,210 +182,210 @@ static const unsigned char build_actionlist[15958] = { 7,139,116,36,100,137,68,36,84,49,201,252,247,198,237,15,132,244,13,252,233, 244,14,248,8,137,252,242,137,252,233,232,251,1,15,248,9,139,76,36,80,137, 185,233,137,252,242,137,252,233,232,251,1,0,139,116,36,80,139,149,233,252, - 233,244,4,248,85,139,108,36,96,72,252,247,133,233,237,15,132,244,61,255,137, + 233,244,4,248,86,139,108,36,96,72,252,247,133,233,237,15,132,244,62,255,137, 149,233,141,68,194,252,248,137,133,233,49,192,72,137,133,233,176,235,136, - 133,233,252,233,244,16,255,248,69,255,248,71,139,114,252,252,221,90,252,248, - 252,233,244,64,255,248,86,129,252,248,239,15,130,244,61,255,129,122,253,4, - 239,15,133,244,248,139,42,131,252,253,0,15,137,244,69,252,247,221,15,136, - 244,247,248,87,248,69,139,114,252,252,199,66,252,252,237,137,106,252,248, - 252,233,244,64,248,1,139,114,252,252,199,66,252,252,0,0,224,65,199,66,252, - 248,0,0,0,0,252,233,244,64,248,2,15,135,244,61,255,129,122,253,4,239,15,131, - 244,61,255,252,242,15,16,2,72,184,237,237,102,72,15,110,200,15,84,193,248, - 70,139,114,252,252,252,242,15,17,66,252,248,255,221,2,217,225,248,70,248, - 71,139,114,252,252,221,90,252,248,255,248,64,184,237,248,76,137,68,36,84, - 248,62,252,247,198,237,15,133,244,253,248,5,56,70,252,255,15,135,244,252, + 133,233,252,233,244,16,255,248,70,255,248,72,139,114,252,252,221,90,252,248, + 252,233,244,65,255,248,87,129,252,248,239,15,130,244,62,255,129,122,253,4, + 239,15,133,244,248,139,42,131,252,253,0,15,137,244,70,252,247,221,15,136, + 244,247,248,88,248,70,139,114,252,252,199,66,252,252,237,137,106,252,248, + 252,233,244,65,248,1,139,114,252,252,199,66,252,252,0,0,224,65,199,66,252, + 248,0,0,0,0,252,233,244,65,248,2,15,135,244,62,255,129,122,253,4,239,15,131, + 244,62,255,252,242,15,16,2,72,184,237,237,102,72,15,110,200,15,84,193,248, + 71,139,114,252,252,252,242,15,17,66,252,248,255,221,2,217,225,248,71,248, + 72,139,114,252,252,221,90,252,248,255,248,65,184,237,248,77,137,68,36,84, + 248,63,252,247,198,237,15,133,244,253,248,5,56,70,252,255,15,135,244,252, 15,182,78,252,253,72,252,247,209,141,20,202,139,6,15,182,204,15,182,232,131, 198,4,193,232,16,252,255,36,252,235,248,6,199,68,194,252,244,237,131,192, 1,252,233,244,5,248,7,72,199,193,252,248,252,255,252,255,252,255,252,233, - 244,14,248,88,255,129,122,253,4,239,15,133,244,247,139,42,252,233,244,69, - 248,1,15,135,244,61,255,252,242,15,16,2,232,244,89,255,252,242,15,45,232, - 129,252,253,0,0,0,128,15,133,244,69,252,242,15,42,205,102,15,46,193,15,138, - 244,70,15,132,244,69,255,221,2,232,244,89,255,248,90,255,252,242,15,16,2, - 232,244,91,255,221,2,232,244,91,255,248,92,129,252,248,239,15,130,244,61, - 129,122,253,4,239,15,131,244,61,252,242,15,81,2,252,233,244,70,255,248,92, - 129,252,248,239,15,130,244,61,129,122,253,4,239,15,131,244,61,221,2,217,252, - 250,252,233,244,71,255,248,93,129,252,248,239,15,130,244,61,129,122,253,4, - 239,15,131,244,61,217,252,237,221,2,217,252,241,252,233,244,71,248,94,129, - 252,248,239,15,130,244,61,129,122,253,4,239,15,131,244,61,217,252,236,221, - 2,217,252,241,252,233,244,71,248,95,129,252,248,239,255,15,130,244,61,129, - 122,253,4,239,15,131,244,61,221,2,232,244,96,252,233,244,71,248,97,129,252, - 248,239,15,130,244,61,129,122,253,4,239,15,131,244,61,221,2,217,252,254,252, - 233,244,71,248,98,129,252,248,239,255,15,130,244,61,129,122,253,4,239,15, - 131,244,61,221,2,217,252,255,252,233,244,71,248,99,129,252,248,239,15,130, - 244,61,129,122,253,4,239,15,131,244,61,221,2,217,252,242,221,216,252,233, - 244,71,248,100,129,252,248,239,15,130,244,61,255,129,122,253,4,239,15,131, - 244,61,221,2,217,192,216,200,217,232,222,225,217,252,250,217,252,243,252, - 233,244,71,248,101,129,252,248,239,15,130,244,61,129,122,253,4,239,15,131, - 244,61,221,2,217,192,216,200,217,232,222,225,217,252,250,217,201,217,252, - 243,252,233,244,71,248,102,129,252,248,239,15,130,244,61,129,122,253,4,239, - 15,131,244,61,255,221,2,217,232,217,252,243,252,233,244,71,255,248,103,129, - 252,248,239,15,130,244,61,129,122,253,4,239,15,131,244,61,252,242,15,16,2, - 255,137,213,232,251,1,16,137,252,234,252,233,244,70,255,248,104,129,252,248, - 239,15,130,244,61,129,122,253,4,239,15,131,244,61,252,242,15,16,2,255,137, - 213,232,251,1,17,137,252,234,252,233,244,70,255,248,105,129,252,248,239,15, - 130,244,61,129,122,253,4,239,15,131,244,61,252,242,15,16,2,255,137,213,232, - 251,1,18,137,252,234,252,233,244,70,248,106,255,248,107,129,252,248,239,15, - 130,244,61,129,122,253,4,239,15,131,244,61,252,242,15,16,2,139,106,252,248, - 252,242,15,89,133,233,252,233,244,70,255,248,107,129,252,248,239,15,130,244, - 61,129,122,253,4,239,15,131,244,61,221,2,139,106,252,248,220,141,233,252, - 233,244,71,255,248,108,129,252,248,239,15,130,244,61,129,122,253,4,239,15, - 131,244,61,129,122,253,12,239,15,131,244,61,221,2,221,66,8,217,252,243,252, - 233,244,71,248,109,129,252,248,239,15,130,244,61,129,122,253,4,239,15,131, - 244,61,129,122,253,12,239,255,15,131,244,61,221,66,8,221,2,217,252,253,221, - 217,252,233,244,71,248,110,129,252,248,239,15,130,244,61,139,106,4,129,252, - 253,239,15,131,244,61,139,114,252,252,139,2,137,106,252,252,137,66,252,248, + 244,14,248,89,255,129,122,253,4,239,15,133,244,247,139,42,252,233,244,70, + 248,1,15,135,244,62,255,252,242,15,16,2,232,244,90,255,252,242,15,45,232, + 129,252,253,0,0,0,128,15,133,244,70,252,242,15,42,205,102,15,46,193,15,138, + 244,71,15,132,244,70,255,221,2,232,244,90,255,248,91,255,252,242,15,16,2, + 232,244,92,255,221,2,232,244,92,255,248,93,129,252,248,239,15,130,244,62, + 129,122,253,4,239,15,131,244,62,252,242,15,81,2,252,233,244,71,255,248,93, + 129,252,248,239,15,130,244,62,129,122,253,4,239,15,131,244,62,221,2,217,252, + 250,252,233,244,72,255,248,94,129,252,248,239,15,130,244,62,129,122,253,4, + 239,15,131,244,62,217,252,237,221,2,217,252,241,252,233,244,72,248,95,129, + 252,248,239,15,130,244,62,129,122,253,4,239,15,131,244,62,217,252,236,221, + 2,217,252,241,252,233,244,72,248,96,129,252,248,239,255,15,130,244,62,129, + 122,253,4,239,15,131,244,62,221,2,232,244,97,252,233,244,72,248,98,129,252, + 248,239,15,130,244,62,129,122,253,4,239,15,131,244,62,221,2,217,252,254,252, + 233,244,72,248,99,129,252,248,239,255,15,130,244,62,129,122,253,4,239,15, + 131,244,62,221,2,217,252,255,252,233,244,72,248,100,129,252,248,239,15,130, + 244,62,129,122,253,4,239,15,131,244,62,221,2,217,252,242,221,216,252,233, + 244,72,248,101,129,252,248,239,15,130,244,62,255,129,122,253,4,239,15,131, + 244,62,221,2,217,192,216,200,217,232,222,225,217,252,250,217,252,243,252, + 233,244,72,248,102,129,252,248,239,15,130,244,62,129,122,253,4,239,15,131, + 244,62,221,2,217,192,216,200,217,232,222,225,217,252,250,217,201,217,252, + 243,252,233,244,72,248,103,129,252,248,239,15,130,244,62,129,122,253,4,239, + 15,131,244,62,255,221,2,217,232,217,252,243,252,233,244,72,255,248,104,129, + 252,248,239,15,130,244,62,129,122,253,4,239,15,131,244,62,252,242,15,16,2, + 255,137,213,232,251,1,16,137,252,234,252,233,244,71,255,248,105,129,252,248, + 239,15,130,244,62,129,122,253,4,239,15,131,244,62,252,242,15,16,2,255,137, + 213,232,251,1,17,137,252,234,252,233,244,71,255,248,106,129,252,248,239,15, + 130,244,62,129,122,253,4,239,15,131,244,62,252,242,15,16,2,255,137,213,232, + 251,1,18,137,252,234,252,233,244,71,248,107,255,248,108,129,252,248,239,15, + 130,244,62,129,122,253,4,239,15,131,244,62,252,242,15,16,2,139,106,252,248, + 252,242,15,89,133,233,252,233,244,71,255,248,108,129,252,248,239,15,130,244, + 62,129,122,253,4,239,15,131,244,62,221,2,139,106,252,248,220,141,233,252, + 233,244,72,255,248,109,129,252,248,239,15,130,244,62,129,122,253,4,239,15, + 131,244,62,129,122,253,12,239,15,131,244,62,221,2,221,66,8,217,252,243,252, + 233,244,72,248,110,129,252,248,239,15,130,244,62,129,122,253,4,239,15,131, + 244,62,129,122,253,12,239,255,15,131,244,62,221,66,8,221,2,217,252,253,221, + 217,252,233,244,72,248,111,129,252,248,239,15,130,244,62,139,106,4,129,252, + 253,239,15,131,244,62,139,114,252,252,139,2,137,106,252,252,137,66,252,248, 209,229,129,252,253,0,0,224,252,255,15,131,244,249,9,232,15,132,244,249,184, 252,254,3,0,0,129,252,253,0,0,32,0,15,130,244,250,248,1,193,252,237,21,41, 197,255,252,242,15,42,197,255,137,108,36,80,219,68,36,80,255,139,106,252, 252,129,229,252,255,252,255,15,128,129,205,0,0,224,63,137,106,252,252,248, - 2,255,252,242,15,17,2,255,221,26,255,184,237,252,233,244,76,248,3,255,15, + 2,255,252,242,15,17,2,255,221,26,255,184,237,252,233,244,77,248,3,255,15, 87,192,252,233,244,2,255,217,252,238,252,233,244,2,255,248,4,255,252,242, 15,16,2,72,189,237,237,102,72,15,110,205,252,242,15,89,193,252,242,15,17, 66,252,248,255,221,2,199,68,36,80,0,0,128,90,216,76,36,80,221,90,252,248, - 255,139,106,252,252,184,52,4,0,0,209,229,252,233,244,1,255,248,111,129,252, - 248,239,15,130,244,61,129,122,253,4,239,15,131,244,61,252,242,15,16,2,255, - 248,111,129,252,248,239,15,130,244,61,129,122,253,4,239,15,131,244,61,221, + 255,139,106,252,252,184,52,4,0,0,209,229,252,233,244,1,255,248,112,129,252, + 248,239,15,130,244,62,129,122,253,4,239,15,131,244,62,252,242,15,16,2,255, + 248,112,129,252,248,239,15,130,244,62,129,122,253,4,239,15,131,244,62,221, 2,255,139,106,4,139,114,252,252,209,229,129,252,253,0,0,224,252,255,15,132, - 244,250,255,15,40,224,232,244,112,252,242,15,92,224,248,1,252,242,15,17,66, - 252,248,252,242,15,17,34,255,217,192,232,244,112,220,252,233,248,1,221,90, + 244,250,255,15,40,224,232,244,113,252,242,15,92,224,248,1,252,242,15,17,66, + 252,248,252,242,15,17,34,255,217,192,232,244,113,220,252,233,248,1,221,90, 252,248,221,26,255,139,66,252,252,139,106,4,49,232,15,136,244,249,248,2,184, - 237,252,233,244,76,248,3,129,252,245,0,0,0,128,137,106,4,252,233,244,2,248, + 237,252,233,244,77,248,3,129,252,245,0,0,0,128,137,106,4,252,233,244,2,248, 4,255,15,87,228,252,233,244,1,255,217,252,238,217,201,252,233,244,1,255,248, - 113,129,252,248,239,15,130,244,61,129,122,253,4,239,15,131,244,61,129,122, - 253,12,239,15,131,244,61,221,66,8,221,2,248,1,217,252,248,223,224,158,15, - 138,244,1,221,217,252,233,244,71,255,248,114,129,252,248,239,15,130,244,61, - 129,122,253,4,239,15,131,244,61,129,122,253,12,239,15,131,244,61,252,242, - 15,16,2,252,242,15,16,74,8,232,244,115,252,233,244,70,255,248,114,129,252, - 248,239,15,130,244,61,129,122,253,4,239,15,131,244,61,129,122,253,12,239, - 15,131,244,61,221,2,221,66,8,232,244,115,252,233,244,71,255,248,116,185,2, + 114,129,252,248,239,15,130,244,62,129,122,253,4,239,15,131,244,62,129,122, + 253,12,239,15,131,244,62,221,66,8,221,2,248,1,217,252,248,223,224,158,15, + 138,244,1,221,217,252,233,244,72,255,248,115,129,252,248,239,15,130,244,62, + 129,122,253,4,239,15,131,244,62,129,122,253,12,239,15,131,244,62,252,242, + 15,16,2,252,242,15,16,74,8,232,244,116,252,233,244,71,255,248,115,129,252, + 248,239,15,130,244,62,129,122,253,4,239,15,131,244,62,129,122,253,12,239, + 15,131,244,62,221,2,221,66,8,232,244,116,252,233,244,72,255,248,117,185,2, 0,0,0,129,122,253,4,239,255,15,133,244,250,139,42,248,1,57,193,15,131,244, - 69,129,124,253,202,252,252,239,15,133,244,249,59,108,202,252,248,15,79,108, - 202,252,248,131,193,1,252,233,244,1,248,3,15,135,244,61,255,252,233,244,252, - 248,4,15,135,244,61,255,252,242,15,16,2,248,5,57,193,15,131,244,70,129,124, - 253,202,252,252,239,255,15,130,244,252,15,135,244,61,252,242,15,42,76,202, + 70,129,124,253,202,252,252,239,15,133,244,249,59,108,202,252,248,15,79,108, + 202,252,248,131,193,1,252,233,244,1,248,3,15,135,244,62,255,252,233,244,252, + 248,4,15,135,244,62,255,252,242,15,16,2,248,5,57,193,15,131,244,71,129,124, + 253,202,252,252,239,255,15,130,244,252,15,135,244,62,252,242,15,42,76,202, 252,248,252,233,244,253,255,248,6,252,242,15,16,76,202,252,248,248,7,252, - 242,15,93,193,131,193,1,252,233,244,5,255,248,117,185,2,0,0,0,129,122,253, - 4,239,255,15,133,244,250,139,42,248,1,57,193,15,131,244,69,129,124,253,202, + 242,15,93,193,131,193,1,252,233,244,5,255,248,118,185,2,0,0,0,129,122,253, + 4,239,255,15,133,244,250,139,42,248,1,57,193,15,131,244,70,129,124,253,202, 252,252,239,15,133,244,249,59,108,202,252,248,15,76,108,202,252,248,131,193, - 1,252,233,244,1,248,3,15,135,244,61,255,248,6,252,242,15,16,76,202,252,248, + 1,252,233,244,1,248,3,15,135,244,62,255,248,6,252,242,15,16,76,202,252,248, 248,7,252,242,15,95,193,131,193,1,252,233,244,5,255,248,9,221,216,252,233, - 244,61,255,248,118,129,252,248,239,15,130,244,61,129,122,253,4,239,15,133, - 244,61,139,42,255,139,173,233,252,233,244,69,255,252,242,15,42,133,233,252, - 233,244,70,255,219,133,233,252,233,244,71,255,248,119,129,252,248,239,15, - 133,244,61,129,122,253,4,239,15,133,244,61,139,42,139,114,252,252,131,189, - 233,1,15,130,244,79,15,182,173,233,255,252,242,15,42,197,252,233,244,70,255, - 137,108,36,80,219,68,36,80,252,233,244,71,255,248,120,139,171,233,59,171, - 233,15,130,244,247,232,244,73,248,1,129,252,248,239,15,133,244,61,129,122, - 253,4,239,255,15,133,244,61,139,42,129,252,253,252,255,0,0,0,15,135,244,61, - 137,108,36,84,255,15,131,244,61,252,242,15,44,42,129,252,253,252,255,0,0, - 0,15,135,244,61,137,108,36,84,255,15,131,244,61,221,2,219,92,36,84,129,124, - 36,84,252,255,0,0,0,15,135,244,61,255,199,68,36,32,1,0,0,0,72,141,68,36,84, - 248,121,139,108,36,96,137,149,233,68,139,68,36,32,72,137,194,137,252,233, + 244,62,255,248,119,129,252,248,239,15,130,244,62,129,122,253,4,239,15,133, + 244,62,139,42,255,139,173,233,252,233,244,70,255,252,242,15,42,133,233,252, + 233,244,71,255,219,133,233,252,233,244,72,255,248,120,129,252,248,239,15, + 133,244,62,129,122,253,4,239,15,133,244,62,139,42,139,114,252,252,131,189, + 233,1,15,130,244,80,15,182,173,233,255,252,242,15,42,197,252,233,244,71,255, + 137,108,36,80,219,68,36,80,252,233,244,72,255,248,121,139,171,233,59,171, + 233,15,130,244,247,232,244,74,248,1,129,252,248,239,15,133,244,62,129,122, + 253,4,239,255,15,133,244,62,139,42,129,252,253,252,255,0,0,0,15,135,244,62, + 137,108,36,84,255,15,131,244,62,252,242,15,44,42,129,252,253,252,255,0,0, + 0,15,135,244,62,137,108,36,84,255,15,131,244,62,221,2,219,92,36,84,129,124, + 36,84,252,255,0,0,0,15,135,244,62,255,199,68,36,32,1,0,0,0,72,141,68,36,84, + 248,122,139,108,36,96,137,149,233,68,139,68,36,32,72,137,194,137,252,233, 137,116,36,100,232,251,1,19,139,149,233,139,114,252,252,199,66,252,252,237, - 137,66,252,248,252,233,244,64,248,122,139,171,233,59,171,233,15,130,244,247, - 232,244,73,248,1,199,68,36,84,252,255,252,255,252,255,252,255,129,252,248, - 239,15,130,244,61,15,134,244,247,129,122,253,20,239,255,15,133,244,61,139, - 106,16,137,108,36,84,255,15,131,244,61,252,242,15,44,106,16,137,108,36,84, - 255,15,131,244,61,221,66,16,219,92,36,84,255,248,1,129,122,253,4,239,15,133, - 244,61,129,122,253,12,239,255,139,42,137,108,36,32,139,173,233,255,139,74, + 137,66,252,248,252,233,244,65,248,123,139,171,233,59,171,233,15,130,244,247, + 232,244,74,248,1,199,68,36,84,252,255,252,255,252,255,252,255,129,252,248, + 239,15,130,244,62,15,134,244,247,129,122,253,20,239,255,15,133,244,62,139, + 106,16,137,108,36,84,255,15,131,244,62,252,242,15,44,106,16,137,108,36,84, + 255,15,131,244,62,221,66,16,219,92,36,84,255,248,1,129,122,253,4,239,15,133, + 244,62,129,122,253,12,239,255,139,42,137,108,36,32,139,173,233,255,139,74, 8,255,252,242,15,44,74,8,255,139,68,36,84,57,197,15,130,244,251,248,2,133, - 201,15,142,244,253,248,3,139,108,36,32,41,200,15,140,244,123,141,172,253, - 13,233,131,192,1,248,4,137,68,36,32,137,232,252,233,244,121,248,5,15,140, + 201,15,142,244,253,248,3,139,108,36,32,41,200,15,140,244,124,141,172,253, + 13,233,131,192,1,248,4,137,68,36,32,137,232,252,233,244,122,248,5,15,140, 244,252,141,68,40,1,252,233,244,2,248,6,137,232,252,233,244,2,248,7,255,15, 132,244,254,1,252,233,131,193,1,15,143,244,3,248,8,185,1,0,0,0,252,233,244, - 3,248,123,49,192,252,233,244,4,248,124,129,252,248,239,15,130,244,61,139, - 171,233,59,171,233,15,130,244,247,232,244,73,248,1,255,129,122,253,4,239, - 15,133,244,61,129,122,253,12,239,139,42,255,15,133,244,61,139,66,8,255,15, - 131,244,61,252,242,15,44,66,8,255,15,131,244,61,221,66,8,219,92,36,84,139, - 68,36,84,255,133,192,15,142,244,123,131,189,233,1,15,130,244,123,15,133,244, - 125,57,131,233,15,130,244,125,15,182,141,233,139,171,233,137,68,36,32,248, - 1,136,77,0,131,197,1,131,232,1,15,133,244,1,139,131,233,252,233,244,121,248, - 126,129,252,248,239,255,15,130,244,61,139,171,233,59,171,233,15,130,244,247, - 232,244,73,248,1,129,122,253,4,239,15,133,244,61,139,42,139,133,233,133,192, - 15,132,244,123,57,131,233,15,130,244,127,129,197,239,137,116,36,84,137,68, + 3,248,124,49,192,252,233,244,4,248,125,129,252,248,239,15,130,244,62,139, + 171,233,59,171,233,15,130,244,247,232,244,74,248,1,255,129,122,253,4,239, + 15,133,244,62,129,122,253,12,239,139,42,255,15,133,244,62,139,66,8,255,15, + 131,244,62,252,242,15,44,66,8,255,15,131,244,62,221,66,8,219,92,36,84,139, + 68,36,84,255,133,192,15,142,244,124,131,189,233,1,15,130,244,124,15,133,244, + 126,57,131,233,15,130,244,126,15,182,141,233,139,171,233,137,68,36,32,248, + 1,136,77,0,131,197,1,131,232,1,15,133,244,1,139,131,233,252,233,244,122,248, + 127,129,252,248,239,255,15,130,244,62,139,171,233,59,171,233,15,130,244,247, + 232,244,74,248,1,129,122,253,4,239,15,133,244,62,139,42,139,133,233,133,192, + 15,132,244,124,57,131,233,15,130,244,128,129,197,239,137,116,36,84,137,68, 36,32,139,179,233,248,1,255,15,182,77,0,131,197,1,131,232,1,136,12,6,15,133, - 244,1,137,252,240,139,116,36,84,252,233,244,121,248,128,129,252,248,239,15, - 130,244,61,139,171,233,59,171,233,15,130,244,247,232,244,73,248,1,129,122, - 253,4,239,15,133,244,61,139,42,139,133,233,57,131,233,255,15,130,244,127, + 244,1,137,252,240,139,116,36,84,252,233,244,122,248,129,129,252,248,239,15, + 130,244,62,139,171,233,59,171,233,15,130,244,247,232,244,74,248,1,129,122, + 253,4,239,15,133,244,62,139,42,139,133,233,57,131,233,255,15,130,244,128, 129,197,239,137,116,36,84,137,68,36,32,139,179,233,252,233,244,249,248,1, 15,182,76,5,0,131,252,249,65,15,130,244,248,131,252,249,90,15,135,244,248, 131,252,241,32,248,2,136,12,6,248,3,131,232,1,15,137,244,1,137,252,240,139, - 116,36,84,252,233,244,121,248,129,129,252,248,239,15,130,244,61,255,139,171, - 233,59,171,233,15,130,244,247,232,244,73,248,1,129,122,253,4,239,15,133,244, - 61,139,42,139,133,233,57,131,233,15,130,244,127,129,197,239,137,116,36,84, + 116,36,84,252,233,244,122,248,130,129,252,248,239,15,130,244,62,255,139,171, + 233,59,171,233,15,130,244,247,232,244,74,248,1,129,122,253,4,239,15,133,244, + 62,139,42,139,133,233,57,131,233,15,130,244,128,129,197,239,137,116,36,84, 137,68,36,32,139,179,233,252,233,244,249,248,1,15,182,76,5,0,131,252,249, 97,15,130,244,248,255,131,252,249,122,15,135,244,248,131,252,241,32,248,2, 136,12,6,248,3,131,232,1,15,137,244,1,137,252,240,139,116,36,84,252,233,244, - 121,248,130,129,252,248,239,15,130,244,61,129,122,253,4,239,15,133,244,61, - 137,213,139,10,232,251,1,20,137,252,234,255,137,197,252,233,244,69,255,252, - 242,15,42,192,252,233,244,70,255,248,131,129,252,248,239,15,130,244,61,129, - 122,253,4,239,255,15,133,244,247,139,42,252,233,244,87,248,1,15,135,244,61, + 122,248,131,129,252,248,239,15,130,244,62,129,122,253,4,239,15,133,244,62, + 137,213,139,10,232,251,1,20,137,252,234,255,137,197,252,233,244,70,255,252, + 242,15,42,192,252,233,244,71,255,248,132,129,252,248,239,15,130,244,62,129, + 122,253,4,239,255,15,133,244,247,139,42,252,233,244,88,248,1,15,135,244,62, 255,252,242,15,16,2,72,189,237,237,102,72,15,110,205,252,242,15,88,193,102, - 15,126,197,255,252,233,244,87,255,248,132,129,252,248,239,15,130,244,61,255, + 15,126,197,255,252,233,244,88,255,248,133,129,252,248,239,15,130,244,62,255, 72,189,237,237,102,72,15,110,205,255,199,68,36,80,0,0,192,89,255,15,133,244, - 247,139,42,252,233,244,248,248,1,15,135,244,61,255,252,242,15,16,2,252,242, + 247,139,42,252,233,244,248,248,1,15,135,244,62,255,252,242,15,16,2,252,242, 15,88,193,102,15,126,197,255,248,2,137,68,36,84,141,68,194,252,240,248,1, - 57,208,15,134,244,87,129,120,253,4,239,255,15,133,244,248,35,40,131,232,8, - 252,233,244,1,248,2,15,135,244,133,255,15,131,244,133,255,252,242,15,16,0, - 252,242,15,88,193,102,15,126,193,33,205,255,131,232,8,252,233,244,1,248,134, - 129,252,248,239,15,130,244,61,255,15,133,244,248,11,40,131,232,8,252,233, - 244,1,248,2,15,135,244,133,255,252,242,15,16,0,252,242,15,88,193,102,15,126, - 193,9,205,255,131,232,8,252,233,244,1,248,135,129,252,248,239,15,130,244, - 61,255,15,133,244,248,51,40,131,232,8,252,233,244,1,248,2,15,135,244,133, + 57,208,15,134,244,88,129,120,253,4,239,255,15,133,244,248,35,40,131,232,8, + 252,233,244,1,248,2,15,135,244,134,255,15,131,244,134,255,252,242,15,16,0, + 252,242,15,88,193,102,15,126,193,33,205,255,131,232,8,252,233,244,1,248,135, + 129,252,248,239,15,130,244,62,255,15,133,244,248,11,40,131,232,8,252,233, + 244,1,248,2,15,135,244,134,255,252,242,15,16,0,252,242,15,88,193,102,15,126, + 193,9,205,255,131,232,8,252,233,244,1,248,136,129,252,248,239,15,130,244, + 62,255,15,133,244,248,51,40,131,232,8,252,233,244,1,248,2,15,135,244,134, 255,252,242,15,16,0,252,242,15,88,193,102,15,126,193,49,205,255,131,232,8, - 252,233,244,1,248,136,129,252,248,239,15,130,244,61,129,122,253,4,239,255, - 248,2,15,205,252,233,244,87,248,137,129,252,248,239,15,130,244,61,129,122, - 253,4,239,255,248,2,252,247,213,255,248,87,252,242,15,42,197,252,233,244, - 70,255,248,133,139,68,36,84,252,233,244,61,255,248,138,129,252,248,239,15, - 130,244,61,129,122,253,4,239,255,248,2,129,122,253,12,239,15,133,244,61,139, - 74,8,255,248,138,129,252,248,239,15,130,244,61,129,122,253,4,239,15,131,244, - 61,129,122,253,12,239,15,131,244,61,252,242,15,16,2,252,242,15,16,74,8,72, + 252,233,244,1,248,137,129,252,248,239,15,130,244,62,129,122,253,4,239,255, + 248,2,15,205,252,233,244,88,248,138,129,252,248,239,15,130,244,62,129,122, + 253,4,239,255,248,2,252,247,213,255,248,88,252,242,15,42,197,252,233,244, + 71,255,248,134,139,68,36,84,252,233,244,62,255,248,139,129,252,248,239,15, + 130,244,62,129,122,253,4,239,255,248,2,129,122,253,12,239,15,133,244,62,139, + 74,8,255,248,139,129,252,248,239,15,130,244,62,129,122,253,4,239,15,131,244, + 62,129,122,253,12,239,15,131,244,62,252,242,15,16,2,252,242,15,16,74,8,72, 189,237,237,102,72,15,110,213,252,242,15,88,194,252,242,15,88,202,102,15, - 126,197,102,15,126,201,255,211,229,252,233,244,87,255,248,139,129,252,248, - 239,15,130,244,61,129,122,253,4,239,255,248,139,129,252,248,239,15,130,244, - 61,129,122,253,4,239,15,131,244,61,129,122,253,12,239,15,131,244,61,252,242, + 126,197,102,15,126,201,255,211,229,252,233,244,88,255,248,140,129,252,248, + 239,15,130,244,62,129,122,253,4,239,255,248,140,129,252,248,239,15,130,244, + 62,129,122,253,4,239,15,131,244,62,129,122,253,12,239,15,131,244,62,252,242, 15,16,2,252,242,15,16,74,8,72,189,237,237,102,72,15,110,213,252,242,15,88, 194,252,242,15,88,202,102,15,126,197,102,15,126,201,255,211,252,237,252,233, - 244,87,255,248,140,129,252,248,239,15,130,244,61,129,122,253,4,239,255,248, - 140,129,252,248,239,15,130,244,61,129,122,253,4,239,15,131,244,61,129,122, - 253,12,239,15,131,244,61,252,242,15,16,2,252,242,15,16,74,8,72,189,237,237, + 244,88,255,248,141,129,252,248,239,15,130,244,62,129,122,253,4,239,255,248, + 141,129,252,248,239,15,130,244,62,129,122,253,4,239,15,131,244,62,129,122, + 253,12,239,15,131,244,62,252,242,15,16,2,252,242,15,16,74,8,72,189,237,237, 102,72,15,110,213,252,242,15,88,194,252,242,15,88,202,102,15,126,197,102, - 15,126,201,255,211,252,253,252,233,244,87,255,248,141,129,252,248,239,15, - 130,244,61,129,122,253,4,239,255,248,141,129,252,248,239,15,130,244,61,129, - 122,253,4,239,15,131,244,61,129,122,253,12,239,15,131,244,61,252,242,15,16, + 15,126,201,255,211,252,253,252,233,244,88,255,248,142,129,252,248,239,15, + 130,244,62,129,122,253,4,239,255,248,142,129,252,248,239,15,130,244,62,129, + 122,253,4,239,15,131,244,62,129,122,253,12,239,15,131,244,62,252,242,15,16, 2,252,242,15,16,74,8,72,189,237,237,102,72,15,110,213,252,242,15,88,194,252, - 242,15,88,202,102,15,126,197,102,15,126,201,255,211,197,252,233,244,87,255, - 248,142,129,252,248,239,15,130,244,61,129,122,253,4,239,255,248,142,129,252, - 248,239,15,130,244,61,129,122,253,4,239,15,131,244,61,129,122,253,12,239, - 15,131,244,61,252,242,15,16,2,252,242,15,16,74,8,72,189,237,237,102,72,15, + 242,15,88,202,102,15,126,197,102,15,126,201,255,211,197,252,233,244,88,255, + 248,143,129,252,248,239,15,130,244,62,129,122,253,4,239,255,248,143,129,252, + 248,239,15,130,244,62,129,122,253,4,239,15,131,244,62,129,122,253,12,239, + 15,131,244,62,252,242,15,16,2,252,242,15,16,74,8,72,189,237,237,102,72,15, 110,213,252,242,15,88,194,252,242,15,88,202,102,15,126,197,102,15,126,201, - 255,211,205,252,233,244,87,248,125,184,237,252,233,244,61,248,127,184,237, - 248,61,139,108,36,96,139,114,252,252,137,116,36,100,137,149,233,141,68,194, + 255,211,205,252,233,244,88,248,126,184,237,252,233,244,62,248,128,184,237, + 248,62,139,108,36,96,139,114,252,252,137,116,36,100,137,149,233,141,68,194, 252,248,141,136,233,137,133,233,139,66,252,248,59,141,233,15,135,244,251, - 137,252,233,252,255,144,233,139,149,233,133,192,15,143,244,76,248,1,255,139, + 137,252,233,252,255,144,233,139,149,233,133,192,15,143,244,77,248,1,255,139, 141,233,41,209,193,252,233,3,133,192,141,65,1,139,106,252,248,15,133,244, 32,139,181,233,139,14,15,182,252,233,15,182,205,131,198,4,252,255,36,252, 235,248,32,137,209,252,247,198,237,15,133,244,249,15,182,110,252,253,72,252, 247,213,141,20,252,234,252,233,244,28,248,3,137,252,245,131,229,252,248,41, 252,234,252,233,244,28,248,5,186,237,137,252,233,232,251,1,0,139,149,233, - 49,192,252,233,244,1,248,73,93,72,137,108,36,32,139,108,36,96,137,116,36, + 49,192,252,233,244,1,248,74,93,72,137,108,36,32,139,108,36,96,137,116,36, 100,137,149,233,255,141,68,194,252,248,137,252,233,137,133,233,232,251,1, 21,139,149,233,139,133,233,41,208,193,232,3,131,192,1,72,139,108,36,32,85, - 195,248,143,255,15,182,131,233,168,235,15,133,244,251,168,235,15,133,244, - 247,168,235,15,132,244,247,252,255,139,233,252,233,244,247,255,248,144,15, - 182,131,233,168,235,15,133,244,251,252,233,244,247,248,145,15,182,131,233, + 195,248,144,255,15,182,131,233,168,235,15,133,244,251,168,235,15,133,244, + 247,168,235,15,132,244,247,252,255,139,233,252,233,244,247,255,248,145,15, + 182,131,233,168,235,15,133,244,251,252,233,244,247,248,146,15,182,131,233, 168,235,15,133,244,251,168,235,15,132,244,251,252,255,139,233,15,132,244, 247,168,235,15,132,244,251,248,1,255,139,108,36,96,137,149,233,137,252,242, 137,252,233,232,251,1,22,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,146, - 131,198,4,139,77,232,137,76,36,84,252,233,244,4,248,147,255,139,106,252,248, + 15,182,110,252,252,15,183,70,252,254,252,255,164,253,252,235,233,248,147, + 131,198,4,139,77,232,137,76,36,84,252,233,244,4,248,148,255,139,106,252,248, 139,173,233,15,182,133,233,141,4,194,139,108,36,96,137,149,233,137,133,233, 137,252,242,141,139,233,72,137,171,233,137,116,36,100,232,251,1,23,252,233, - 244,3,255,248,148,137,116,36,100,255,248,149,255,137,116,36,100,131,206,1, + 244,3,255,248,149,137,116,36,100,255,248,150,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,24,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,150,255,65,85,65,84,65,83,65,82,65,81,65, + 232,3,131,192,1,252,255,229,248,151,255,65,85,65,84,65,83,65,82,65,81,65, 80,87,86,85,72,141,108,36,88,85,83,82,81,80,15,182,69,252,248,138,101,252, 240,76,137,125,252,248,76,137,117,252,240,139,93,0,139,139,233,199,131,233, 237,137,131,233,137,139,233,72,129,252,236,239,72,131,197,128,252,242,68, @@ -395,7 +396,7 @@ static const unsigned char build_actionlist[15958] = { 152,252,242,15,17,85,144,252,242,15,17,77,136,252,242,15,17,69,128,139,171, 233,139,147,233,72,137,171,233,199,131,233,0,0,0,0,137,149,233,72,141,148, 253,36,233,141,139,233,232,251,1,25,72,139,141,233,72,129,225,239,137,169, - 233,139,149,233,139,177,233,252,233,244,247,255,248,151,255,72,141,140,253, + 233,139,149,233,139,177,233,252,233,244,247,255,248,152,255,72,141,140,253, 36,233,248,1,102,68,15,111,185,233,102,68,15,111,177,233,102,68,15,111,169, 233,102,68,15,111,161,233,102,68,15,111,153,233,102,68,15,111,145,233,102, 68,15,111,137,233,102,68,15,111,129,233,102,15,111,185,233,72,137,204,102, @@ -403,26 +404,26 @@ static const unsigned char build_actionlist[15958] = { 80,133,192,15,136,244,249,137,68,36,84,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,129,252,253,239,15,130,244,248,255,139,68,36,84,248,2,252,255, - 36,252,235,248,3,252,247,216,137,252,233,137,194,232,251,1,26,255,248,89, + 36,252,235,248,3,252,247,216,137,252,233,137,194,232,251,1,26,255,248,90, 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,152,72,184,237,237,102,72,15,110,208,72,184,237,237,102,72,15,110, + 255,248,153,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,91,255,217,124,36,4,137,68,36,8,102,184,0,8,102,11,68,36,4,102,37, + 195,248,92,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,153,72,184,237,237,102,72,15,110,208,72,184,237,237,102, + 68,36,8,195,255,248,154,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,112,255,217,124,36,4,137,68,36,8,102,184,0,12,102,11,68, + 193,248,1,195,248,113,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,154,72,184,237,237,102,72,15,110,208,72,184,237,237,102,72,15,110, + 255,248,155,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,155,255,15,40,232,252,242,15,94,193,72,184,237,237,102, + 193,248,1,195,248,156,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, @@ -430,12 +431,12 @@ static const unsigned char build_actionlist[15958] = { 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,96,217,252,234,222,201,248,156,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,157,217,192,217, + 248,97,217,252,234,222,201,248,157,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,158,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,115,255,248,158,252,242,15, + 248,1,195,248,2,221,216,217,252,238,195,255,248,116,255,248,159,252,242,15, 45,193,252,242,15,42,208,102,15,46,202,15,133,244,254,15,138,244,255,248, - 159,131,252,248,1,15,142,244,252,248,1,169,1,0,0,0,15,133,244,248,252,242, + 160,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, @@ -451,28 +452,28 @@ static const unsigned char build_actionlist[15958] = { 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,160,255, - 131,252,250,1,15,130,244,89,15,132,244,91,131,252,250,3,15,130,244,112,15, + 192,195,248,5,102,15,80,193,133,192,15,132,244,3,15,87,192,195,248,161,255, + 131,252,250,1,15,130,244,90,15,132,244,92,131,252,250,3,15,130,244,113,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,96,80,252,233,244, - 253,248,1,232,244,156,255,80,252,233,244,253,248,2,131,252,250,7,15,132,244, + 131,252,250,5,15,135,244,248,88,15,132,244,247,232,244,97,80,252,233,244, + 253,248,1,232,244,157,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,89,15,132,244,91,131,252,250,3,15,130,244,112,15,135,244,248,217, - 252,250,195,248,2,131,252,250,5,15,130,244,96,15,132,244,156,131,252,250, + 15,130,244,90,15,132,244,92,131,252,250,3,15,130,244,113,15,135,244,248,217, + 252,250,195,248,2,131,252,250,5,15,130,244,97,15,132,244,157,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,255,248,161,255,65,131,252,248,1,15,132, + 252,242,221,216,195,255,248,9,204,255,248,162,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,155,15,132, - 244,115,65,131,252,248,7,15,132,244,247,15,135,244,248,72,184,237,237,255, + 248,1,252,242,15,94,193,195,248,2,65,131,252,248,5,15,130,244,156,15,132, + 244,116,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, @@ -481,21 +482,21 @@ static const unsigned char build_actionlist[15958] = { 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,155,15,132, - 244,115,131,252,248,7,15,132,244,247,15,135,244,248,255,221,216,217,224,195, + 222,201,195,248,1,222,252,249,195,248,2,131,252,248,5,15,130,244,156,15,132, + 244,116,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,162,137,200,86,72,137,214,83,15, - 162,137,6,137,94,4,137,78,8,137,86,12,91,94,195,248,163,255,85,72,137,229, + 244,248,217,201,248,2,221,216,195,255,248,163,137,200,86,72,137,214,83,15, + 162,137,6,137,94,4,137,78,8,137,86,12,91,94,195,248,164,255,85,72,137,229, 83,72,137,203,139,131,233,72,41,196,255,15,182,139,233,131,252,233,1,15,136, 244,248,248,1,72,139,132,253,203,233,72,137,132,253,204,233,131,252,233,1, 15,137,244,1,248,2,15,182,131,233,72,139,139,233,72,139,147,233,76,139,131, 233,76,139,139,233,133,192,15,132,244,251,15,40,131,233,15,40,139,233,15, 40,147,233,15,40,155,233,248,5,255,252,255,147,233,72,137,131,233,15,41,131, - 233,255,72,139,93,252,248,201,195,255,248,164,255,249,255,129,124,253,202, + 233,255,72,139,93,252,248,201,195,255,248,165,255,249,255,129,124,253,202, 4,239,15,133,244,253,129,124,253,194,4,239,15,133,244,254,139,44,202,131, 198,4,59,44,194,255,15,141,244,255,255,15,140,244,255,255,15,143,244,255, 255,15,142,244,255,255,248,6,15,183,70,252,254,141,180,253,134,233,248,9, @@ -555,238 +556,240 @@ static const unsigned char build_actionlist[15958] = { 133,244,248,139,4,194,255,139,128,233,248,1,199,68,202,4,237,137,4,202,255, 15,87,192,252,242,15,42,128,233,248,1,252,242,15,17,4,202,255,219,128,233, 248,1,221,28,202,255,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252, - 255,36,252,235,248,2,129,124,253,194,4,239,15,133,244,56,139,12,194,137,213, - 232,251,1,20,255,252,242,15,42,192,255,137,252,234,15,182,78,252,253,252, - 233,244,1,255,15,182,252,236,15,182,192,255,129,124,253,252,234,4,239,15, - 133,244,50,129,124,253,199,4,239,15,133,244,50,139,44,252,234,3,44,199,15, + 255,36,252,235,248,2,129,124,253,194,4,239,15,133,244,56,139,12,194,255,139, + 169,233,131,252,253,0,15,133,244,255,248,3,255,248,57,137,213,232,251,1,20, + 255,252,242,15,42,192,255,137,252,234,15,182,78,252,253,252,233,244,1,255, + 248,9,252,246,133,233,235,15,133,244,3,252,233,244,56,255,15,182,252,236, + 15,182,192,255,129,124,253,252,234,4,239,15,133,244,50,129,124,253,199,4, + 239,15,133,244,50,139,44,252,234,3,44,199,15,128,244,49,255,129,124,253,252, + 234,4,239,15,133,244,52,129,124,253,199,4,239,15,133,244,52,139,4,199,3,4, + 252,234,15,128,244,51,255,129,124,253,252,234,4,239,15,133,244,55,129,124, + 253,194,4,239,15,133,244,55,139,44,252,234,3,44,194,15,128,244,54,255,199, + 68,202,4,237,255,129,124,253,252,234,4,239,15,131,244,50,255,129,124,253, + 199,4,239,15,131,244,50,255,252,242,15,16,4,252,234,252,242,15,88,4,199,255, + 221,4,252,234,220,4,199,255,129,124,253,252,234,4,239,15,131,244,52,255,129, + 124,253,199,4,239,15,131,244,52,255,252,242,15,16,4,199,252,242,15,88,4,252, + 234,255,221,4,199,220,4,252,234,255,129,124,253,252,234,4,239,15,131,244, + 55,129,124,253,194,4,239,15,131,244,55,255,252,242,15,16,4,252,234,252,242, + 15,88,4,194,255,221,4,252,234,220,4,194,255,129,124,253,252,234,4,239,15, + 133,244,50,129,124,253,199,4,239,15,133,244,50,139,44,252,234,43,44,199,15, 128,244,49,255,129,124,253,252,234,4,239,15,133,244,52,129,124,253,199,4, - 239,15,133,244,52,139,4,199,3,4,252,234,15,128,244,51,255,129,124,253,252, + 239,15,133,244,52,139,4,199,43,4,252,234,15,128,244,51,255,129,124,253,252, 234,4,239,15,133,244,55,129,124,253,194,4,239,15,133,244,55,139,44,252,234, - 3,44,194,15,128,244,54,255,199,68,202,4,237,255,129,124,253,252,234,4,239, - 15,131,244,50,255,129,124,253,199,4,239,15,131,244,50,255,252,242,15,16,4, - 252,234,252,242,15,88,4,199,255,221,4,252,234,220,4,199,255,129,124,253,252, - 234,4,239,15,131,244,52,255,129,124,253,199,4,239,15,131,244,52,255,252,242, - 15,16,4,199,252,242,15,88,4,252,234,255,221,4,199,220,4,252,234,255,129,124, - 253,252,234,4,239,15,131,244,55,129,124,253,194,4,239,15,131,244,55,255,252, - 242,15,16,4,252,234,252,242,15,88,4,194,255,221,4,252,234,220,4,194,255,129, - 124,253,252,234,4,239,15,133,244,50,129,124,253,199,4,239,15,133,244,50,139, - 44,252,234,43,44,199,15,128,244,49,255,129,124,253,252,234,4,239,15,133,244, - 52,129,124,253,199,4,239,15,133,244,52,139,4,199,43,4,252,234,15,128,244, - 51,255,129,124,253,252,234,4,239,15,133,244,55,129,124,253,194,4,239,15,133, - 244,55,139,44,252,234,43,44,194,15,128,244,54,255,252,242,15,16,4,252,234, - 252,242,15,92,4,199,255,221,4,252,234,220,36,199,255,252,242,15,16,4,199, - 252,242,15,92,4,252,234,255,221,4,199,220,36,252,234,255,252,242,15,16,4, - 252,234,252,242,15,92,4,194,255,221,4,252,234,220,36,194,255,129,124,253, - 252,234,4,239,15,133,244,50,129,124,253,199,4,239,15,133,244,50,139,44,252, - 234,15,175,44,199,15,128,244,49,255,129,124,253,252,234,4,239,15,133,244, - 52,129,124,253,199,4,239,15,133,244,52,139,4,199,15,175,4,252,234,15,128, - 244,51,255,129,124,253,252,234,4,239,15,133,244,55,129,124,253,194,4,239, - 15,133,244,55,139,44,252,234,15,175,44,194,15,128,244,54,255,252,242,15,16, - 4,252,234,252,242,15,89,4,199,255,221,4,252,234,220,12,199,255,252,242,15, - 16,4,199,252,242,15,89,4,252,234,255,221,4,199,220,12,252,234,255,252,242, - 15,16,4,252,234,252,242,15,89,4,194,255,221,4,252,234,220,12,194,255,252, - 242,15,16,4,252,234,252,242,15,94,4,199,255,221,4,252,234,220,52,199,255, - 252,242,15,16,4,199,252,242,15,94,4,252,234,255,221,4,199,220,52,252,234, - 255,252,242,15,16,4,252,234,252,242,15,94,4,194,255,221,4,252,234,220,52, - 194,255,252,242,15,16,4,252,234,252,242,15,16,12,199,255,221,4,252,234,221, - 4,199,255,252,242,15,16,4,199,252,242,15,16,12,252,234,255,221,4,199,221, - 4,252,234,255,252,242,15,16,4,252,234,252,242,15,16,12,194,255,221,4,252, - 234,221,4,194,255,248,165,232,244,155,255,252,233,244,165,255,232,244,115, - 255,15,182,252,236,15,182,192,139,76,36,96,137,145,233,141,20,194,65,137, - 192,65,41,232,248,35,137,205,137,116,36,100,232,251,1,27,139,149,233,133, - 192,15,133,244,44,15,182,110,252,255,15,182,78,252,253,72,139,4,252,234,72, - 137,4,202,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,252, - 235,255,72,252,247,208,139,4,135,199,68,202,4,237,137,4,202,139,6,15,182, - 204,15,182,232,131,198,4,193,232,16,252,255,36,252,235,255,15,191,192,199, - 68,202,4,237,137,4,202,255,15,191,192,252,242,15,42,192,252,242,15,17,4,202, - 255,223,70,252,254,221,28,202,255,252,242,15,16,4,199,252,242,15,17,4,202, - 255,221,4,199,221,28,202,255,72,252,247,208,137,68,202,4,139,6,15,182,204, - 15,182,232,131,198,4,193,232,16,252,255,36,252,235,255,141,76,202,12,141, - 68,194,4,189,237,137,105,252,248,248,1,137,41,131,193,8,57,193,15,134,244, - 1,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,252,235,255, - 139,106,252,248,139,172,253,133,233,139,173,233,72,139,69,0,72,137,4,202, - 139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,252,235,255,139, - 106,252,248,139,172,253,141,233,128,189,233,0,139,173,233,139,12,194,139, - 68,194,4,137,77,0,137,69,4,15,132,244,247,252,246,133,233,235,15,133,244, - 248,248,1,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,252, - 235,248,2,129,232,239,129,252,248,239,15,134,244,1,252,246,129,233,235,15, - 132,244,1,135,213,141,139,233,255,232,251,1,28,137,252,234,252,233,244,1, - 255,72,252,247,208,139,106,252,248,139,172,253,141,233,139,12,135,139,133, - 233,137,8,199,64,4,237,252,246,133,233,235,15,133,244,248,248,1,139,6,15, - 182,204,15,182,232,131,198,4,193,232,16,252,255,36,252,235,248,2,252,246, - 129,233,235,15,132,244,1,128,189,233,0,15,132,244,1,137,213,137,194,141,139, - 233,232,251,1,28,137,252,234,252,233,244,1,255,139,106,252,248,255,252,242, - 15,16,4,199,255,139,172,253,141,233,139,141,233,255,252,242,15,17,1,255,221, - 25,255,72,252,247,208,139,106,252,248,139,172,253,141,233,139,141,233,137, - 65,4,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,252,235, - 255,141,180,253,134,233,139,108,36,96,131,189,233,0,15,132,244,247,137,149, - 233,141,20,202,137,252,233,232,251,1,29,139,149,233,248,1,139,6,15,182,204, - 15,182,232,131,198,4,193,232,16,252,255,36,252,235,255,72,252,247,208,139, - 108,36,96,137,149,233,68,139,66,252,248,139,20,135,137,252,233,137,116,36, - 100,232,251,1,30,139,149,233,15,182,78,252,253,137,4,202,199,68,202,4,237, - 139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,252,235,255,139, - 108,36,96,137,149,233,139,139,233,59,139,233,137,116,36,100,15,131,244,251, - 248,1,65,137,192,37,252,255,7,0,0,65,193,232,11,61,252,255,7,0,0,15,132,244, - 249,248,2,137,252,233,137,194,232,251,1,31,139,149,233,15,182,78,252,253, - 137,4,202,199,68,202,4,237,139,6,15,182,204,15,182,232,131,198,4,193,232, - 16,252,255,36,252,235,248,3,184,1,8,0,0,252,233,244,2,248,5,137,252,233,232, - 251,1,32,15,183,70,252,254,252,233,244,1,255,72,252,247,208,139,108,36,96, - 139,139,233,137,116,36,100,59,139,233,137,149,233,15,131,244,249,248,2,139, - 20,135,137,252,233,232,251,1,33,139,149,233,15,182,78,252,253,137,4,202,199, - 68,202,4,237,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36, - 252,235,248,3,137,252,233,232,251,1,32,15,183,70,252,254,72,252,247,208,252, - 233,244,2,255,72,252,247,208,139,106,252,248,139,173,233,139,4,135,252,233, - 244,166,255,72,252,247,208,139,106,252,248,139,173,233,139,4,135,252,233, - 244,167,255,15,182,252,236,15,182,192,129,124,253,252,234,4,239,15,133,244, - 38,139,44,252,234,255,129,124,253,194,4,239,15,133,244,251,139,4,194,255, - 129,124,253,194,4,239,15,131,244,251,255,252,242,15,16,4,194,252,242,15,45, - 192,252,242,15,42,200,102,15,46,193,255,15,133,244,38,255,59,133,233,15,131, - 244,38,193,224,3,3,133,233,129,120,253,4,239,15,132,244,248,72,139,40,72, - 137,44,202,248,1,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255, - 36,252,235,248,2,131,189,233,0,15,132,244,249,139,141,233,252,246,129,233, - 235,15,132,244,38,15,182,78,252,253,248,3,199,68,202,4,237,252,233,244,1, - 248,5,255,129,124,253,194,4,239,15,133,244,38,139,4,194,252,233,244,166,255, - 15,182,252,236,15,182,192,72,252,247,208,139,4,135,129,124,253,252,234,4, - 239,15,133,244,36,139,44,252,234,248,166,139,141,233,35,136,233,105,201,239, - 3,141,233,248,1,129,185,233,239,15,133,244,250,57,129,233,15,133,244,250, - 129,121,253,4,239,15,132,244,251,15,182,70,252,253,72,139,41,72,137,44,194, - 248,2,255,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,252, - 235,248,3,15,182,70,252,253,199,68,194,4,237,252,233,244,2,248,4,139,137, - 233,133,201,15,133,244,1,248,5,139,141,233,133,201,15,132,244,3,252,246,129, - 233,235,15,133,244,3,252,233,244,36,255,15,182,252,236,15,182,192,129,124, - 253,252,234,4,239,15,133,244,37,139,44,252,234,59,133,233,15,131,244,37,193, - 224,3,3,133,233,129,120,253,4,239,15,132,244,248,72,139,40,72,137,44,202, - 248,1,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,252,235, - 248,2,131,189,233,0,15,132,244,249,139,141,233,252,246,129,233,235,15,132, - 244,37,255,15,182,78,252,253,248,3,199,68,202,4,237,252,233,244,1,255,15, - 182,252,236,15,182,192,129,124,253,252,234,4,239,15,133,244,41,139,44,252, - 234,255,15,133,244,41,255,59,133,233,15,131,244,41,193,224,3,3,133,233,129, - 120,253,4,239,15,132,244,249,248,1,252,246,133,233,235,15,133,244,253,248, - 2,72,139,44,202,72,137,40,139,6,15,182,204,15,182,232,131,198,4,193,232,16, - 252,255,36,252,235,248,3,131,189,233,0,15,132,244,1,139,141,233,252,246,129, - 233,235,255,15,132,244,41,15,182,78,252,253,252,233,244,1,248,5,129,124,253, - 194,4,239,15,133,244,41,139,4,194,252,233,244,167,248,7,128,165,233,235,139, - 139,233,137,171,233,137,141,233,15,182,78,252,253,252,233,244,2,255,15,182, - 252,236,15,182,192,72,252,247,208,139,4,135,129,124,253,252,234,4,239,15, - 133,244,39,139,44,252,234,248,167,139,141,233,35,136,233,105,201,239,198, - 133,233,0,3,141,233,248,1,129,185,233,239,15,133,244,251,57,129,233,15,133, - 244,251,129,121,253,4,239,15,132,244,250,248,2,255,252,246,133,233,235,15, - 133,244,253,248,3,15,182,70,252,253,72,139,44,194,72,137,41,139,6,15,182, - 204,15,182,232,131,198,4,193,232,16,252,255,36,252,235,248,4,131,189,233, - 0,15,132,244,2,137,76,36,80,139,141,233,252,246,129,233,235,15,132,244,39, - 139,76,36,80,252,233,244,2,248,5,139,137,233,133,201,15,133,244,1,255,139, - 141,233,133,201,15,132,244,252,252,246,129,233,235,15,132,244,39,248,6,137, - 68,36,80,199,68,36,84,237,137,108,36,32,139,76,36,96,137,145,233,76,141,68, - 36,80,137,252,234,137,205,137,116,36,100,232,251,1,34,139,149,233,139,108, - 36,32,137,193,252,233,244,2,248,7,128,165,233,235,139,131,233,137,171,233, - 137,133,233,252,233,244,3,255,15,182,252,236,15,182,192,129,124,253,252,234, - 4,239,15,133,244,40,139,44,252,234,59,133,233,15,131,244,40,193,224,3,3,133, - 233,129,120,253,4,239,15,132,244,249,248,1,252,246,133,233,235,15,133,244, - 253,248,2,72,139,12,202,72,137,8,139,6,15,182,204,15,182,232,131,198,4,193, - 232,16,252,255,36,252,235,248,3,131,189,233,0,15,132,244,1,255,139,141,233, - 252,246,129,233,235,15,132,244,40,15,182,78,252,253,252,233,244,1,248,7,128, - 165,233,235,139,139,233,137,171,233,137,141,233,15,182,78,252,253,252,233, - 244,2,255,137,124,36,80,139,60,199,248,1,141,12,202,139,105,252,248,252,246, - 133,233,235,15,133,244,253,248,2,139,68,36,84,131,232,1,15,132,244,250,1, - 252,248,59,133,233,15,135,244,251,41,252,248,193,231,3,3,189,233,248,3,72, - 139,41,131,193,8,72,137,47,131,199,8,131,232,1,15,133,244,3,248,4,139,124, - 36,80,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,252,235, - 248,5,139,76,36,96,137,145,233,137,252,234,65,137,192,137,205,137,116,36, - 100,232,251,1,35,139,149,233,15,182,78,252,253,252,233,244,1,248,7,255,128, - 165,233,235,139,131,233,137,171,233,137,133,233,252,233,244,2,255,3,68,36, - 84,255,129,124,253,202,4,239,139,44,202,15,133,244,57,141,84,202,8,137,114, - 252,252,139,181,233,139,14,15,182,252,233,15,182,205,131,198,4,252,255,36, - 252,235,255,141,76,202,8,137,215,139,105,252,248,129,121,253,252,252,239, - 15,133,244,29,248,58,139,114,252,252,252,247,198,237,15,133,244,253,248,1, - 137,106,252,248,137,68,36,84,131,232,1,15,132,244,249,248,2,72,139,41,131, - 193,8,72,137,47,131,199,8,131,232,1,15,133,244,2,139,106,252,248,248,3,139, - 68,36,84,128,189,233,1,15,135,244,251,248,4,139,181,233,139,14,15,182,252, - 233,15,182,205,131,198,4,252,255,36,252,235,248,5,255,252,247,198,237,15, - 133,244,4,15,182,78,252,253,72,252,247,209,141,12,202,139,121,252,248,139, - 191,233,139,191,233,252,233,244,4,248,7,129,252,238,239,252,247,198,237,15, - 133,244,254,41,252,242,137,215,139,114,252,252,252,233,244,1,248,8,129,198, - 239,252,233,244,1,255,141,76,202,8,72,139,105,232,72,139,65,252,240,72,137, - 41,72,137,65,8,139,105,224,139,65,228,137,105,252,248,137,65,252,252,129, - 252,248,239,184,237,15,133,244,29,137,202,137,114,252,252,139,181,233,139, - 14,15,182,252,233,15,182,205,131,198,4,252,255,36,252,235,255,137,124,36, - 80,137,92,36,84,139,108,202,252,240,139,68,202,252,248,139,157,233,131,198, - 4,139,189,233,248,1,57,216,15,131,244,251,129,124,253,199,4,239,15,132,244, - 250,255,219,68,202,252,248,255,72,139,44,199,72,137,108,202,8,131,192,1,255, - 137,68,202,252,248,248,2,15,183,70,252,254,141,180,253,134,233,248,3,139, - 92,36,84,139,124,36,80,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252, - 255,36,252,235,248,4,131,192,1,255,137,68,202,252,248,255,252,233,244,1,248, - 5,41,216,248,6,59,133,233,15,135,244,3,105,252,248,239,3,189,233,129,191, - 233,239,15,132,244,253,141,92,24,1,72,139,175,233,72,139,135,233,72,137,44, - 202,72,137,68,202,8,137,92,202,252,248,252,233,244,2,248,7,131,192,1,252, - 233,244,6,255,129,124,253,202,252,236,239,15,133,244,251,139,108,202,232, - 129,124,253,202,252,244,239,15,133,244,251,129,124,253,202,252,252,239,15, - 133,244,251,128,189,233,235,15,133,244,251,141,180,253,134,233,199,68,202, - 252,248,0,0,0,0,248,1,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252, - 255,36,252,235,248,5,198,70,252,252,235,141,180,253,134,233,198,6,235,252, - 233,244,1,255,15,182,252,236,15,182,192,137,124,36,80,141,188,253,194,233, - 141,12,202,43,122,252,252,133,252,237,15,132,244,251,141,108,252,233,252, - 248,57,215,15,131,244,248,248,1,72,139,71,252,248,131,199,8,72,137,1,131, - 193,8,57,252,233,15,131,244,249,57,215,15,130,244,1,248,2,199,65,4,237,131, - 193,8,57,252,233,15,130,244,2,248,3,139,124,36,80,139,6,15,182,204,15,182, - 232,131,198,4,193,232,16,252,255,36,252,235,248,5,199,68,36,84,1,0,0,0,137, - 208,41,252,248,15,134,244,3,137,197,193,252,237,3,131,197,1,137,108,36,84, - 139,108,36,96,1,200,59,133,233,15,135,244,253,248,6,255,72,139,71,252,248, - 131,199,8,72,137,1,131,193,8,57,215,15,130,244,6,252,233,244,3,248,7,137, - 149,233,137,141,233,137,116,36,100,41,215,139,84,36,84,131,252,234,1,137, - 252,233,232,251,1,0,139,149,233,139,141,233,1,215,252,233,244,6,255,193,225, - 3,255,248,1,139,114,252,252,137,68,36,84,252,247,198,237,15,133,244,253,255, - 248,13,137,215,131,232,1,15,132,244,249,248,2,72,139,44,15,72,137,111,252, - 248,131,199,8,131,232,1,15,133,244,2,248,3,139,68,36,84,15,182,110,252,255, - 248,5,57,197,15,135,244,252,255,72,139,44,10,72,137,106,252,248,255,248,5, - 56,70,252,255,15,135,244,252,255,15,182,78,252,253,72,252,247,209,141,20, - 202,139,122,252,248,139,191,233,139,191,233,139,6,15,182,204,15,182,232,131, - 198,4,193,232,16,252,255,36,252,235,248,6,255,199,71,252,252,237,131,199, - 8,255,199,68,194,252,244,237,255,131,192,1,252,233,244,5,248,7,141,174,233, - 252,247,197,237,15,133,244,14,41,252,234,255,1,252,233,255,137,252,245,209, - 252,237,129,229,239,102,131,172,253,43,233,1,15,132,244,147,255,141,12,202, - 255,129,121,253,4,239,15,133,244,255,255,129,121,253,12,239,15,133,244,59, - 129,121,253,20,239,15,133,244,59,139,41,131,121,16,0,15,140,244,251,255,129, - 121,253,12,239,15,133,244,164,129,121,253,20,239,15,133,244,164,255,139,105, - 16,133,252,237,15,136,244,251,3,41,15,128,244,247,137,41,255,59,105,8,199, - 65,28,237,137,105,24,255,15,142,244,253,248,1,248,6,141,180,253,134,233,255, - 141,180,253,134,233,15,183,70,252,254,15,142,245,248,1,248,6,255,15,143,244, - 253,248,6,141,180,253,134,233,248,1,255,248,7,139,6,15,182,204,15,182,232, - 131,198,4,193,232,16,252,255,36,252,235,248,5,255,3,41,15,128,244,1,137,41, - 255,15,141,244,7,255,141,180,253,134,233,15,183,70,252,254,15,141,245,255, - 15,140,244,7,255,252,233,244,6,248,9,255,129,121,253,4,239,255,15,131,244, - 59,129,121,253,12,239,15,131,244,59,255,129,121,253,12,239,15,131,244,164, - 129,121,253,20,239,15,131,244,164,255,139,105,20,255,129,252,253,239,15,131, - 244,59,255,252,242,15,16,1,252,242,15,16,73,8,255,252,242,15,88,65,16,252, - 242,15,17,1,133,252,237,15,136,244,249,255,15,140,244,249,255,102,15,46,200, - 248,1,252,242,15,17,65,24,255,221,65,8,221,1,255,220,65,16,221,17,221,81, - 24,133,252,237,15,136,244,247,255,221,81,24,15,140,244,247,255,217,201,248, - 1,255,15,183,70,252,254,255,15,131,244,7,255,15,131,244,248,141,180,253,134, - 233,255,141,180,253,134,233,15,183,70,252,254,15,131,245,255,15,130,244,7, - 255,15,130,244,248,141,180,253,134,233,255,248,3,102,15,46,193,252,233,244, - 1,255,141,12,202,139,105,4,129,252,253,239,15,132,244,247,255,137,105,252, - 252,139,41,137,105,252,248,252,233,245,255,141,180,253,134,233,139,1,137, - 105,252,252,137,65,252,248,255,139,139,233,139,4,129,72,139,128,233,139,108, - 36,96,137,147,233,137,171,233,76,137,100,36,80,76,137,108,36,32,76,137,116, - 36,24,76,137,124,36,16,72,137,225,72,129,252,236,239,102,15,127,49,102,15, - 127,185,233,102,68,15,127,129,233,102,68,15,127,137,233,102,68,15,127,145, - 233,102,68,15,127,153,233,102,68,15,127,161,233,102,68,15,127,169,233,102, - 68,15,127,177,233,102,68,15,127,185,233,252,255,224,255,141,180,253,134,233, - 139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,252,235,255,137, - 252,245,209,252,237,129,229,239,102,131,172,253,43,233,1,15,132,244,149,255, - 139,190,233,139,108,36,96,141,12,202,59,141,233,15,135,244,24,15,182,142, - 233,57,200,15,134,244,249,248,2,255,15,183,70,252,254,252,233,245,255,248, - 3,199,68,194,252,252,237,131,192,1,57,200,15,134,244,3,252,233,244,2,255, - 141,44,197,237,141,4,194,139,122,252,248,137,104,252,252,137,120,252,248, - 139,108,36,96,141,12,200,59,141,233,15,135,244,23,137,209,137,194,15,182, - 174,233,133,252,237,15,132,244,248,248,1,131,193,8,57,209,15,131,244,249, - 139,121,252,248,137,56,139,121,252,252,137,120,4,131,192,8,199,65,252,252, - 237,131,252,237,1,15,133,244,1,248,2,255,139,190,233,139,6,15,182,204,15, - 182,232,131,198,4,193,232,16,252,255,36,252,235,255,248,3,199,64,4,237,131, - 192,8,131,252,237,1,15,133,244,3,252,233,244,2,255,139,106,252,248,72,139, - 189,233,139,108,36,96,141,68,194,252,248,137,149,233,141,136,233,59,141,233, - 137,133,233,255,72,137,252,250,137,252,233,255,15,135,244,22,199,131,233, - 237,255,252,255,215,255,252,255,147,233,255,199,131,233,237,139,149,233,141, - 12,194,252,247,217,3,141,233,139,114,252,252,252,233,244,12,255,254,0 + 43,44,194,15,128,244,54,255,252,242,15,16,4,252,234,252,242,15,92,4,199,255, + 221,4,252,234,220,36,199,255,252,242,15,16,4,199,252,242,15,92,4,252,234, + 255,221,4,199,220,36,252,234,255,252,242,15,16,4,252,234,252,242,15,92,4, + 194,255,221,4,252,234,220,36,194,255,129,124,253,252,234,4,239,15,133,244, + 50,129,124,253,199,4,239,15,133,244,50,139,44,252,234,15,175,44,199,15,128, + 244,49,255,129,124,253,252,234,4,239,15,133,244,52,129,124,253,199,4,239, + 15,133,244,52,139,4,199,15,175,4,252,234,15,128,244,51,255,129,124,253,252, + 234,4,239,15,133,244,55,129,124,253,194,4,239,15,133,244,55,139,44,252,234, + 15,175,44,194,15,128,244,54,255,252,242,15,16,4,252,234,252,242,15,89,4,199, + 255,221,4,252,234,220,12,199,255,252,242,15,16,4,199,252,242,15,89,4,252, + 234,255,221,4,199,220,12,252,234,255,252,242,15,16,4,252,234,252,242,15,89, + 4,194,255,221,4,252,234,220,12,194,255,252,242,15,16,4,252,234,252,242,15, + 94,4,199,255,221,4,252,234,220,52,199,255,252,242,15,16,4,199,252,242,15, + 94,4,252,234,255,221,4,199,220,52,252,234,255,252,242,15,16,4,252,234,252, + 242,15,94,4,194,255,221,4,252,234,220,52,194,255,252,242,15,16,4,252,234, + 252,242,15,16,12,199,255,221,4,252,234,221,4,199,255,252,242,15,16,4,199, + 252,242,15,16,12,252,234,255,221,4,199,221,4,252,234,255,252,242,15,16,4, + 252,234,252,242,15,16,12,194,255,221,4,252,234,221,4,194,255,248,166,232, + 244,156,255,252,233,244,166,255,232,244,116,255,15,182,252,236,15,182,192, + 139,76,36,96,137,145,233,141,20,194,65,137,192,65,41,232,248,35,137,205,137, + 116,36,100,232,251,1,27,139,149,233,133,192,15,133,244,44,15,182,110,252, + 255,15,182,78,252,253,72,139,4,252,234,72,137,4,202,139,6,15,182,204,15,182, + 232,131,198,4,193,232,16,252,255,36,252,235,255,72,252,247,208,139,4,135, + 199,68,202,4,237,137,4,202,139,6,15,182,204,15,182,232,131,198,4,193,232, + 16,252,255,36,252,235,255,15,191,192,199,68,202,4,237,137,4,202,255,15,191, + 192,252,242,15,42,192,252,242,15,17,4,202,255,223,70,252,254,221,28,202,255, + 252,242,15,16,4,199,252,242,15,17,4,202,255,221,4,199,221,28,202,255,72,252, + 247,208,137,68,202,4,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252, + 255,36,252,235,255,141,76,202,12,141,68,194,4,189,237,137,105,252,248,248, + 1,137,41,131,193,8,57,193,15,134,244,1,139,6,15,182,204,15,182,232,131,198, + 4,193,232,16,252,255,36,252,235,255,139,106,252,248,139,172,253,133,233,139, + 173,233,72,139,69,0,72,137,4,202,139,6,15,182,204,15,182,232,131,198,4,193, + 232,16,252,255,36,252,235,255,139,106,252,248,139,172,253,141,233,128,189, + 233,0,139,173,233,139,12,194,139,68,194,4,137,77,0,137,69,4,15,132,244,247, + 252,246,133,233,235,15,133,244,248,248,1,139,6,15,182,204,15,182,232,131, + 198,4,193,232,16,252,255,36,252,235,248,2,129,232,239,129,252,248,239,15, + 134,244,1,252,246,129,233,235,15,132,244,1,135,213,141,139,233,255,232,251, + 1,28,137,252,234,252,233,244,1,255,72,252,247,208,139,106,252,248,139,172, + 253,141,233,139,12,135,139,133,233,137,8,199,64,4,237,252,246,133,233,235, + 15,133,244,248,248,1,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252, + 255,36,252,235,248,2,252,246,129,233,235,15,132,244,1,128,189,233,0,15,132, + 244,1,137,213,137,194,141,139,233,232,251,1,28,137,252,234,252,233,244,1, + 255,139,106,252,248,255,252,242,15,16,4,199,255,139,172,253,141,233,139,141, + 233,255,252,242,15,17,1,255,221,25,255,72,252,247,208,139,106,252,248,139, + 172,253,141,233,139,141,233,137,65,4,139,6,15,182,204,15,182,232,131,198, + 4,193,232,16,252,255,36,252,235,255,141,180,253,134,233,139,108,36,96,131, + 189,233,0,15,132,244,247,137,149,233,141,20,202,137,252,233,232,251,1,29, + 139,149,233,248,1,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255, + 36,252,235,255,72,252,247,208,139,108,36,96,137,149,233,68,139,66,252,248, + 139,20,135,137,252,233,137,116,36,100,232,251,1,30,139,149,233,15,182,78, + 252,253,137,4,202,199,68,202,4,237,139,6,15,182,204,15,182,232,131,198,4, + 193,232,16,252,255,36,252,235,255,139,108,36,96,137,149,233,139,139,233,59, + 139,233,137,116,36,100,15,131,244,251,248,1,65,137,192,37,252,255,7,0,0,65, + 193,232,11,61,252,255,7,0,0,15,132,244,249,248,2,137,252,233,137,194,232, + 251,1,31,139,149,233,15,182,78,252,253,137,4,202,199,68,202,4,237,139,6,15, + 182,204,15,182,232,131,198,4,193,232,16,252,255,36,252,235,248,3,184,1,8, + 0,0,252,233,244,2,248,5,137,252,233,232,251,1,32,15,183,70,252,254,252,233, + 244,1,255,72,252,247,208,139,108,36,96,139,139,233,137,116,36,100,59,139, + 233,137,149,233,15,131,244,249,248,2,139,20,135,137,252,233,232,251,1,33, + 139,149,233,15,182,78,252,253,137,4,202,199,68,202,4,237,139,6,15,182,204, + 15,182,232,131,198,4,193,232,16,252,255,36,252,235,248,3,137,252,233,232, + 251,1,32,15,183,70,252,254,72,252,247,208,252,233,244,2,255,72,252,247,208, + 139,106,252,248,139,173,233,139,4,135,252,233,244,167,255,72,252,247,208, + 139,106,252,248,139,173,233,139,4,135,252,233,244,168,255,15,182,252,236, + 15,182,192,129,124,253,252,234,4,239,15,133,244,38,139,44,252,234,255,129, + 124,253,194,4,239,15,133,244,251,139,4,194,255,129,124,253,194,4,239,15,131, + 244,251,255,252,242,15,16,4,194,252,242,15,45,192,252,242,15,42,200,102,15, + 46,193,255,15,133,244,38,255,59,133,233,15,131,244,38,193,224,3,3,133,233, + 129,120,253,4,239,15,132,244,248,72,139,40,72,137,44,202,248,1,139,6,15,182, + 204,15,182,232,131,198,4,193,232,16,252,255,36,252,235,248,2,131,189,233, + 0,15,132,244,249,139,141,233,252,246,129,233,235,15,132,244,38,15,182,78, + 252,253,248,3,199,68,202,4,237,252,233,244,1,248,5,255,129,124,253,194,4, + 239,15,133,244,38,139,4,194,252,233,244,167,255,15,182,252,236,15,182,192, + 72,252,247,208,139,4,135,129,124,253,252,234,4,239,15,133,244,36,139,44,252, + 234,248,167,139,141,233,35,136,233,105,201,239,3,141,233,248,1,129,185,233, + 239,15,133,244,250,57,129,233,15,133,244,250,129,121,253,4,239,15,132,244, + 251,15,182,70,252,253,72,139,41,72,137,44,194,248,2,255,139,6,15,182,204, + 15,182,232,131,198,4,193,232,16,252,255,36,252,235,248,3,15,182,70,252,253, + 199,68,194,4,237,252,233,244,2,248,4,139,137,233,133,201,15,133,244,1,248, + 5,139,141,233,133,201,15,132,244,3,252,246,129,233,235,15,133,244,3,252,233, + 244,36,255,15,182,252,236,15,182,192,129,124,253,252,234,4,239,15,133,244, + 37,139,44,252,234,59,133,233,15,131,244,37,193,224,3,3,133,233,129,120,253, + 4,239,15,132,244,248,72,139,40,72,137,44,202,248,1,139,6,15,182,204,15,182, + 232,131,198,4,193,232,16,252,255,36,252,235,248,2,131,189,233,0,15,132,244, + 249,139,141,233,252,246,129,233,235,15,132,244,37,255,15,182,78,252,253,248, + 3,199,68,202,4,237,252,233,244,1,255,15,182,252,236,15,182,192,129,124,253, + 252,234,4,239,15,133,244,41,139,44,252,234,255,15,133,244,41,255,59,133,233, + 15,131,244,41,193,224,3,3,133,233,129,120,253,4,239,15,132,244,249,248,1, + 252,246,133,233,235,15,133,244,253,248,2,72,139,44,202,72,137,40,139,6,15, + 182,204,15,182,232,131,198,4,193,232,16,252,255,36,252,235,248,3,131,189, + 233,0,15,132,244,1,139,141,233,252,246,129,233,235,255,15,132,244,41,15,182, + 78,252,253,252,233,244,1,248,5,129,124,253,194,4,239,15,133,244,41,139,4, + 194,252,233,244,168,248,7,128,165,233,235,139,139,233,137,171,233,137,141, + 233,15,182,78,252,253,252,233,244,2,255,15,182,252,236,15,182,192,72,252, + 247,208,139,4,135,129,124,253,252,234,4,239,15,133,244,39,139,44,252,234, + 248,168,139,141,233,35,136,233,105,201,239,198,133,233,0,3,141,233,248,1, + 129,185,233,239,15,133,244,251,57,129,233,15,133,244,251,129,121,253,4,239, + 15,132,244,250,248,2,255,252,246,133,233,235,15,133,244,253,248,3,15,182, + 70,252,253,72,139,44,194,72,137,41,139,6,15,182,204,15,182,232,131,198,4, + 193,232,16,252,255,36,252,235,248,4,131,189,233,0,15,132,244,2,137,76,36, + 80,139,141,233,252,246,129,233,235,15,132,244,39,139,76,36,80,252,233,244, + 2,248,5,139,137,233,133,201,15,133,244,1,255,139,141,233,133,201,15,132,244, + 252,252,246,129,233,235,15,132,244,39,248,6,137,68,36,80,199,68,36,84,237, + 137,108,36,32,139,76,36,96,137,145,233,76,141,68,36,80,137,252,234,137,205, + 137,116,36,100,232,251,1,34,139,149,233,139,108,36,32,137,193,252,233,244, + 2,248,7,128,165,233,235,139,131,233,137,171,233,137,133,233,252,233,244,3, + 255,15,182,252,236,15,182,192,129,124,253,252,234,4,239,15,133,244,40,139, + 44,252,234,59,133,233,15,131,244,40,193,224,3,3,133,233,129,120,253,4,239, + 15,132,244,249,248,1,252,246,133,233,235,15,133,244,253,248,2,72,139,12,202, + 72,137,8,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,252, + 235,248,3,131,189,233,0,15,132,244,1,255,139,141,233,252,246,129,233,235, + 15,132,244,40,15,182,78,252,253,252,233,244,1,248,7,128,165,233,235,139,139, + 233,137,171,233,137,141,233,15,182,78,252,253,252,233,244,2,255,137,124,36, + 80,139,60,199,248,1,141,12,202,139,105,252,248,252,246,133,233,235,15,133, + 244,253,248,2,139,68,36,84,131,232,1,15,132,244,250,1,252,248,59,133,233, + 15,135,244,251,41,252,248,193,231,3,3,189,233,248,3,72,139,41,131,193,8,72, + 137,47,131,199,8,131,232,1,15,133,244,3,248,4,139,124,36,80,139,6,15,182, + 204,15,182,232,131,198,4,193,232,16,252,255,36,252,235,248,5,139,76,36,96, + 137,145,233,137,252,234,65,137,192,137,205,137,116,36,100,232,251,1,35,139, + 149,233,15,182,78,252,253,252,233,244,1,248,7,255,128,165,233,235,139,131, + 233,137,171,233,137,133,233,252,233,244,2,255,3,68,36,84,255,129,124,253, + 202,4,239,139,44,202,15,133,244,58,141,84,202,8,137,114,252,252,139,181,233, + 139,14,15,182,252,233,15,182,205,131,198,4,252,255,36,252,235,255,141,76, + 202,8,137,215,139,105,252,248,129,121,253,252,252,239,15,133,244,29,248,59, + 139,114,252,252,252,247,198,237,15,133,244,253,248,1,137,106,252,248,137, + 68,36,84,131,232,1,15,132,244,249,248,2,72,139,41,131,193,8,72,137,47,131, + 199,8,131,232,1,15,133,244,2,139,106,252,248,248,3,139,68,36,84,128,189,233, + 1,15,135,244,251,248,4,139,181,233,139,14,15,182,252,233,15,182,205,131,198, + 4,252,255,36,252,235,248,5,255,252,247,198,237,15,133,244,4,15,182,78,252, + 253,72,252,247,209,141,12,202,139,121,252,248,139,191,233,139,191,233,252, + 233,244,4,248,7,129,252,238,239,252,247,198,237,15,133,244,254,41,252,242, + 137,215,139,114,252,252,252,233,244,1,248,8,129,198,239,252,233,244,1,255, + 141,76,202,8,72,139,105,232,72,139,65,252,240,72,137,41,72,137,65,8,139,105, + 224,139,65,228,137,105,252,248,137,65,252,252,129,252,248,239,184,237,15, + 133,244,29,137,202,137,114,252,252,139,181,233,139,14,15,182,252,233,15,182, + 205,131,198,4,252,255,36,252,235,255,137,124,36,80,137,92,36,84,139,108,202, + 252,240,139,68,202,252,248,139,157,233,131,198,4,139,189,233,248,1,57,216, + 15,131,244,251,129,124,253,199,4,239,15,132,244,250,255,219,68,202,252,248, + 255,72,139,44,199,72,137,108,202,8,131,192,1,255,137,68,202,252,248,248,2, + 15,183,70,252,254,141,180,253,134,233,248,3,139,92,36,84,139,124,36,80,139, + 6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,252,235,248,4,131, + 192,1,255,137,68,202,252,248,255,252,233,244,1,248,5,41,216,248,6,59,133, + 233,15,135,244,3,105,252,248,239,3,189,233,129,191,233,239,15,132,244,253, + 141,92,24,1,72,139,175,233,72,139,135,233,72,137,44,202,72,137,68,202,8,137, + 92,202,252,248,252,233,244,2,248,7,131,192,1,252,233,244,6,255,129,124,253, + 202,252,236,239,15,133,244,251,139,108,202,232,129,124,253,202,252,244,239, + 15,133,244,251,129,124,253,202,252,252,239,15,133,244,251,128,189,233,235, + 15,133,244,251,141,180,253,134,233,199,68,202,252,248,0,0,0,0,248,1,139,6, + 15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,252,235,248,5,198,70, + 252,252,235,141,180,253,134,233,198,6,235,252,233,244,1,255,15,182,252,236, + 15,182,192,137,124,36,80,141,188,253,194,233,141,12,202,43,122,252,252,133, + 252,237,15,132,244,251,141,108,252,233,252,248,57,215,15,131,244,248,248, + 1,72,139,71,252,248,131,199,8,72,137,1,131,193,8,57,252,233,15,131,244,249, + 57,215,15,130,244,1,248,2,199,65,4,237,131,193,8,57,252,233,15,130,244,2, + 248,3,139,124,36,80,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252, + 255,36,252,235,248,5,199,68,36,84,1,0,0,0,137,208,41,252,248,15,134,244,3, + 137,197,193,252,237,3,131,197,1,137,108,36,84,139,108,36,96,1,200,59,133, + 233,15,135,244,253,248,6,255,72,139,71,252,248,131,199,8,72,137,1,131,193, + 8,57,215,15,130,244,6,252,233,244,3,248,7,137,149,233,137,141,233,137,116, + 36,100,41,215,139,84,36,84,131,252,234,1,137,252,233,232,251,1,0,139,149, + 233,139,141,233,1,215,252,233,244,6,255,193,225,3,255,248,1,139,114,252,252, + 137,68,36,84,252,247,198,237,15,133,244,253,255,248,13,137,215,131,232,1, + 15,132,244,249,248,2,72,139,44,15,72,137,111,252,248,131,199,8,131,232,1, + 15,133,244,2,248,3,139,68,36,84,15,182,110,252,255,248,5,57,197,15,135,244, + 252,255,72,139,44,10,72,137,106,252,248,255,248,5,56,70,252,255,15,135,244, + 252,255,15,182,78,252,253,72,252,247,209,141,20,202,139,122,252,248,139,191, + 233,139,191,233,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255, + 36,252,235,248,6,255,199,71,252,252,237,131,199,8,255,199,68,194,252,244, + 237,255,131,192,1,252,233,244,5,248,7,141,174,233,252,247,197,237,15,133, + 244,14,41,252,234,255,1,252,233,255,137,252,245,209,252,237,129,229,239,102, + 131,172,253,43,233,1,15,132,244,148,255,141,12,202,255,129,121,253,4,239, + 15,133,244,255,255,129,121,253,12,239,15,133,244,60,129,121,253,20,239,15, + 133,244,60,139,41,131,121,16,0,15,140,244,251,255,129,121,253,12,239,15,133, + 244,165,129,121,253,20,239,15,133,244,165,255,139,105,16,133,252,237,15,136, + 244,251,3,41,15,128,244,247,137,41,255,59,105,8,199,65,28,237,137,105,24, + 255,15,142,244,253,248,1,248,6,141,180,253,134,233,255,141,180,253,134,233, + 15,183,70,252,254,15,142,245,248,1,248,6,255,15,143,244,253,248,6,141,180, + 253,134,233,248,1,255,248,7,139,6,15,182,204,15,182,232,131,198,4,193,232, + 16,252,255,36,252,235,248,5,255,3,41,15,128,244,1,137,41,255,15,141,244,7, + 255,141,180,253,134,233,15,183,70,252,254,15,141,245,255,15,140,244,7,255, + 252,233,244,6,248,9,255,129,121,253,4,239,255,15,131,244,60,129,121,253,12, + 239,15,131,244,60,255,129,121,253,12,239,15,131,244,165,129,121,253,20,239, + 15,131,244,165,255,139,105,20,255,129,252,253,239,15,131,244,60,255,252,242, + 15,16,1,252,242,15,16,73,8,255,252,242,15,88,65,16,252,242,15,17,1,133,252, + 237,15,136,244,249,255,15,140,244,249,255,102,15,46,200,248,1,252,242,15, + 17,65,24,255,221,65,8,221,1,255,220,65,16,221,17,221,81,24,133,252,237,15, + 136,244,247,255,221,81,24,15,140,244,247,255,217,201,248,1,255,15,183,70, + 252,254,255,15,131,244,7,255,15,131,244,248,141,180,253,134,233,255,141,180, + 253,134,233,15,183,70,252,254,15,131,245,255,15,130,244,7,255,15,130,244, + 248,141,180,253,134,233,255,248,3,102,15,46,193,252,233,244,1,255,141,12, + 202,139,105,4,129,252,253,239,15,132,244,247,255,137,105,252,252,139,41,137, + 105,252,248,252,233,245,255,141,180,253,134,233,139,1,137,105,252,252,137, + 65,252,248,255,139,139,233,139,4,129,72,139,128,233,139,108,36,96,137,147, + 233,137,171,233,76,137,100,36,80,76,137,108,36,32,76,137,116,36,24,76,137, + 124,36,16,72,137,225,72,129,252,236,239,102,15,127,49,102,15,127,185,233, + 102,68,15,127,129,233,102,68,15,127,137,233,102,68,15,127,145,233,102,68, + 15,127,153,233,102,68,15,127,161,233,102,68,15,127,169,233,102,68,15,127, + 177,233,102,68,15,127,185,233,252,255,224,255,141,180,253,134,233,139,6,15, + 182,204,15,182,232,131,198,4,193,232,16,252,255,36,252,235,255,137,252,245, + 209,252,237,129,229,239,102,131,172,253,43,233,1,15,132,244,150,255,139,190, + 233,139,108,36,96,141,12,202,59,141,233,15,135,244,24,15,182,142,233,57,200, + 15,134,244,249,248,2,255,15,183,70,252,254,252,233,245,255,248,3,199,68,194, + 252,252,237,131,192,1,57,200,15,134,244,3,252,233,244,2,255,141,44,197,237, + 141,4,194,139,122,252,248,137,104,252,252,137,120,252,248,139,108,36,96,141, + 12,200,59,141,233,15,135,244,23,137,209,137,194,15,182,174,233,133,252,237, + 15,132,244,248,248,1,131,193,8,57,209,15,131,244,249,139,121,252,248,137, + 56,139,121,252,252,137,120,4,131,192,8,199,65,252,252,237,131,252,237,1,15, + 133,244,1,248,2,255,139,190,233,139,6,15,182,204,15,182,232,131,198,4,193, + 232,16,252,255,36,252,235,255,248,3,199,64,4,237,131,192,8,131,252,237,1, + 15,133,244,3,252,233,244,2,255,139,106,252,248,72,139,189,233,139,108,36, + 96,141,68,194,252,248,137,149,233,141,136,233,59,141,233,137,133,233,255, + 72,137,252,250,137,252,233,255,15,135,244,22,199,131,233,237,255,252,255, + 215,255,252,255,147,233,255,199,131,233,237,139,149,233,141,12,194,252,247, + 217,3,141,233,139,114,252,252,252,233,244,12,255,254,0 }; enum { @@ -837,6 +840,7 @@ enum { GLOB_vmeta_arith_vvo, GLOB_vmeta_arith_vv, GLOB_vmeta_len, + GLOB_BC_LEN_Z, GLOB_vmeta_call_ra, GLOB_BC_CALLT_Z, GLOB_vmeta_for, @@ -998,6 +1002,7 @@ static const char *const globnames[] = { "vmeta_arith_vvo", "vmeta_arith_vv", "vmeta_len", + "BC_LEN_Z", "vmeta_call_ra", "BC_CALLT_Z", "vmeta_for", @@ -1213,638 +1218,643 @@ static void build_subroutines(BuildCtx *ctx, int cmov, int sse) #if LJ_DUALNUM dasm_put(Dst, 1428); #endif - dasm_put(Dst, 1474, Dt1(->base), Dt1(->base), FRAME_CONT, 2+1, Dt1(->base), Dt1(->base), Dt1(->base)); - dasm_put(Dst, 1611, Dt1(->base), Dt7(->pc), Dt1(->base), Dt1(->base), GG_DISP2STATIC, 1+1, LJ_TISTRUECOND); - dasm_put(Dst, 1794, 1+1, ~LJ_TNUMX); + dasm_put(Dst, 1474, Dt1(->base), Dt1(->base), FRAME_CONT, 2+1, Dt1(->base), Dt1(->base)); +#ifdef LUAJIT_ENABLE_LUA52COMPAT + dasm_put(Dst, 1580); +#else + dasm_put(Dst, 1599); +#endif + dasm_put(Dst, 1604, Dt1(->base), Dt1(->base), Dt7(->pc), Dt1(->base), Dt1(->base), GG_DISP2STATIC, 1+1, LJ_TISTRUECOND); + dasm_put(Dst, 1790, 1+1, ~LJ_TNUMX); if (cmov) { - dasm_put(Dst, 1839); + dasm_put(Dst, 1859); } else { - dasm_put(Dst, 1843); + dasm_put(Dst, 1863); } - dasm_put(Dst, 1852, ((char *)(&((GCfuncC *)0)->upvalue)), LJ_TSTR, ~LJ_TLIGHTUD, 1+1, LJ_TTAB, Dt6(->metatable), LJ_TNIL); - dasm_put(Dst, 1931, DISPATCH_GL(gcroot)+4*(GCROOT_MMNAME+MM_metatable), LJ_TTAB, Dt6(->hmask), Dt5(->hash), sizeof(Node), Dt6(->node), DtB(->key.it), LJ_TSTR, DtB(->key.gcr), DtB(->next)); - dasm_put(Dst, 1988, LJ_TNIL, LJ_TUDATA, LJ_TNUMX, LJ_TISNUM, LJ_TLIGHTUD); - dasm_put(Dst, 2054, LJ_TNUMX, DISPATCH_GL(gcroot[GCROOT_BASEMT]), 2+1, LJ_TTAB, Dt6(->metatable), LJ_TTAB, Dt6(->metatable), LJ_TTAB); - dasm_put(Dst, 2124, Dt6(->marked), LJ_GC_BLACK, Dt6(->marked), (uint8_t)~LJ_GC_BLACK, DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist), 2+1, LJ_TTAB); - dasm_put(Dst, 2213, 1+1, LJ_TISNUM); + dasm_put(Dst, 1872, ((char *)(&((GCfuncC *)0)->upvalue)), LJ_TSTR, ~LJ_TLIGHTUD, 1+1, LJ_TTAB, Dt6(->metatable), LJ_TNIL); + dasm_put(Dst, 1951, DISPATCH_GL(gcroot)+4*(GCROOT_MMNAME+MM_metatable), LJ_TTAB, Dt6(->hmask), Dt5(->hash), sizeof(Node), Dt6(->node), DtB(->key.it), LJ_TSTR, DtB(->key.gcr), DtB(->next)); + dasm_put(Dst, 2008, LJ_TNIL, LJ_TUDATA, LJ_TNUMX, LJ_TISNUM, LJ_TLIGHTUD); + dasm_put(Dst, 2074, LJ_TNUMX, DISPATCH_GL(gcroot[GCROOT_BASEMT]), 2+1, LJ_TTAB, Dt6(->metatable), LJ_TTAB, Dt6(->metatable), LJ_TTAB); + dasm_put(Dst, 2144, Dt6(->marked), LJ_GC_BLACK, Dt6(->marked), (uint8_t)~LJ_GC_BLACK, DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist), 2+1, LJ_TTAB); + dasm_put(Dst, 2233, 1+1, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 2227); + dasm_put(Dst, 2247); } else { - dasm_put(Dst, 2244); + dasm_put(Dst, 2264); } if (sse) { - dasm_put(Dst, 2249); + dasm_put(Dst, 2269); } else { - dasm_put(Dst, 2259); + dasm_put(Dst, 2279); } - dasm_put(Dst, 2266, 1+1, LJ_TSTR, LJ_TSTR, LJ_TISNUM, DISPATCH_GL(gcroot[GCROOT_BASEMT_NUM]), DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold)); - dasm_put(Dst, 2332, Dt1(->base)); + dasm_put(Dst, 2286, 1+1, LJ_TSTR, LJ_TSTR, LJ_TISNUM, DISPATCH_GL(gcroot[GCROOT_BASEMT_NUM]), DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold)); + dasm_put(Dst, 2352, Dt1(->base)); if (LJ_DUALNUM) { - dasm_put(Dst, 2356); + dasm_put(Dst, 2376); } else { - dasm_put(Dst, 2361); + dasm_put(Dst, 2381); } - dasm_put(Dst, 2366, Dt1(->base), 1+1, LJ_TTAB, Dt1(->base), Dt1(->top), Dt1(->base), 1+2); - dasm_put(Dst, 2459, LJ_TNIL, LJ_TNIL, 1+1, LJ_TTAB); + dasm_put(Dst, 2386, Dt1(->base), 1+1, LJ_TTAB, Dt1(->base), Dt1(->top), Dt1(->base), 1+2); + dasm_put(Dst, 2479, LJ_TNIL, LJ_TNIL, 1+1, LJ_TTAB); #ifdef LUAJIT_ENABLE_LUA52COMPAT - dasm_put(Dst, 2506, Dt6(->metatable)); + dasm_put(Dst, 2526, Dt6(->metatable)); #endif - dasm_put(Dst, 2515, Dt8(->upvalue[0]), LJ_TFUNC, LJ_TNIL, 1+3, 1+1, LJ_TTAB, LJ_TISNUM); + dasm_put(Dst, 2535, Dt8(->upvalue[0]), LJ_TFUNC, LJ_TNIL, 1+3, 1+1, LJ_TTAB, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 2501); + dasm_put(Dst, 2521); } else { - dasm_put(Dst, 2244); + dasm_put(Dst, 2264); } - dasm_put(Dst, 2570); + dasm_put(Dst, 2590); if (LJ_DUALNUM) { - dasm_put(Dst, 2575, LJ_TISNUM); + dasm_put(Dst, 2595, LJ_TISNUM); } else if (sse) { - dasm_put(Dst, 2591, (unsigned int)(U64x(3ff00000,00000000)), (unsigned int)((U64x(3ff00000,00000000))>>32)); + dasm_put(Dst, 2611, (unsigned int)(U64x(3ff00000,00000000)), (unsigned int)((U64x(3ff00000,00000000))>>32)); } else { } - dasm_put(Dst, 2624, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->hmask), 1+0); - dasm_put(Dst, 2486, 1+1, LJ_TTAB); + dasm_put(Dst, 2644, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->hmask), 1+0); + dasm_put(Dst, 2506, 1+1, LJ_TTAB); #ifdef LUAJIT_ENABLE_LUA52COMPAT - dasm_put(Dst, 2506, Dt6(->metatable)); + dasm_put(Dst, 2526, Dt6(->metatable)); #endif - dasm_put(Dst, 2701, Dt8(->upvalue[0]), LJ_TFUNC); + dasm_put(Dst, 2721, Dt8(->upvalue[0]), LJ_TFUNC); if (LJ_DUALNUM) { - dasm_put(Dst, 2722, LJ_TISNUM); + dasm_put(Dst, 2742, LJ_TISNUM); } else if (sse) { - dasm_put(Dst, 2734); + dasm_put(Dst, 2754); } else { - dasm_put(Dst, 2744); + dasm_put(Dst, 2764); } - dasm_put(Dst, 2751, 1+3, 1+1, 8+FRAME_PCALL, DISPATCH_GL(hookmask), HOOK_ACTIVE_SHIFT, 2+1, LJ_TFUNC); - dasm_put(Dst, 2815, LJ_TFUNC, 16+FRAME_PCALL, 1+1, LJ_TTHREAD, Dt1(->cframe), Dt1(->status), LUA_YIELD, Dt1(->top)); - dasm_put(Dst, 2905, Dt1(->base), Dt1(->maxstack), Dt1(->top), Dt1(->base), Dt1(->top), DISPATCH_GL(vmstate), ~LJ_VMST_INTERP); - dasm_put(Dst, 2993, Dt1(->base), LUA_YIELD, Dt1(->base), Dt1(->top), Dt1(->top), Dt1(->maxstack), LJ_TTRUE, FRAME_TYPE); - dasm_put(Dst, 3106, LJ_TFALSE, Dt1(->top), Dt1(->top), 1+2, Dt1(->top), Dt1(->base), Dt8(->upvalue[0].gcr), Dt1(->cframe)); - dasm_put(Dst, 3204, Dt1(->status), LUA_YIELD, Dt1(->top), Dt1(->base), Dt1(->maxstack), Dt1(->top), Dt1(->base), Dt1(->top)); - dasm_put(Dst, 3271, DISPATCH_GL(vmstate), ~LJ_VMST_INTERP, Dt1(->base), LUA_YIELD, Dt1(->base), Dt1(->top), Dt1(->top), Dt1(->maxstack)); - dasm_put(Dst, 3359, FRAME_TYPE, Dt1(->top), Dt1(->base), Dt1(->cframe), CFRAME_RESUME); - dasm_put(Dst, 3471, Dt1(->base), Dt1(->top), Dt1(->cframe), LUA_YIELD, Dt1(->status)); + dasm_put(Dst, 2771, 1+3, 1+1, 8+FRAME_PCALL, DISPATCH_GL(hookmask), HOOK_ACTIVE_SHIFT, 2+1, LJ_TFUNC); + dasm_put(Dst, 2835, LJ_TFUNC, 16+FRAME_PCALL, 1+1, LJ_TTHREAD, Dt1(->cframe), Dt1(->status), LUA_YIELD, Dt1(->top)); + dasm_put(Dst, 2925, Dt1(->base), Dt1(->maxstack), Dt1(->top), Dt1(->base), Dt1(->top), DISPATCH_GL(vmstate), ~LJ_VMST_INTERP); + dasm_put(Dst, 3013, Dt1(->base), LUA_YIELD, Dt1(->base), Dt1(->top), Dt1(->top), Dt1(->maxstack), LJ_TTRUE, FRAME_TYPE); + dasm_put(Dst, 3126, LJ_TFALSE, Dt1(->top), Dt1(->top), 1+2, Dt1(->top), Dt1(->base), Dt8(->upvalue[0].gcr), Dt1(->cframe)); + dasm_put(Dst, 3224, Dt1(->status), LUA_YIELD, Dt1(->top), Dt1(->base), Dt1(->maxstack), Dt1(->top), Dt1(->base), Dt1(->top)); + dasm_put(Dst, 3291, DISPATCH_GL(vmstate), ~LJ_VMST_INTERP, Dt1(->base), LUA_YIELD, Dt1(->base), Dt1(->top), Dt1(->top), Dt1(->maxstack)); + dasm_put(Dst, 3379, FRAME_TYPE, Dt1(->top), Dt1(->base), Dt1(->cframe), CFRAME_RESUME); + dasm_put(Dst, 3491, Dt1(->base), Dt1(->top), Dt1(->cframe), LUA_YIELD, Dt1(->status)); if (!LJ_DUALNUM) { - dasm_put(Dst, 3498); + dasm_put(Dst, 3518); } if (sse) { - dasm_put(Dst, 3501); + dasm_put(Dst, 3521); } - dasm_put(Dst, 3516, 1+1); + dasm_put(Dst, 3536, 1+1); if (LJ_DUALNUM) { - dasm_put(Dst, 3527, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 3547, LJ_TISNUM, LJ_TISNUM); } else { - dasm_put(Dst, 3607, LJ_TISNUM); + dasm_put(Dst, 3627, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 3617, (unsigned int)(U64x(7fffffff,ffffffff)), (unsigned int)((U64x(7fffffff,ffffffff))>>32)); + dasm_put(Dst, 3637, (unsigned int)(U64x(7fffffff,ffffffff)), (unsigned int)((U64x(7fffffff,ffffffff))>>32)); } else { - dasm_put(Dst, 3648); + dasm_put(Dst, 3668); } - dasm_put(Dst, 3665, 1+1, FRAME_TYPE, LJ_TNIL); + dasm_put(Dst, 3685, 1+1, FRAME_TYPE, LJ_TNIL); if (LJ_DUALNUM) { - dasm_put(Dst, 3761, LJ_TISNUM); + dasm_put(Dst, 3781, LJ_TISNUM); } else { - dasm_put(Dst, 3607, LJ_TISNUM); + dasm_put(Dst, 3627, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 3783); + dasm_put(Dst, 3803); if (LJ_DUALNUM) { - dasm_put(Dst, 3792); + dasm_put(Dst, 3812); } - dasm_put(Dst, 2254); + dasm_put(Dst, 2274); } else { - dasm_put(Dst, 3826); + dasm_put(Dst, 3846); if (LJ_DUALNUM) { } else { - dasm_put(Dst, 2261); + dasm_put(Dst, 2281); } } - dasm_put(Dst, 3832); + dasm_put(Dst, 3852); if (LJ_DUALNUM) { - dasm_put(Dst, 3761, LJ_TISNUM); + dasm_put(Dst, 3781, LJ_TISNUM); } else { - dasm_put(Dst, 3607, LJ_TISNUM); + dasm_put(Dst, 3627, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 3835); + dasm_put(Dst, 3855); if (LJ_DUALNUM) { - dasm_put(Dst, 3792); + dasm_put(Dst, 3812); } - dasm_put(Dst, 2254); + dasm_put(Dst, 2274); } else { - dasm_put(Dst, 3844); + dasm_put(Dst, 3864); if (LJ_DUALNUM) { } else { - dasm_put(Dst, 2261); + dasm_put(Dst, 2281); } } if (sse) { - dasm_put(Dst, 3850, 1+1, LJ_TISNUM); + dasm_put(Dst, 3870, 1+1, LJ_TISNUM); } else { - dasm_put(Dst, 3879, 1+1, LJ_TISNUM); + dasm_put(Dst, 3899, 1+1, LJ_TISNUM); } - dasm_put(Dst, 3908, 1+1, LJ_TISNUM, 1+1, LJ_TISNUM, 1+1); - dasm_put(Dst, 3977, LJ_TISNUM, 1+1, LJ_TISNUM, 1+1); - dasm_put(Dst, 4034, LJ_TISNUM, 1+1, LJ_TISNUM, 1+1); - dasm_put(Dst, 4097, LJ_TISNUM, 1+1, LJ_TISNUM, 1+1, LJ_TISNUM); - dasm_put(Dst, 4187); + dasm_put(Dst, 3928, 1+1, LJ_TISNUM, 1+1, LJ_TISNUM, 1+1); + dasm_put(Dst, 3997, LJ_TISNUM, 1+1, LJ_TISNUM, 1+1); + dasm_put(Dst, 4054, LJ_TISNUM, 1+1, LJ_TISNUM, 1+1); + dasm_put(Dst, 4117, LJ_TISNUM, 1+1, LJ_TISNUM, 1+1, LJ_TISNUM); + dasm_put(Dst, 4207); if (sse) { - dasm_put(Dst, 4199, 1+1, LJ_TISNUM); + dasm_put(Dst, 4219, 1+1, LJ_TISNUM); } else { } - dasm_put(Dst, 4224); + dasm_put(Dst, 4244); if (sse) { - dasm_put(Dst, 4238, 1+1, LJ_TISNUM); + dasm_put(Dst, 4258, 1+1, LJ_TISNUM); } else { } - dasm_put(Dst, 4263); + dasm_put(Dst, 4283); if (sse) { - dasm_put(Dst, 4277, 1+1, LJ_TISNUM); + dasm_put(Dst, 4297, 1+1, LJ_TISNUM); } else { } - dasm_put(Dst, 4302); + dasm_put(Dst, 4322); if (sse) { - dasm_put(Dst, 4318, 1+1, LJ_TISNUM, Dt8(->upvalue[0])); + dasm_put(Dst, 4338, 1+1, LJ_TISNUM, Dt8(->upvalue[0])); } else { - dasm_put(Dst, 4357, 1+1, LJ_TISNUM, Dt8(->upvalue[0])); + dasm_put(Dst, 4377, 1+1, LJ_TISNUM, Dt8(->upvalue[0])); } - dasm_put(Dst, 4390, 2+1, LJ_TISNUM, LJ_TISNUM, 2+1, LJ_TISNUM, LJ_TISNUM); - dasm_put(Dst, 4455, 1+1, LJ_TISNUM); + dasm_put(Dst, 4410, 2+1, LJ_TISNUM, LJ_TISNUM, 2+1, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 4475, 1+1, LJ_TISNUM); if (sse) { - dasm_put(Dst, 4554); + dasm_put(Dst, 4574); } else { - dasm_put(Dst, 4560); + dasm_put(Dst, 4580); } - dasm_put(Dst, 4569); + dasm_put(Dst, 4589); if (sse) { - dasm_put(Dst, 4594); - } else { - dasm_put(Dst, 4600); - } - dasm_put(Dst, 4603, 1+2); - if (sse) { - dasm_put(Dst, 4612); + dasm_put(Dst, 4614); } else { dasm_put(Dst, 4620); } - dasm_put(Dst, 4628); + dasm_put(Dst, 4623, 1+2); if (sse) { - dasm_put(Dst, 4631, (unsigned int)(U64x(43500000,00000000)), (unsigned int)((U64x(43500000,00000000))>>32)); + dasm_put(Dst, 4632); } else { - dasm_put(Dst, 4658); + dasm_put(Dst, 4640); } - dasm_put(Dst, 4677); + dasm_put(Dst, 4648); if (sse) { - dasm_put(Dst, 4693, 1+1, LJ_TISNUM); + dasm_put(Dst, 4651, (unsigned int)(U64x(43500000,00000000)), (unsigned int)((U64x(43500000,00000000))>>32)); } else { - dasm_put(Dst, 4718, 1+1, LJ_TISNUM); + dasm_put(Dst, 4678); } - dasm_put(Dst, 4740); + dasm_put(Dst, 4697); if (sse) { - dasm_put(Dst, 4762); + dasm_put(Dst, 4713, 1+1, LJ_TISNUM); } else { - dasm_put(Dst, 4788); + dasm_put(Dst, 4738, 1+1, LJ_TISNUM); } - dasm_put(Dst, 4805, 1+2); + dasm_put(Dst, 4760); if (sse) { - dasm_put(Dst, 4845); + dasm_put(Dst, 4782); } else { - dasm_put(Dst, 4853); + dasm_put(Dst, 4808); } - dasm_put(Dst, 4863, 2+1, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 4825, 1+2); if (sse) { - dasm_put(Dst, 4915, 2+1, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 4865); } else { - dasm_put(Dst, 4962, 2+1, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 4873); } - dasm_put(Dst, 5003, LJ_TISNUM); + dasm_put(Dst, 4883, 2+1, LJ_TISNUM, LJ_TISNUM); + if (sse) { + dasm_put(Dst, 4935, 2+1, LJ_TISNUM, LJ_TISNUM); + } else { + dasm_put(Dst, 4982, 2+1, LJ_TISNUM, LJ_TISNUM); + } + dasm_put(Dst, 5023, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 5016, LJ_TISNUM); + dasm_put(Dst, 5036, LJ_TISNUM); if (sse) { - dasm_put(Dst, 4554); + dasm_put(Dst, 4574); } else { } - dasm_put(Dst, 5066); + dasm_put(Dst, 5086); } else { - dasm_put(Dst, 2244); + dasm_put(Dst, 2264); } if (sse) { - dasm_put(Dst, 5077, LJ_TISNUM); + dasm_put(Dst, 5097, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 5098); + dasm_put(Dst, 5118); } else { - dasm_put(Dst, 2244); + dasm_put(Dst, 2264); } - dasm_put(Dst, 5119); + dasm_put(Dst, 5139); } else { } - dasm_put(Dst, 5144, LJ_TISNUM); + dasm_put(Dst, 5164, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 5157, LJ_TISNUM); + dasm_put(Dst, 5177, LJ_TISNUM); if (sse) { - dasm_put(Dst, 4554); + dasm_put(Dst, 4574); } else { } - dasm_put(Dst, 5066); + dasm_put(Dst, 5086); } else { - dasm_put(Dst, 2244); + dasm_put(Dst, 2264); } if (sse) { - dasm_put(Dst, 5077, LJ_TISNUM); + dasm_put(Dst, 5097, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 5098); + dasm_put(Dst, 5118); } else { - dasm_put(Dst, 2244); + dasm_put(Dst, 2264); } - dasm_put(Dst, 5207); + dasm_put(Dst, 5227); } else { } if (!sse) { - dasm_put(Dst, 5232); + dasm_put(Dst, 5252); } - dasm_put(Dst, 5241, 1+1, LJ_TSTR); + dasm_put(Dst, 5261, 1+1, LJ_TSTR); if (LJ_DUALNUM) { - dasm_put(Dst, 5263, Dt5(->len)); + dasm_put(Dst, 5283, Dt5(->len)); } else if (sse) { - dasm_put(Dst, 5271, Dt5(->len)); + dasm_put(Dst, 5291, Dt5(->len)); } else { - dasm_put(Dst, 5282, Dt5(->len)); + dasm_put(Dst, 5302, Dt5(->len)); } - dasm_put(Dst, 5290, 1+1, LJ_TSTR, Dt5(->len), Dt5([1])); + dasm_put(Dst, 5310, 1+1, LJ_TSTR, Dt5(->len), Dt5([1])); if (LJ_DUALNUM) { - dasm_put(Dst, 5266); + dasm_put(Dst, 5286); } else if (sse) { - dasm_put(Dst, 5328); + dasm_put(Dst, 5348); } else { - dasm_put(Dst, 5338); + dasm_put(Dst, 5358); } - dasm_put(Dst, 5351, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), 1+1, LJ_TISNUM); + dasm_put(Dst, 5371, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), 1+1, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 5382); + dasm_put(Dst, 5402); } else if (sse) { - dasm_put(Dst, 5405); + dasm_put(Dst, 5425); } else { - dasm_put(Dst, 5431); + dasm_put(Dst, 5451); } - dasm_put(Dst, 5455, Dt1(->base), Dt1(->base), LJ_TSTR, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), 1+2, LJ_TISNUM); + dasm_put(Dst, 5475, Dt1(->base), Dt1(->base), LJ_TSTR, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), 1+2, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 5563); + dasm_put(Dst, 5583); } else if (sse) { - dasm_put(Dst, 5575); + dasm_put(Dst, 5595); } else { - dasm_put(Dst, 5590); + dasm_put(Dst, 5610); } - dasm_put(Dst, 5602, LJ_TSTR, LJ_TISNUM); + dasm_put(Dst, 5622, LJ_TSTR, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 2501); + dasm_put(Dst, 2521); } else { - dasm_put(Dst, 2244); + dasm_put(Dst, 2264); } - dasm_put(Dst, 5619, Dt5(->len)); + dasm_put(Dst, 5639, Dt5(->len)); if (LJ_DUALNUM) { - dasm_put(Dst, 5629); + dasm_put(Dst, 5649); } else if (sse) { - dasm_put(Dst, 5633); + dasm_put(Dst, 5653); } else { } - dasm_put(Dst, 5640, sizeof(GCstr)-1); - dasm_put(Dst, 5715, 2+1, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold)); - dasm_put(Dst, 5774, LJ_TSTR, LJ_TISNUM); + dasm_put(Dst, 5660, sizeof(GCstr)-1); + dasm_put(Dst, 5735, 2+1, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold)); + dasm_put(Dst, 5794, LJ_TSTR, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 5791); + dasm_put(Dst, 5811); } else if (sse) { - dasm_put(Dst, 5799); + dasm_put(Dst, 5819); } else { - dasm_put(Dst, 5810); + dasm_put(Dst, 5830); } - dasm_put(Dst, 5826, Dt5(->len), DISPATCH_GL(tmpbuf.sz), Dt5([1]), DISPATCH_GL(tmpbuf.buf), DISPATCH_GL(tmpbuf.buf), 1+1); - dasm_put(Dst, 5891, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), LJ_TSTR, Dt5(->len), DISPATCH_GL(tmpbuf.sz), sizeof(GCstr), DISPATCH_GL(tmpbuf.buf)); - dasm_put(Dst, 5954, 1+1, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), LJ_TSTR, Dt5(->len), DISPATCH_GL(tmpbuf.sz)); - dasm_put(Dst, 6025, sizeof(GCstr), DISPATCH_GL(tmpbuf.buf), 1+1); - dasm_put(Dst, 6110, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), LJ_TSTR, Dt5(->len), DISPATCH_GL(tmpbuf.sz), sizeof(GCstr), DISPATCH_GL(tmpbuf.buf)); - dasm_put(Dst, 6180, 1+1, LJ_TTAB); + dasm_put(Dst, 5846, Dt5(->len), DISPATCH_GL(tmpbuf.sz), Dt5([1]), DISPATCH_GL(tmpbuf.buf), DISPATCH_GL(tmpbuf.buf), 1+1); + dasm_put(Dst, 5911, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), LJ_TSTR, Dt5(->len), DISPATCH_GL(tmpbuf.sz), sizeof(GCstr), DISPATCH_GL(tmpbuf.buf)); + dasm_put(Dst, 5974, 1+1, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), LJ_TSTR, Dt5(->len), DISPATCH_GL(tmpbuf.sz)); + dasm_put(Dst, 6045, sizeof(GCstr), DISPATCH_GL(tmpbuf.buf), 1+1); + dasm_put(Dst, 6130, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), LJ_TSTR, Dt5(->len), DISPATCH_GL(tmpbuf.sz), sizeof(GCstr), DISPATCH_GL(tmpbuf.buf)); + dasm_put(Dst, 6200, 1+1, LJ_TTAB); if (LJ_DUALNUM) { - dasm_put(Dst, 6248); + dasm_put(Dst, 6268); } else if (sse) { - dasm_put(Dst, 6255); + dasm_put(Dst, 6275); } else { } - dasm_put(Dst, 6265, 1+1, LJ_TISNUM); + dasm_put(Dst, 6285, 1+1, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 6281); + dasm_put(Dst, 6301); } else { - dasm_put(Dst, 2244); + dasm_put(Dst, 2264); } if (sse) { - dasm_put(Dst, 6298, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); + dasm_put(Dst, 6318, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); } else { } dasm_put(Dst, 106); if (LJ_DUALNUM || sse) { if (!sse) { } - dasm_put(Dst, 6322); + dasm_put(Dst, 6342); } else { } - dasm_put(Dst, 6327, 1+1); + dasm_put(Dst, 6347, 1+1); if (sse) { - dasm_put(Dst, 6338, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); + dasm_put(Dst, 6358, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); } else { - dasm_put(Dst, 6348); + dasm_put(Dst, 6368); } - dasm_put(Dst, 2221, LJ_TISNUM); + dasm_put(Dst, 2241, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 6357); + dasm_put(Dst, 6377); } else { - dasm_put(Dst, 2244); + dasm_put(Dst, 2264); } if (sse) { - dasm_put(Dst, 6374); + dasm_put(Dst, 6394); } else { } - dasm_put(Dst, 6389, LJ_TISNUM); + dasm_put(Dst, 6409, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 6414); - } else { dasm_put(Dst, 6434); + } else { + dasm_put(Dst, 6454); } if (sse) { - dasm_put(Dst, 6439); + dasm_put(Dst, 6459); } else { } - dasm_put(Dst, 6456, 1+1); + dasm_put(Dst, 6476, 1+1); if (sse) { - dasm_put(Dst, 6338, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); + dasm_put(Dst, 6358, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); } else { - dasm_put(Dst, 6348); + dasm_put(Dst, 6368); } - dasm_put(Dst, 2221, LJ_TISNUM); + dasm_put(Dst, 2241, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 6357); + dasm_put(Dst, 6377); } else { - dasm_put(Dst, 2244); + dasm_put(Dst, 2264); } if (sse) { - dasm_put(Dst, 6374); + dasm_put(Dst, 6394); } else { } - dasm_put(Dst, 6389, LJ_TISNUM); + dasm_put(Dst, 6409, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 6474); - } else { - dasm_put(Dst, 6434); - } - if (sse) { dasm_put(Dst, 6494); } else { + dasm_put(Dst, 6454); } - dasm_put(Dst, 6511, 1+1); if (sse) { - dasm_put(Dst, 6338, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); + dasm_put(Dst, 6514); } else { - dasm_put(Dst, 6348); } - dasm_put(Dst, 2221, LJ_TISNUM); + dasm_put(Dst, 6531, 1+1); + if (sse) { + dasm_put(Dst, 6358, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); + } else { + dasm_put(Dst, 6368); + } + dasm_put(Dst, 2241, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 6357); + dasm_put(Dst, 6377); } else { - dasm_put(Dst, 2244); + dasm_put(Dst, 2264); } if (sse) { - dasm_put(Dst, 6374); + dasm_put(Dst, 6394); } else { } - dasm_put(Dst, 6389, LJ_TISNUM); + dasm_put(Dst, 6409, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 6529); - } else { - dasm_put(Dst, 6434); - } - if (sse) { dasm_put(Dst, 6549); } else { - } - dasm_put(Dst, 6566, 1+1, LJ_TISNUM); - if (LJ_DUALNUM) { - dasm_put(Dst, 6357); - } else { - dasm_put(Dst, 2244); + dasm_put(Dst, 6454); } if (sse) { - dasm_put(Dst, 6298, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); + dasm_put(Dst, 6569); } else { } - dasm_put(Dst, 6589, 1+1, LJ_TISNUM); + dasm_put(Dst, 6586, 1+1, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 6357); + dasm_put(Dst, 6377); } else { - dasm_put(Dst, 2244); + dasm_put(Dst, 2264); } if (sse) { - dasm_put(Dst, 6298, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); + dasm_put(Dst, 6318, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); } else { } - dasm_put(Dst, 6613); + dasm_put(Dst, 6609, 1+1, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 6322); + dasm_put(Dst, 6377); + } else { + dasm_put(Dst, 2264); + } + if (sse) { + dasm_put(Dst, 6318, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); + } else { + } + dasm_put(Dst, 6633); + if (LJ_DUALNUM) { + dasm_put(Dst, 6342); } else if (sse) { - dasm_put(Dst, 6619); + dasm_put(Dst, 6639); } else { } - dasm_put(Dst, 6631); + dasm_put(Dst, 6651); if (LJ_DUALNUM) { - dasm_put(Dst, 6642, 1+1, LJ_TISNUM); + dasm_put(Dst, 6662, 1+1, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 6357); + dasm_put(Dst, 6377); } else { - dasm_put(Dst, 2244); + dasm_put(Dst, 2264); } if (sse) { - dasm_put(Dst, 6298, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); + dasm_put(Dst, 6318, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); } else { } - dasm_put(Dst, 6658, LJ_TISNUM); + dasm_put(Dst, 6678, LJ_TISNUM); } else if (sse) { - dasm_put(Dst, 6673, 2+1, LJ_TISNUM, LJ_TISNUM, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); + dasm_put(Dst, 6693, 2+1, LJ_TISNUM, LJ_TISNUM, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); } else { } - dasm_put(Dst, 6740); + dasm_put(Dst, 6760); if (LJ_DUALNUM) { - dasm_put(Dst, 6747, 1+1, LJ_TISNUM); + dasm_put(Dst, 6767, 1+1, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 6357); + dasm_put(Dst, 6377); } else { - dasm_put(Dst, 2244); + dasm_put(Dst, 2264); } if (sse) { - dasm_put(Dst, 6298, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); + dasm_put(Dst, 6318, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); } else { } - dasm_put(Dst, 6658, LJ_TISNUM); + dasm_put(Dst, 6678, LJ_TISNUM); } else if (sse) { - dasm_put(Dst, 6763, 2+1, LJ_TISNUM, LJ_TISNUM, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); + dasm_put(Dst, 6783, 2+1, LJ_TISNUM, LJ_TISNUM, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); } else { } - dasm_put(Dst, 6830); + dasm_put(Dst, 6850); if (LJ_DUALNUM) { - dasm_put(Dst, 6838, 1+1, LJ_TISNUM); + dasm_put(Dst, 6858, 1+1, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 6357); + dasm_put(Dst, 6377); } else { - dasm_put(Dst, 2244); + dasm_put(Dst, 2264); } if (sse) { - dasm_put(Dst, 6298, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); + dasm_put(Dst, 6318, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); } else { } - dasm_put(Dst, 6658, LJ_TISNUM); + dasm_put(Dst, 6678, LJ_TISNUM); } else if (sse) { - dasm_put(Dst, 6854, 2+1, LJ_TISNUM, LJ_TISNUM, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); + dasm_put(Dst, 6874, 2+1, LJ_TISNUM, LJ_TISNUM, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); } else { } - dasm_put(Dst, 6921); + dasm_put(Dst, 6941); if (LJ_DUALNUM) { - dasm_put(Dst, 6929, 1+1, LJ_TISNUM); + dasm_put(Dst, 6949, 1+1, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 6357); + dasm_put(Dst, 6377); } else { - dasm_put(Dst, 2244); + dasm_put(Dst, 2264); } if (sse) { - dasm_put(Dst, 6298, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); + dasm_put(Dst, 6318, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); } else { } - dasm_put(Dst, 6658, LJ_TISNUM); + dasm_put(Dst, 6678, LJ_TISNUM); } else if (sse) { - dasm_put(Dst, 6945, 2+1, LJ_TISNUM, LJ_TISNUM, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); + dasm_put(Dst, 6965, 2+1, LJ_TISNUM, LJ_TISNUM, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); } else { } - dasm_put(Dst, 7012); + dasm_put(Dst, 7032); if (LJ_DUALNUM) { - dasm_put(Dst, 7019, 1+1, LJ_TISNUM); + dasm_put(Dst, 7039, 1+1, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 6357); + dasm_put(Dst, 6377); } else { - dasm_put(Dst, 2244); + dasm_put(Dst, 2264); } if (sse) { - dasm_put(Dst, 6298, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); + dasm_put(Dst, 6318, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); } else { } - dasm_put(Dst, 6658, LJ_TISNUM); + dasm_put(Dst, 6678, LJ_TISNUM); } else if (sse) { - dasm_put(Dst, 7035, 2+1, LJ_TISNUM, LJ_TISNUM, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); + dasm_put(Dst, 7055, 2+1, LJ_TISNUM, LJ_TISNUM, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); } else { } - dasm_put(Dst, 7102, 1+2, 1+1, Dt1(->base), 8*LUA_MINSTACK, Dt1(->top), Dt1(->maxstack), Dt8(->f), Dt1(->base)); - dasm_put(Dst, 7178, Dt1(->top), Dt7(->pc), FRAME_TYPE, LUA_MINSTACK, Dt1(->base), Dt1(->base)); - dasm_put(Dst, 7305, Dt1(->top), Dt1(->base), Dt1(->top)); + dasm_put(Dst, 7122, 1+2, 1+1, Dt1(->base), 8*LUA_MINSTACK, Dt1(->top), Dt1(->maxstack), Dt8(->f), Dt1(->base)); + dasm_put(Dst, 7198, Dt1(->top), Dt7(->pc), FRAME_TYPE, LUA_MINSTACK, Dt1(->base), Dt1(->base)); + dasm_put(Dst, 7325, Dt1(->top), Dt1(->base), Dt1(->top)); #if LJ_HASJIT - dasm_put(Dst, 7344, DISPATCH_GL(hookmask), HOOK_VMEVENT, HOOK_ACTIVE, LUA_MASKLINE|LUA_MASKCOUNT, DISPATCH_GL(hookcount)); + dasm_put(Dst, 7364, DISPATCH_GL(hookmask), HOOK_VMEVENT, HOOK_ACTIVE, LUA_MASKLINE|LUA_MASKCOUNT, DISPATCH_GL(hookcount)); #endif - dasm_put(Dst, 7375, DISPATCH_GL(hookmask), HOOK_ACTIVE, DISPATCH_GL(hookmask), HOOK_ACTIVE, LUA_MASKLINE|LUA_MASKCOUNT, DISPATCH_GL(hookcount), LUA_MASKLINE); - dasm_put(Dst, 7426, Dt1(->base), Dt1(->base), GG_DISP2STATIC); + dasm_put(Dst, 7395, DISPATCH_GL(hookmask), HOOK_ACTIVE, DISPATCH_GL(hookmask), HOOK_ACTIVE, LUA_MASKLINE|LUA_MASKCOUNT, DISPATCH_GL(hookcount), LUA_MASKLINE); + dasm_put(Dst, 7446, Dt1(->base), Dt1(->base), GG_DISP2STATIC); #if LJ_HASJIT - dasm_put(Dst, 7493, Dt7(->pc), PC2PROTO(framesize), Dt1(->base), Dt1(->top), GG_DISP2J, DISPATCH_J(L)); + dasm_put(Dst, 7513, Dt7(->pc), PC2PROTO(framesize), Dt1(->base), Dt1(->top), GG_DISP2J, DISPATCH_J(L)); #endif - dasm_put(Dst, 7540); + dasm_put(Dst, 7560); #if LJ_HASJIT - dasm_put(Dst, 7370); + dasm_put(Dst, 7390); #endif - dasm_put(Dst, 7547); + dasm_put(Dst, 7567); #if LJ_HASJIT - dasm_put(Dst, 7550); + dasm_put(Dst, 7570); #endif - dasm_put(Dst, 7560, Dt1(->base), Dt1(->top)); + dasm_put(Dst, 7580, Dt1(->base), Dt1(->top)); #if LJ_HASJIT - dasm_put(Dst, 7594); + dasm_put(Dst, 7614); #endif - dasm_put(Dst, 7599, Dt1(->base), Dt1(->top)); + dasm_put(Dst, 7619, Dt1(->base), Dt1(->top)); #if LJ_HASJIT - dasm_put(Dst, 7630, DISPATCH_GL(vmstate), DISPATCH_GL(vmstate), ~LJ_VMST_EXIT, DISPATCH_J(exitno), DISPATCH_J(parent), 16*8+4*8, DISPATCH_GL(jit_L), DISPATCH_GL(jit_base), DISPATCH_J(L), DISPATCH_GL(jit_L), Dt1(->base), 4*8, GG_DISP2J, Dt1(->cframe), CFRAME_RAWMASK, CFRAME_OFS_L, Dt1(->base), CFRAME_OFS_PC); + dasm_put(Dst, 7650, DISPATCH_GL(vmstate), DISPATCH_GL(vmstate), ~LJ_VMST_EXIT, DISPATCH_J(exitno), DISPATCH_J(parent), 16*8+4*8, DISPATCH_GL(jit_L), DISPATCH_GL(jit_base), DISPATCH_J(L), DISPATCH_GL(jit_L), Dt1(->base), 4*8, GG_DISP2J, Dt1(->cframe), CFRAME_RAWMASK, CFRAME_OFS_L, Dt1(->base), CFRAME_OFS_PC); #endif - dasm_put(Dst, 7860); + dasm_put(Dst, 7880); #if LJ_HASJIT - dasm_put(Dst, 7863, 9*16+4*8, -9*16, -8*16, -7*16, -6*16, -5*16, -4*16, -3*16, -2*16, -1*16, Dt7(->pc), PC2PROTO(k), DISPATCH_GL(jit_L), DISPATCH_GL(vmstate), ~LJ_VMST_INTERP, BC_FUNCF); - dasm_put(Dst, 8005); + dasm_put(Dst, 7883, 9*16+4*8, -9*16, -8*16, -7*16, -6*16, -5*16, -4*16, -3*16, -2*16, -1*16, Dt7(->pc), PC2PROTO(k), DISPATCH_GL(jit_L), DISPATCH_GL(vmstate), ~LJ_VMST_INTERP, BC_FUNCF); + dasm_put(Dst, 8025); #endif - dasm_put(Dst, 8031); + dasm_put(Dst, 8051); if (!sse) { - dasm_put(Dst, 8034); + dasm_put(Dst, 8054); } - dasm_put(Dst, 8079, (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, 8099, (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, 8165); + dasm_put(Dst, 8185); } - dasm_put(Dst, 8210, (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, 8230, (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, 8296); + dasm_put(Dst, 8316); } - dasm_put(Dst, 8335, (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, 8355, (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, 8424, (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, 8444, (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, 8538); + dasm_put(Dst, 8558); } - dasm_put(Dst, 8585); + dasm_put(Dst, 8605); if (!sse) { } else { - dasm_put(Dst, 8659); + dasm_put(Dst, 8679); } - dasm_put(Dst, 8662); - dasm_put(Dst, 8747, (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, 8850, (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, 9006); + dasm_put(Dst, 8682); + dasm_put(Dst, 8767, (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, 8870, (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, 9026); #if LJ_HASJIT if (sse) { - dasm_put(Dst, 9047); - dasm_put(Dst, 9117); - dasm_put(Dst, 9190); + dasm_put(Dst, 9067); + dasm_put(Dst, 9137); + dasm_put(Dst, 9210); } else { - dasm_put(Dst, 9240); - dasm_put(Dst, 9332); + dasm_put(Dst, 9260); + dasm_put(Dst, 9352); } - dasm_put(Dst, 9378); + dasm_put(Dst, 9398); #endif - dasm_put(Dst, 9382); + dasm_put(Dst, 9402); if (sse) { - dasm_put(Dst, 9385, (unsigned int)(U64x(80000000,00000000)), (unsigned int)((U64x(80000000,00000000))>>32)); - dasm_put(Dst, 9474, (unsigned int)(U64x(7fffffff,ffffffff)), (unsigned int)((U64x(7fffffff,ffffffff))>>32)); + dasm_put(Dst, 9405, (unsigned int)(U64x(80000000,00000000)), (unsigned int)((U64x(80000000,00000000))>>32)); + dasm_put(Dst, 9494, (unsigned int)(U64x(7fffffff,ffffffff)), (unsigned int)((U64x(7fffffff,ffffffff))>>32)); } else { - dasm_put(Dst, 9598); - dasm_put(Dst, 9681); + dasm_put(Dst, 9618); + dasm_put(Dst, 9701); if (cmov) { - dasm_put(Dst, 9736); + dasm_put(Dst, 9756); } else { - dasm_put(Dst, 9755); + dasm_put(Dst, 9775); } - dasm_put(Dst, 9378); + dasm_put(Dst, 9398); } - dasm_put(Dst, 9796); + dasm_put(Dst, 9816); #if LJ_HASFFI #define DtE(_V) (int)(ptrdiff_t)&(((CCallState *)0)_V) - dasm_put(Dst, 9824, DtE(->spadj)); + dasm_put(Dst, 9844, DtE(->spadj)); #if LJ_TARGET_WINDOWS #endif - dasm_put(Dst, 9839, DtE(->nsp), offsetof(CCallState, stack), CCALL_SPS_EXTRA*8, DtE(->nfpr), DtE(->gpr[0]), DtE(->gpr[1]), DtE(->gpr[2]), DtE(->gpr[3]), DtE(->fpr[0]), DtE(->fpr[1]), DtE(->fpr[2]), DtE(->fpr[3])); - dasm_put(Dst, 9920, DtE(->func), DtE(->gpr[0]), DtE(->fpr[0])); + dasm_put(Dst, 9859, DtE(->nsp), offsetof(CCallState, stack), CCALL_SPS_EXTRA*8, DtE(->nfpr), DtE(->gpr[0]), DtE(->gpr[1]), DtE(->gpr[2]), DtE(->gpr[3]), DtE(->fpr[0]), DtE(->fpr[1]), DtE(->fpr[2]), DtE(->fpr[3])); + dasm_put(Dst, 9940, DtE(->func), DtE(->gpr[0]), DtE(->fpr[0])); #if LJ_TARGET_WINDOWS #endif - dasm_put(Dst, 9933); + dasm_put(Dst, 9953); #endif - dasm_put(Dst, 9941); + dasm_put(Dst, 9961); #ifdef LUA_USE_ASSERT - dasm_put(Dst, 9380); + dasm_put(Dst, 9400); #endif - dasm_put(Dst, 9380); + dasm_put(Dst, 9400); } /* 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, 9944, defop); + dasm_put(Dst, 9964, defop); switch (op) { @@ -1855,296 +1865,303 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) case BC_ISLT: case BC_ISGE: case BC_ISLE: case BC_ISGT: if (LJ_DUALNUM) { - dasm_put(Dst, 9946, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 9966, LJ_TISNUM, LJ_TISNUM); switch (op) { case BC_ISLT: - dasm_put(Dst, 9976); + dasm_put(Dst, 9996); break; case BC_ISGE: - dasm_put(Dst, 9981); + dasm_put(Dst, 10001); break; case BC_ISLE: - dasm_put(Dst, 9986); + dasm_put(Dst, 10006); break; case BC_ISGT: - dasm_put(Dst, 9991); + dasm_put(Dst, 10011); break; default: break; /* Shut up GCC. */ } - dasm_put(Dst, 9996, -BCBIAS_J*4, LJ_TISNUM); + dasm_put(Dst, 10016, -BCBIAS_J*4, LJ_TISNUM); if (sse) { - dasm_put(Dst, 10050); + dasm_put(Dst, 10070); } else { - dasm_put(Dst, 10061); + dasm_put(Dst, 10081); } - dasm_put(Dst, 10072); + dasm_put(Dst, 10092); if (sse) { - dasm_put(Dst, 10079); + dasm_put(Dst, 10099); switch (op) { case BC_ISLT: - dasm_put(Dst, 10099); + dasm_put(Dst, 10119); break; case BC_ISGE: - dasm_put(Dst, 10104); + dasm_put(Dst, 10124); break; case BC_ISLE: - dasm_put(Dst, 10109); + dasm_put(Dst, 10129); break; case BC_ISGT: - dasm_put(Dst, 10114); + dasm_put(Dst, 10134); break; default: break; /* Shut up GCC. */ } - dasm_put(Dst, 10119); + dasm_put(Dst, 10139); } else { - dasm_put(Dst, 10124); + dasm_put(Dst, 10144); } } else { - dasm_put(Dst, 10132, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 10152, LJ_TISNUM, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 10153); + dasm_put(Dst, 10173); } else { - dasm_put(Dst, 10174); + dasm_put(Dst, 10194); if (cmov) { - dasm_put(Dst, 10190); + dasm_put(Dst, 10210); } else { - dasm_put(Dst, 10196); + dasm_put(Dst, 10216); } } if (LJ_DUALNUM) { switch (op) { case BC_ISLT: - dasm_put(Dst, 10099); + dasm_put(Dst, 10119); break; case BC_ISGE: - dasm_put(Dst, 10104); + dasm_put(Dst, 10124); break; case BC_ISLE: - dasm_put(Dst, 10109); + dasm_put(Dst, 10129); break; case BC_ISGT: - dasm_put(Dst, 10114); + dasm_put(Dst, 10134); break; default: break; /* Shut up GCC. */ } - dasm_put(Dst, 10119); + dasm_put(Dst, 10139); } else { switch (op) { case BC_ISLT: - dasm_put(Dst, 10203); + dasm_put(Dst, 10223); break; case BC_ISGE: - dasm_put(Dst, 10208); + dasm_put(Dst, 10228); break; case BC_ISLE: - dasm_put(Dst, 10213); + dasm_put(Dst, 10233); break; case BC_ISGT: - dasm_put(Dst, 10218); + dasm_put(Dst, 10238); break; default: break; /* Shut up GCC. */ } - dasm_put(Dst, 10223, -BCBIAS_J*4); + dasm_put(Dst, 10243, -BCBIAS_J*4); } break; case BC_ISEQV: case BC_ISNEV: vk = op == BC_ISEQV; - dasm_put(Dst, 10255); + dasm_put(Dst, 10275); if (LJ_DUALNUM) { - dasm_put(Dst, 10263, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 10283, LJ_TISNUM, LJ_TISNUM); if (vk) { - dasm_put(Dst, 10288); + dasm_put(Dst, 10308); } else { - dasm_put(Dst, 10293); + dasm_put(Dst, 10313); } - dasm_put(Dst, 10298, -BCBIAS_J*4, LJ_TISNUM); + dasm_put(Dst, 10318, -BCBIAS_J*4, LJ_TISNUM); if (sse) { - dasm_put(Dst, 10350); + dasm_put(Dst, 10370); } else { - dasm_put(Dst, 10357); + dasm_put(Dst, 10377); } - dasm_put(Dst, 10361); + dasm_put(Dst, 10381); if (sse) { - dasm_put(Dst, 10372); + dasm_put(Dst, 10392); } else { - dasm_put(Dst, 10384); + dasm_put(Dst, 10404); } - dasm_put(Dst, 10391); + dasm_put(Dst, 10411); } else { - dasm_put(Dst, 10396, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 10416, LJ_TISNUM, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 10415); + dasm_put(Dst, 10435); } else { - dasm_put(Dst, 10433); + dasm_put(Dst, 10453); if (cmov) { - dasm_put(Dst, 10190); + dasm_put(Dst, 10210); } else { - dasm_put(Dst, 10196); + dasm_put(Dst, 10216); } } iseqne_fp: if (vk) { - dasm_put(Dst, 10446); + dasm_put(Dst, 10466); } else { - dasm_put(Dst, 10455); + dasm_put(Dst, 10475); } iseqne_end: if (vk) { - dasm_put(Dst, 10464, -BCBIAS_J*4); + dasm_put(Dst, 10484, -BCBIAS_J*4); if (!LJ_HASFFI) { - dasm_put(Dst, 4609); + dasm_put(Dst, 4629); } } else { if (!LJ_HASFFI) { - dasm_put(Dst, 4609); + dasm_put(Dst, 4629); } - dasm_put(Dst, 10479, -BCBIAS_J*4); + dasm_put(Dst, 10499, -BCBIAS_J*4); } if (LJ_DUALNUM && (op == BC_ISEQV || op == BC_ISNEV || op == BC_ISEQN || op == BC_ISNEN)) { - dasm_put(Dst, 10494); + dasm_put(Dst, 10514); } else { - dasm_put(Dst, 10235); + dasm_put(Dst, 10255); } if (op == BC_ISEQV || op == BC_ISNEV) { - dasm_put(Dst, 9917); + dasm_put(Dst, 9937); if (LJ_HASFFI) { - dasm_put(Dst, 10499, LJ_TCDATA, LJ_TCDATA); + dasm_put(Dst, 10519, LJ_TCDATA, LJ_TCDATA); } - dasm_put(Dst, 10518, LJ_TISPRI, LJ_TISTABUD, Dt6(->metatable), Dt6(->nomm), 1<metatable), Dt6(->nomm), 1<>32)); + dasm_put(Dst, 11093, (unsigned int)(U64x(80000000,00000000)), (unsigned int)((U64x(80000000,00000000))>>32)); } else { - dasm_put(Dst, 11098); + dasm_put(Dst, 11118); } if (LJ_DUALNUM) { - dasm_put(Dst, 10494); + dasm_put(Dst, 10514); } else { - dasm_put(Dst, 10235); + dasm_put(Dst, 10255); } break; case BC_LEN: - dasm_put(Dst, 11107, LJ_TSTR); + dasm_put(Dst, 11127, LJ_TSTR); if (LJ_DUALNUM) { - dasm_put(Dst, 11121, Dt5(->len), LJ_TISNUM); + dasm_put(Dst, 11141, Dt5(->len), LJ_TISNUM); } else if (sse) { - dasm_put(Dst, 11135, Dt5(->len)); + dasm_put(Dst, 11155, Dt5(->len)); } else { - dasm_put(Dst, 11153, Dt5(->len)); + dasm_put(Dst, 11173, Dt5(->len)); } - dasm_put(Dst, 11162, LJ_TTAB); + dasm_put(Dst, 11182, LJ_TTAB); +#ifdef LUAJIT_ENABLE_LUA52COMPAT + dasm_put(Dst, 11217, Dt6(->metatable)); +#endif + dasm_put(Dst, 11231); if (LJ_DUALNUM) { } else if (sse) { - dasm_put(Dst, 11203); + dasm_put(Dst, 11240); } else { } - dasm_put(Dst, 11209); + dasm_put(Dst, 11246); +#ifdef LUAJIT_ENABLE_LUA52COMPAT + dasm_put(Dst, 11259, Dt6(->nomm), 1<base), Dt1(->base)); + dasm_put(Dst, 12002, Dt1(->base), Dt1(->base)); break; /* -- Constant ops ------------------------------------------------------ */ case BC_KSTR: - dasm_put(Dst, 12032, LJ_TSTR); + dasm_put(Dst, 12085, LJ_TSTR); break; case BC_KCDATA: #if LJ_HASFFI - dasm_put(Dst, 12032, LJ_TCDATA); + dasm_put(Dst, 12085, LJ_TCDATA); #endif break; case BC_KSHORT: if (LJ_DUALNUM) { - dasm_put(Dst, 12067, LJ_TISNUM); + dasm_put(Dst, 12120, LJ_TISNUM); } else if (sse) { - dasm_put(Dst, 12079); + dasm_put(Dst, 12132); } else { - dasm_put(Dst, 12094); + dasm_put(Dst, 12147); } - dasm_put(Dst, 10235); + dasm_put(Dst, 10255); break; case BC_KNUM: if (sse) { - dasm_put(Dst, 12102); + dasm_put(Dst, 12155); } else { - dasm_put(Dst, 12115); + dasm_put(Dst, 12168); } - dasm_put(Dst, 10235); + dasm_put(Dst, 10255); break; case BC_KPRI: - dasm_put(Dst, 12122); + dasm_put(Dst, 12175); break; case BC_KNIL: - dasm_put(Dst, 12150, LJ_TNIL); + dasm_put(Dst, 12203, LJ_TNIL); break; /* -- Upvalue and function ops ------------------------------------------ */ case BC_UGET: - dasm_put(Dst, 12197, offsetof(GCfuncL, uvptr), DtA(->v)); + dasm_put(Dst, 12250, offsetof(GCfuncL, uvptr), DtA(->v)); break; case BC_USETV: #define TV2MARKOFS \ ((int32_t)offsetof(GCupval, marked)-(int32_t)offsetof(GCupval, tv)) - dasm_put(Dst, 12237, 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, 12328); + dasm_put(Dst, 12290, 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, 12381); break; #undef TV2MARKOFS case BC_USETS: - dasm_put(Dst, 12340, 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, 12393, 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, 12433); + dasm_put(Dst, 12486); if (sse) { - dasm_put(Dst, 12438); + dasm_put(Dst, 12491); } else { - dasm_put(Dst, 10746); + dasm_put(Dst, 10766); } - dasm_put(Dst, 12445, offsetof(GCfuncL, uvptr), DtA(->v)); + dasm_put(Dst, 12498, offsetof(GCfuncL, uvptr), DtA(->v)); if (sse) { - dasm_put(Dst, 12454); + dasm_put(Dst, 12507); } else { - dasm_put(Dst, 12460); + dasm_put(Dst, 12513); } - dasm_put(Dst, 10235); + dasm_put(Dst, 10255); break; case BC_USETP: - dasm_put(Dst, 12463, offsetof(GCfuncL, uvptr), DtA(->v)); + dasm_put(Dst, 12516, offsetof(GCfuncL, uvptr), DtA(->v)); break; case BC_UCLO: - dasm_put(Dst, 12502, -BCBIAS_J*4, Dt1(->openupval), Dt1(->base), Dt1(->base)); + dasm_put(Dst, 12555, -BCBIAS_J*4, Dt1(->openupval), Dt1(->base), Dt1(->base)); break; case BC_FNEW: - dasm_put(Dst, 12557, Dt1(->base), Dt1(->base), LJ_TFUNC); + dasm_put(Dst, 12610, Dt1(->base), Dt1(->base), LJ_TFUNC); break; /* -- Table ops --------------------------------------------------------- */ case BC_TNEW: - dasm_put(Dst, 12623, Dt1(->base), DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), LJ_TTAB); + dasm_put(Dst, 12676, Dt1(->base), DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), LJ_TTAB); break; case BC_TDUP: - dasm_put(Dst, 12745, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), Dt1(->base), LJ_TTAB); + dasm_put(Dst, 12798, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), Dt1(->base), LJ_TTAB); break; case BC_GGET: - dasm_put(Dst, 12840, Dt7(->env)); + dasm_put(Dst, 12893, Dt7(->env)); break; case BC_GSET: - dasm_put(Dst, 12859, Dt7(->env)); + dasm_put(Dst, 12912, Dt7(->env)); break; case BC_TGETV: - dasm_put(Dst, 12878, LJ_TTAB); + dasm_put(Dst, 12931, LJ_TTAB); if (LJ_DUALNUM) { - dasm_put(Dst, 12901, LJ_TISNUM); + dasm_put(Dst, 12954, LJ_TISNUM); } else { - dasm_put(Dst, 12915, LJ_TISNUM); + dasm_put(Dst, 12968, LJ_TISNUM); if (sse) { - dasm_put(Dst, 12926); + dasm_put(Dst, 12979); } else { } - dasm_put(Dst, 12947); + dasm_put(Dst, 13000); } - dasm_put(Dst, 12952, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<asize), Dt6(->array), LJ_TNIL, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<hmask), Dt5(->hash), sizeof(Node), Dt6(->node), DtB(->key.it), LJ_TSTR, DtB(->key.gcr), LJ_TNIL); - dasm_put(Dst, 13145, LJ_TNIL, DtB(->next), Dt6(->metatable), Dt6(->nomm), 1<hmask), Dt5(->hash), sizeof(Node), Dt6(->node), DtB(->key.it), LJ_TSTR, DtB(->key.gcr), LJ_TNIL); + dasm_put(Dst, 13198, LJ_TNIL, DtB(->next), Dt6(->metatable), Dt6(->nomm), 1<asize), Dt6(->array), LJ_TNIL, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<asize), Dt6(->array), LJ_TNIL, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<asize), Dt6(->array), LJ_TNIL, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<marked), (uint8_t)~LJ_GC_BLACK, DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); + dasm_put(Dst, 13409, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<marked), (uint8_t)~LJ_GC_BLACK, DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); break; case BC_TSETS: - dasm_put(Dst, 13493, 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, 13569, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<next)); - dasm_put(Dst, 13657, Dt6(->metatable), Dt6(->nomm), 1<base), Dt1(->base), Dt6(->marked), (uint8_t)~LJ_GC_BLACK, DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); + dasm_put(Dst, 13546, 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, 13622, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<next)); + dasm_put(Dst, 13710, Dt6(->metatable), Dt6(->nomm), 1<base), Dt1(->base), Dt6(->marked), (uint8_t)~LJ_GC_BLACK, DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); break; case BC_TSETB: - dasm_put(Dst, 13748, LJ_TTAB, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable)); - dasm_put(Dst, 13842, Dt6(->metatable), Dt6(->nomm), 1<marked), (uint8_t)~LJ_GC_BLACK, DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); + dasm_put(Dst, 13801, LJ_TTAB, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable)); + dasm_put(Dst, 13895, Dt6(->metatable), Dt6(->nomm), 1<marked), (uint8_t)~LJ_GC_BLACK, DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); break; case BC_TSETM: - dasm_put(Dst, 13888, Dt6(->marked), LJ_GC_BLACK, Dt6(->asize), Dt6(->array), Dt1(->base), Dt1(->base)); - dasm_put(Dst, 14031, Dt6(->marked), (uint8_t)~LJ_GC_BLACK, DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); + dasm_put(Dst, 13941, Dt6(->marked), LJ_GC_BLACK, Dt6(->asize), Dt6(->array), Dt1(->base), Dt1(->base)); + dasm_put(Dst, 14084, Dt6(->marked), (uint8_t)~LJ_GC_BLACK, DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); break; /* -- Calls and vararg handling ----------------------------------------- */ case BC_CALL: case BC_CALLM: - dasm_put(Dst, 11226); + dasm_put(Dst, 11279); if (op == BC_CALLM) { - dasm_put(Dst, 14049); + dasm_put(Dst, 14102); } - dasm_put(Dst, 14054, LJ_TFUNC, Dt7(->pc)); + dasm_put(Dst, 14107, LJ_TFUNC, Dt7(->pc)); break; case BC_CALLMT: - dasm_put(Dst, 14049); + dasm_put(Dst, 14102); break; case BC_CALLT: - dasm_put(Dst, 14096, LJ_TFUNC, FRAME_TYPE, Dt7(->ffid), Dt7(->pc)); - dasm_put(Dst, 14211, FRAME_TYPE, Dt7(->pc), PC2PROTO(k), FRAME_VARG, FRAME_TYPEP, FRAME_VARG); + dasm_put(Dst, 14149, LJ_TFUNC, FRAME_TYPE, Dt7(->ffid), Dt7(->pc)); + dasm_put(Dst, 14264, FRAME_TYPE, Dt7(->pc), PC2PROTO(k), FRAME_VARG, FRAME_TYPEP, FRAME_VARG); break; case BC_ITERC: - dasm_put(Dst, 14282, LJ_TFUNC, 2+1, Dt7(->pc)); + dasm_put(Dst, 14335, LJ_TFUNC, 2+1, Dt7(->pc)); break; case BC_ITERN: #if LJ_HASJIT #endif - dasm_put(Dst, 14353, Dt6(->asize), Dt6(->array), LJ_TNIL); + dasm_put(Dst, 14406, Dt6(->asize), Dt6(->array), LJ_TNIL); if (LJ_DUALNUM) { - dasm_put(Dst, 11126, LJ_TISNUM); + dasm_put(Dst, 11146, LJ_TISNUM); } else if (sse) { - dasm_put(Dst, 11203); + dasm_put(Dst, 11240); } else { - dasm_put(Dst, 14399); + dasm_put(Dst, 14452); } - dasm_put(Dst, 14405); + dasm_put(Dst, 14458); if (LJ_DUALNUM) { } else if (sse) { - dasm_put(Dst, 11091); + dasm_put(Dst, 11111); } else { - dasm_put(Dst, 11103); + dasm_put(Dst, 11123); } - dasm_put(Dst, 14418, -BCBIAS_J*4); + dasm_put(Dst, 14471, -BCBIAS_J*4); if (!LJ_DUALNUM && !sse) { - dasm_put(Dst, 14470); + dasm_put(Dst, 14523); } - dasm_put(Dst, 14476, Dt6(->hmask), sizeof(Node), Dt6(->node), DtB(->val.it), LJ_TNIL, DtB(->key), DtB(->val)); + dasm_put(Dst, 14529, Dt6(->hmask), sizeof(Node), Dt6(->node), DtB(->val.it), LJ_TNIL, DtB(->key), DtB(->val)); break; case BC_ISNEXT: - dasm_put(Dst, 14548, LJ_TFUNC, LJ_TTAB, LJ_TNIL, Dt8(->ffid), FF_next_N, -BCBIAS_J*4, BC_JMP, -BCBIAS_J*4, BC_ITERC); + dasm_put(Dst, 14601, LJ_TFUNC, LJ_TTAB, LJ_TNIL, Dt8(->ffid), FF_next_N, -BCBIAS_J*4, BC_JMP, -BCBIAS_J*4, BC_ITERC); break; case BC_VARG: - dasm_put(Dst, 14648, (8+FRAME_VARG), LJ_TNIL, Dt1(->maxstack)); - dasm_put(Dst, 14808, Dt1(->base), Dt1(->top), Dt1(->base), Dt1(->top)); + dasm_put(Dst, 14701, (8+FRAME_VARG), LJ_TNIL, Dt1(->maxstack)); + dasm_put(Dst, 14861, Dt1(->base), Dt1(->top), Dt1(->base), Dt1(->top)); break; /* -- Returns ----------------------------------------------------------- */ case BC_RETM: - dasm_put(Dst, 14049); + dasm_put(Dst, 14102); break; case BC_RET: case BC_RET0: case BC_RET1: if (op != BC_RET0) { - dasm_put(Dst, 14874); + dasm_put(Dst, 14927); } - dasm_put(Dst, 14878, FRAME_TYPE); + dasm_put(Dst, 14931, FRAME_TYPE); switch (op) { case BC_RET: - dasm_put(Dst, 14897); + dasm_put(Dst, 14950); break; case BC_RET1: - dasm_put(Dst, 14949); + dasm_put(Dst, 15002); /* fallthrough */ case BC_RET0: - dasm_put(Dst, 14959); + dasm_put(Dst, 15012); default: break; } - dasm_put(Dst, 14970, Dt7(->pc), PC2PROTO(k)); + dasm_put(Dst, 15023, Dt7(->pc), PC2PROTO(k)); if (op == BC_RET) { - dasm_put(Dst, 15014, LJ_TNIL); + dasm_put(Dst, 15067, LJ_TNIL); } else { - dasm_put(Dst, 15023, LJ_TNIL); + dasm_put(Dst, 15076, LJ_TNIL); } - dasm_put(Dst, 15030, -FRAME_VARG, FRAME_TYPEP); + dasm_put(Dst, 15083, -FRAME_VARG, FRAME_TYPEP); if (op != BC_RET0) { - dasm_put(Dst, 15054); + dasm_put(Dst, 15107); } - dasm_put(Dst, 4688); + dasm_put(Dst, 4708); break; /* -- Loops and branches ------------------------------------------------ */ @@ -2758,7 +2775,7 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) case BC_FORL: #if LJ_HASJIT - dasm_put(Dst, 15058, HOTCOUNT_PCMASK, GG_DISP2HOT); + dasm_put(Dst, 15111, HOTCOUNT_PCMASK, GG_DISP2HOT); #endif break; @@ -2770,111 +2787,111 @@ 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, 15079); + dasm_put(Dst, 15132); if (LJ_DUALNUM) { - dasm_put(Dst, 15083, LJ_TISNUM); + dasm_put(Dst, 15136, LJ_TISNUM); if (!vk) { - dasm_put(Dst, 15093, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 15146, LJ_TISNUM, LJ_TISNUM); } else { #ifdef LUA_USE_ASSERT - dasm_put(Dst, 15122, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 15175, LJ_TISNUM, LJ_TISNUM); #endif - dasm_put(Dst, 15141); + dasm_put(Dst, 15194); } - dasm_put(Dst, 15160, LJ_TISNUM); + dasm_put(Dst, 15213, LJ_TISNUM); if (op == BC_FORI) { - dasm_put(Dst, 15171, -BCBIAS_J*4); + dasm_put(Dst, 15224, -BCBIAS_J*4); } else if (op == BC_JFORI) { - dasm_put(Dst, 15185, -BCBIAS_J*4, BC_JLOOP); + dasm_put(Dst, 15238, -BCBIAS_J*4, BC_JLOOP); } else if (op == BC_IFORL) { - dasm_put(Dst, 15203, -BCBIAS_J*4); + dasm_put(Dst, 15256, -BCBIAS_J*4); } else { - dasm_put(Dst, 15195, BC_JLOOP); + dasm_put(Dst, 15248, BC_JLOOP); } - dasm_put(Dst, 15217); + dasm_put(Dst, 15270); if (vk) { - dasm_put(Dst, 15241); + dasm_put(Dst, 15294); } - dasm_put(Dst, 15160, LJ_TISNUM); + dasm_put(Dst, 15213, LJ_TISNUM); if (op == BC_FORI) { - dasm_put(Dst, 15250); + dasm_put(Dst, 15303); } else if (op == BC_JFORI) { - dasm_put(Dst, 15255, -BCBIAS_J*4, BC_JLOOP); + dasm_put(Dst, 15308, -BCBIAS_J*4, BC_JLOOP); } else if (op == BC_IFORL) { - dasm_put(Dst, 15269); + dasm_put(Dst, 15322); } else { - dasm_put(Dst, 15265, BC_JLOOP); + dasm_put(Dst, 15318, BC_JLOOP); } - dasm_put(Dst, 15274); + dasm_put(Dst, 15327); } else if (!vk) { - dasm_put(Dst, 15281, LJ_TISNUM); + dasm_put(Dst, 15334, LJ_TISNUM); } if (!vk) { - dasm_put(Dst, 15287, LJ_TISNUM); + dasm_put(Dst, 15340, LJ_TISNUM); } else { #ifdef LUA_USE_ASSERT - dasm_put(Dst, 15301, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 15354, LJ_TISNUM, LJ_TISNUM); #endif } - dasm_put(Dst, 15320); + dasm_put(Dst, 15373); if (!vk) { - dasm_put(Dst, 15324, LJ_TISNUM); + dasm_put(Dst, 15377, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 15333); + dasm_put(Dst, 15386); if (vk) { - dasm_put(Dst, 15345); + dasm_put(Dst, 15398); } else { - dasm_put(Dst, 15364); + dasm_put(Dst, 15417); } - dasm_put(Dst, 15369); + dasm_put(Dst, 15422); } else { - dasm_put(Dst, 15382); + dasm_put(Dst, 15435); if (vk) { - dasm_put(Dst, 15388); + dasm_put(Dst, 15441); } else { - dasm_put(Dst, 15404); + dasm_put(Dst, 15457); } - dasm_put(Dst, 15412); + dasm_put(Dst, 15465); if (cmov) { - dasm_put(Dst, 10190); + dasm_put(Dst, 10210); } else { - dasm_put(Dst, 10196); + dasm_put(Dst, 10216); } if (!cmov) { - dasm_put(Dst, 15417); + dasm_put(Dst, 15470); } } if (op == BC_FORI) { if (LJ_DUALNUM) { - dasm_put(Dst, 15423); + dasm_put(Dst, 15476); } else { - dasm_put(Dst, 15428, -BCBIAS_J*4); + dasm_put(Dst, 15481, -BCBIAS_J*4); } } else if (op == BC_JFORI) { - dasm_put(Dst, 15438, -BCBIAS_J*4, BC_JLOOP); + dasm_put(Dst, 15491, -BCBIAS_J*4, BC_JLOOP); } else if (op == BC_IFORL) { if (LJ_DUALNUM) { - dasm_put(Dst, 15452); + dasm_put(Dst, 15505); } else { - dasm_put(Dst, 15457, -BCBIAS_J*4); + dasm_put(Dst, 15510, -BCBIAS_J*4); } } else { - dasm_put(Dst, 15448, BC_JLOOP); + dasm_put(Dst, 15501, BC_JLOOP); } if (LJ_DUALNUM) { - dasm_put(Dst, 10119); + dasm_put(Dst, 10139); } else { - dasm_put(Dst, 10876); + dasm_put(Dst, 10896); } if (sse) { - dasm_put(Dst, 15467); + dasm_put(Dst, 15520); } break; case BC_ITERL: #if LJ_HASJIT - dasm_put(Dst, 15058, HOTCOUNT_PCMASK, GG_DISP2HOT); + dasm_put(Dst, 15111, HOTCOUNT_PCMASK, GG_DISP2HOT); #endif break; @@ -2883,33 +2900,33 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) break; #endif case BC_IITERL: - dasm_put(Dst, 15478, LJ_TNIL); + dasm_put(Dst, 15531, LJ_TNIL); if (op == BC_JITERL) { - dasm_put(Dst, 15493, BC_JLOOP); + dasm_put(Dst, 15546, BC_JLOOP); } else { - dasm_put(Dst, 15507, -BCBIAS_J*4); + dasm_put(Dst, 15560, -BCBIAS_J*4); } - dasm_put(Dst, 10233); + dasm_put(Dst, 10253); break; case BC_LOOP: #if LJ_HASJIT - dasm_put(Dst, 15058, HOTCOUNT_PCMASK, GG_DISP2HOT); + dasm_put(Dst, 15111, HOTCOUNT_PCMASK, GG_DISP2HOT); #endif break; case BC_ILOOP: - dasm_put(Dst, 10235); + dasm_put(Dst, 10255); break; case BC_JLOOP: #if LJ_HASJIT - dasm_put(Dst, 15523, DISPATCH_J(trace), DtD(->mcode), DISPATCH_GL(jit_base), DISPATCH_GL(jit_L), 9*16+4*8, -1*16, -2*16, -3*16, -4*16, -5*16, -6*16, -7*16, -8*16, -9*16); + dasm_put(Dst, 15576, DISPATCH_J(trace), DtD(->mcode), DISPATCH_GL(jit_base), DISPATCH_GL(jit_L), 9*16+4*8, -1*16, -2*16, -3*16, -4*16, -5*16, -6*16, -7*16, -8*16, -9*16); #endif break; case BC_JMP: - dasm_put(Dst, 15632, -BCBIAS_J*4); + dasm_put(Dst, 15685, -BCBIAS_J*4); break; /* -- Function headers -------------------------------------------------- */ @@ -2923,7 +2940,7 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) case BC_FUNCF: #if LJ_HASJIT - dasm_put(Dst, 15657, HOTCOUNT_PCMASK, GG_DISP2HOT); + dasm_put(Dst, 15710, HOTCOUNT_PCMASK, GG_DISP2HOT); #endif case BC_FUNCV: /* NYI: compiled vararg functions. */ break; @@ -2933,47 +2950,47 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) break; #endif case BC_IFUNCF: - dasm_put(Dst, 15678, -4+PC2PROTO(k), Dt1(->maxstack), -4+PC2PROTO(numparams)); + dasm_put(Dst, 15731, -4+PC2PROTO(k), Dt1(->maxstack), -4+PC2PROTO(numparams)); if (op == BC_JFUNCF) { - dasm_put(Dst, 15708, BC_JLOOP); + dasm_put(Dst, 15761, BC_JLOOP); } else { - dasm_put(Dst, 10235); + dasm_put(Dst, 10255); } - dasm_put(Dst, 15717, LJ_TNIL); + dasm_put(Dst, 15770, LJ_TNIL); break; case BC_JFUNCV: #if !LJ_HASJIT break; #endif - dasm_put(Dst, 9380); + dasm_put(Dst, 9400); break; /* NYI: compiled vararg functions. */ case BC_IFUNCV: - dasm_put(Dst, 15739, FRAME_VARG, Dt1(->maxstack), -4+PC2PROTO(numparams), LJ_TNIL); + dasm_put(Dst, 15792, FRAME_VARG, Dt1(->maxstack), -4+PC2PROTO(numparams), LJ_TNIL); if (op == BC_JFUNCV) { - dasm_put(Dst, 15708, BC_JLOOP); + dasm_put(Dst, 15761, BC_JLOOP); } else { - dasm_put(Dst, 15830, -4+PC2PROTO(k)); + dasm_put(Dst, 15883, -4+PC2PROTO(k)); } - dasm_put(Dst, 15853, LJ_TNIL); + dasm_put(Dst, 15906, LJ_TNIL); break; case BC_FUNCC: case BC_FUNCCW: - dasm_put(Dst, 15875, Dt8(->f), Dt1(->base), 8*LUA_MINSTACK, Dt1(->maxstack), Dt1(->top)); + dasm_put(Dst, 15928, Dt8(->f), Dt1(->base), 8*LUA_MINSTACK, Dt1(->maxstack), Dt1(->top)); if (op == BC_FUNCC) { - dasm_put(Dst, 2352); + dasm_put(Dst, 2372); } else { - dasm_put(Dst, 15905); + dasm_put(Dst, 15958); } - dasm_put(Dst, 15913, DISPATCH_GL(vmstate), ~LJ_VMST_C); + dasm_put(Dst, 15966, DISPATCH_GL(vmstate), ~LJ_VMST_C); if (op == BC_FUNCC) { - dasm_put(Dst, 15922); + dasm_put(Dst, 15975); } else { - dasm_put(Dst, 15926, DISPATCH_GL(wrapf)); + dasm_put(Dst, 15979, DISPATCH_GL(wrapf)); } - dasm_put(Dst, 15931, DISPATCH_GL(vmstate), ~LJ_VMST_INTERP, Dt1(->base), Dt1(->top)); + dasm_put(Dst, 15984, DISPATCH_GL(vmstate), ~LJ_VMST_INTERP, Dt1(->base), Dt1(->top)); break; /* ---------------------------------------------------------------------- */ @@ -3001,7 +3018,7 @@ static int build_backend(BuildCtx *ctx) build_subroutines(ctx, cmov, sse); - dasm_put(Dst, 15956); + dasm_put(Dst, 16009); for (op = 0; op < BC__MAX; op++) build_ins(ctx, (BCOp)op, op, cmov, sse); diff --git a/src/buildvm_x86.dasc b/src/buildvm_x86.dasc index 242f8d6d..effd0737 100644 --- a/src/buildvm_x86.dasc +++ b/src/buildvm_x86.dasc @@ -1167,9 +1167,17 @@ static void build_subroutines(BuildCtx *ctx, int cmov, int sse) | mov L:FCARG1, L:RB | mov SAVE_PC, PC | call extern lj_meta_len@8 // (lua_State *L, TValue *o) - | // TValue * (metamethod) returned in eax (RC). + | // NULL (retry) or TValue * (metamethod) returned in eax (RC). | mov BASE, L:RB->base +#ifdef LUAJIT_ENABLE_LUA52COMPAT + | test RC, RC + | jne ->vmeta_binop // Binop call for compatibility. + | movzx RD, PC_RD + | mov TAB:FCARG1, [BASE+RD*8] + | jmp ->BC_LEN_Z +#else | jmp ->vmeta_binop // Binop call for compatibility. +#endif | |//-- Call metamethod ---------------------------------------------------- | @@ -4244,6 +4252,13 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) |2: | checktab RD, ->vmeta_len | mov TAB:FCARG1, [BASE+RD*8] +#ifdef LUAJIT_ENABLE_LUA52COMPAT + | mov TAB:RB, TAB:FCARG1->metatable + | cmp TAB:RB, 0 + | jnz >9 + |3: +#endif + |->BC_LEN_Z: | mov RB, BASE // Save BASE. | call extern lj_tab_len@4 // (GCtab *t) | // Length of table returned in eax (RD). @@ -4260,6 +4275,12 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) | mov BASE, RB // Restore BASE. | movzx RA, PC_RA | jmp <1 +#ifdef LUAJIT_ENABLE_LUA52COMPAT + |9: // Check for __len. + | test byte TAB:RB->nomm, 1<vmeta_len // 'no __len' flag NOT set: check. +#endif break; /* -- Binary ops -------------------------------------------------------- */ diff --git a/src/buildvm_x86.h b/src/buildvm_x86.h index 289f4bb9..7adb2637 100644 --- a/src/buildvm_x86.h +++ b/src/buildvm_x86.h @@ -12,7 +12,7 @@ #define DASM_SECTION_CODE_OP 0 #define DASM_SECTION_CODE_SUB 1 #define DASM_MAXSECTION 2 -static const unsigned char build_actionlist[17058] = { +static const unsigned char build_actionlist[17111] = { 254,1,248,10,252,247,198,237,15,132,244,11,131,230,252,248,41,252,242,141, 76,49,252,248,139,114,252,252,199,68,10,4,237,248,12,131,192,1,137,68,36, 20,252,247,198,237,15,132,244,13,248,14,129,252,246,239,252,247,198,237,15, @@ -90,89 +90,90 @@ static const unsigned char build_actionlist[17058] = { 137,116,36,24,232,251,1,6,139,149,233,133,192,15,132,244,42,248,44,137,193, 41,208,137,113,252,244,141,176,233,184,237,252,233,244,28,248,56,139,108, 36,48,137,149,233,141,20,194,137,252,233,137,116,36,24,232,251,1,7,139,149, - 233,252,233,244,44,248,57,141,76,202,8,248,29,137,76,36,20,137,68,36,16,131, - 252,233,8,141,4,193,139,108,36,48,137,76,36,4,137,68,36,8,137,44,36,137,149, - 233,255,137,116,36,24,232,251,1,8,139,149,233,139,76,36,20,139,68,36,16,139, - 105,252,248,131,192,1,57,215,15,132,244,58,137,202,137,114,252,252,139,181, - 233,139,14,15,182,252,233,15,182,205,131,198,4,252,255,36,171,248,59,139, - 108,36,48,137,149,233,137,202,137,252,233,137,116,36,24,232,251,1,9,139,149, - 233,139,70,252,252,15,182,204,15,182,232,193,232,16,252,255,164,253,171,233, - 248,60,129,252,248,239,15,130,244,61,139,106,4,129,252,253,239,15,131,244, - 61,139,114,252,252,137,68,36,20,137,106,252,252,139,42,137,106,252,248,131, - 232,2,15,132,244,248,137,209,248,1,131,193,8,139,105,4,137,105,252,252,139, - 41,137,105,252,248,131,232,1,15,133,244,1,248,2,255,139,68,36,20,252,233, - 244,62,248,63,129,252,248,239,15,130,244,61,139,106,4,184,237,252,247,213, - 57,232,255,15,71,197,255,15,134,244,247,137,232,248,1,255,248,2,139,106,252, - 248,139,132,253,197,233,139,114,252,252,199,66,252,252,237,137,66,252,248, - 252,233,244,64,248,65,129,252,248,239,15,130,244,61,139,106,4,139,114,252, - 252,129,252,253,239,15,133,244,252,248,1,139,42,139,173,233,248,2,133,252, - 237,199,66,252,252,237,15,132,244,64,139,131,233,199,66,252,252,237,255,137, - 106,252,248,139,141,233,35,136,233,105,201,239,3,141,233,248,3,129,185,233, - 239,15,133,244,250,57,129,233,15,132,244,251,248,4,139,137,233,133,201,15, - 133,244,3,252,233,244,64,248,5,139,105,4,129,252,253,239,255,15,132,244,64, - 139,1,137,106,252,252,137,66,252,248,252,233,244,64,248,6,129,252,253,239, - 15,132,244,1,129,252,253,239,15,135,244,254,189,237,248,8,252,247,213,139, - 172,253,171,233,252,233,244,2,248,66,129,252,248,239,15,130,244,61,255,129, - 122,253,4,239,15,133,244,61,139,42,131,189,233,0,15,133,244,61,129,122,253, - 12,239,15,133,244,61,139,66,8,137,133,233,139,114,252,252,199,66,252,252, - 237,137,106,252,248,252,246,133,233,235,15,132,244,247,128,165,233,235,139, - 131,233,137,171,233,137,133,233,248,1,255,252,233,244,64,248,67,129,252,248, - 239,15,130,244,61,129,122,253,4,239,15,133,244,61,139,2,139,108,36,48,137, - 68,36,4,137,44,36,137,213,131,194,8,137,84,36,8,232,251,1,10,137,252,234, - 139,40,139,64,4,139,114,252,252,137,106,252,248,137,66,252,252,252,233,244, - 64,248,68,129,252,248,239,15,133,244,61,129,122,253,4,239,255,15,133,244, - 247,139,42,252,233,244,69,248,1,15,135,244,61,255,15,131,244,61,255,252,242, - 15,16,2,252,233,244,70,255,221,2,252,233,244,71,255,248,72,129,252,248,239, - 15,130,244,61,139,114,252,252,129,122,253,4,239,15,133,244,249,139,2,248, - 2,199,66,252,252,237,137,66,252,248,252,233,244,64,248,3,129,122,253,4,239, - 15,135,244,61,131,187,233,0,15,133,244,61,139,171,233,59,171,233,255,15,130, - 244,247,232,244,73,248,1,139,108,36,48,137,149,233,137,116,36,24,137,252, - 233,255,232,251,1,11,255,232,251,1,12,255,139,149,233,252,233,244,2,248,74, - 129,252,248,239,15,130,244,61,15,132,244,248,248,1,129,122,253,4,239,15,133, - 244,61,139,108,36,48,137,149,233,137,149,233,139,114,252,252,139,2,137,68, - 36,4,137,44,36,131,194,8,137,84,36,8,137,116,36,24,232,251,1,13,139,149,233, - 133,192,15,132,244,249,139,106,8,139,66,12,137,106,252,248,137,66,252,252, - 139,106,16,139,66,20,137,42,137,66,4,248,75,184,237,255,252,233,244,76,248, - 2,199,66,12,237,252,233,244,1,248,3,199,66,252,252,237,252,233,244,64,248, - 77,129,252,248,239,15,130,244,61,139,42,129,122,253,4,239,15,133,244,61,255, - 131,189,233,0,15,133,244,61,255,139,106,252,248,139,133,233,139,114,252,252, - 199,66,252,252,237,137,66,252,248,199,66,12,237,184,237,252,233,244,76,248, - 78,129,252,248,239,15,130,244,61,129,122,253,4,239,15,133,244,61,129,122, - 253,12,239,255,139,114,252,252,255,139,66,8,131,192,1,199,66,252,252,237, - 137,66,252,248,255,252,242,15,16,66,8,189,0,0,252,240,63,102,15,110,205,102, - 15,112,201,81,252,242,15,88,193,252,242,15,45,192,252,242,15,17,66,252,248, - 255,221,66,8,217,232,222,193,219,20,36,221,90,252,248,139,4,36,255,139,42, - 59,133,233,15,131,244,248,193,224,3,3,133,233,248,1,129,120,253,4,239,15, - 132,244,79,139,40,139,64,4,137,42,137,66,4,252,233,244,75,248,2,131,189,233, - 0,15,132,244,79,137,252,233,137,213,137,194,232,251,1,14,137,252,234,133, - 192,15,133,244,1,248,79,184,237,252,233,244,76,248,80,255,139,106,252,248, - 139,133,233,139,114,252,252,199,66,252,252,237,137,66,252,248,255,199,66, - 12,237,199,66,8,0,0,0,0,255,15,87,192,252,242,15,17,66,8,255,217,252,238, - 221,90,8,255,184,237,252,233,244,76,248,81,129,252,248,239,15,130,244,61, - 141,74,8,131,232,1,190,237,248,1,15,182,171,233,193,252,237,235,131,229,1, - 1,252,238,252,233,244,28,248,82,129,252,248,239,15,130,244,61,129,122,253, - 12,239,15,133,244,61,255,139,106,4,137,106,12,199,66,4,237,139,42,139,114, - 8,137,106,8,137,50,141,74,16,131,232,2,190,237,252,233,244,1,248,83,129,252, - 248,239,15,130,244,61,139,42,139,114,252,252,137,116,36,24,137,44,36,129, - 122,253,4,239,15,133,244,61,131,189,233,0,15,133,244,61,128,189,233,235,15, - 135,244,61,139,141,233,15,132,244,247,255,59,141,233,15,132,244,61,248,1, - 141,116,193,252,240,59,181,233,15,135,244,61,137,181,233,139,108,36,48,137, - 149,233,131,194,8,137,149,233,141,108,194,232,41,252,245,57,206,15,132,244, - 249,248,2,139,68,46,4,137,70,252,252,139,4,46,137,70,252,248,131,252,238, - 8,57,206,15,133,244,2,248,3,137,76,36,4,49,201,137,76,36,12,137,76,36,8,232, - 244,25,199,131,233,237,255,139,108,36,48,139,52,36,139,149,233,129,252,248, - 239,15,135,244,254,248,4,139,142,233,139,190,233,137,142,233,137,252,254, - 41,206,15,132,244,252,141,4,50,193,252,238,3,59,133,233,15,135,244,255,137, - 213,41,205,248,5,139,1,137,4,41,139,65,4,137,68,41,4,131,193,8,57,252,249, - 15,133,244,5,248,6,141,70,2,199,66,252,252,237,248,7,139,116,36,24,137,68, - 36,20,185,252,248,252,255,252,255,252,255,252,247,198,237,255,15,132,244, - 13,252,233,244,14,248,8,199,66,252,252,237,139,142,233,131,252,233,8,137, - 142,233,139,1,137,2,139,65,4,137,66,4,184,237,252,233,244,7,248,9,139,12, - 36,137,185,233,137,252,242,137,252,233,232,251,1,0,139,52,36,139,149,233, - 252,233,244,4,248,84,139,106,252,248,139,173,233,139,114,252,252,137,116, - 36,24,137,44,36,131,189,233,0,15,133,244,61,255,128,189,233,235,15,135,244, - 61,139,141,233,15,132,244,247,59,141,233,15,132,244,61,248,1,141,116,193, - 252,248,59,181,233,15,135,244,61,137,181,233,139,108,36,48,137,149,233,137, + 233,255,133,192,15,133,244,44,15,183,70,252,254,139,12,194,252,233,244,57, + 255,252,233,244,44,255,248,58,141,76,202,8,248,29,137,76,36,20,137,68,36, + 16,131,252,233,8,141,4,193,139,108,36,48,137,76,36,4,137,68,36,8,137,44,36, + 137,149,233,137,116,36,24,232,251,1,8,139,149,233,139,76,36,20,139,68,36, + 16,139,105,252,248,131,192,1,57,215,15,132,244,59,137,202,137,114,252,252, + 139,181,233,139,14,15,182,252,233,15,182,205,131,198,4,252,255,36,171,248, + 60,139,108,36,48,137,149,233,137,202,137,252,233,137,116,36,24,232,251,1, + 9,139,149,233,139,70,252,252,15,182,204,15,182,232,193,232,16,252,255,164, + 253,171,233,248,61,129,252,248,239,15,130,244,62,139,106,4,129,252,253,239, + 15,131,244,62,139,114,252,252,137,68,36,20,137,106,252,252,139,42,137,106, + 252,248,131,232,2,15,132,244,248,255,137,209,248,1,131,193,8,139,105,4,137, + 105,252,252,139,41,137,105,252,248,131,232,1,15,133,244,1,248,2,139,68,36, + 20,252,233,244,63,248,64,129,252,248,239,15,130,244,62,139,106,4,184,237, + 252,247,213,57,232,255,15,71,197,255,15,134,244,247,137,232,248,1,255,248, + 2,139,106,252,248,139,132,253,197,233,139,114,252,252,199,66,252,252,237, + 137,66,252,248,252,233,244,65,248,66,129,252,248,239,15,130,244,62,139,106, + 4,139,114,252,252,129,252,253,239,15,133,244,252,248,1,139,42,139,173,233, + 248,2,133,252,237,199,66,252,252,237,15,132,244,65,139,131,233,199,66,252, + 252,237,255,137,106,252,248,139,141,233,35,136,233,105,201,239,3,141,233, + 248,3,129,185,233,239,15,133,244,250,57,129,233,15,132,244,251,248,4,139, + 137,233,133,201,15,133,244,3,252,233,244,65,248,5,139,105,4,129,252,253,239, + 255,15,132,244,65,139,1,137,106,252,252,137,66,252,248,252,233,244,65,248, + 6,129,252,253,239,15,132,244,1,129,252,253,239,15,135,244,254,189,237,248, + 8,252,247,213,139,172,253,171,233,252,233,244,2,248,67,129,252,248,239,15, + 130,244,62,255,129,122,253,4,239,15,133,244,62,139,42,131,189,233,0,15,133, + 244,62,129,122,253,12,239,15,133,244,62,139,66,8,137,133,233,139,114,252, + 252,199,66,252,252,237,137,106,252,248,252,246,133,233,235,15,132,244,247, + 128,165,233,235,139,131,233,137,171,233,137,133,233,248,1,255,252,233,244, + 65,248,68,129,252,248,239,15,130,244,62,129,122,253,4,239,15,133,244,62,139, + 2,139,108,36,48,137,68,36,4,137,44,36,137,213,131,194,8,137,84,36,8,232,251, + 1,10,137,252,234,139,40,139,64,4,139,114,252,252,137,106,252,248,137,66,252, + 252,252,233,244,65,248,69,129,252,248,239,15,133,244,62,129,122,253,4,239, + 255,15,133,244,247,139,42,252,233,244,70,248,1,15,135,244,62,255,15,131,244, + 62,255,252,242,15,16,2,252,233,244,71,255,221,2,252,233,244,72,255,248,73, + 129,252,248,239,15,130,244,62,139,114,252,252,129,122,253,4,239,15,133,244, + 249,139,2,248,2,199,66,252,252,237,137,66,252,248,252,233,244,65,248,3,129, + 122,253,4,239,15,135,244,62,131,187,233,0,15,133,244,62,139,171,233,59,171, + 233,255,15,130,244,247,232,244,74,248,1,139,108,36,48,137,149,233,137,116, + 36,24,137,252,233,255,232,251,1,11,255,232,251,1,12,255,139,149,233,252,233, + 244,2,248,75,129,252,248,239,15,130,244,62,15,132,244,248,248,1,129,122,253, + 4,239,15,133,244,62,139,108,36,48,137,149,233,137,149,233,139,114,252,252, + 139,2,137,68,36,4,137,44,36,131,194,8,137,84,36,8,137,116,36,24,232,251,1, + 13,139,149,233,133,192,15,132,244,249,139,106,8,139,66,12,137,106,252,248, + 137,66,252,252,139,106,16,139,66,20,137,42,137,66,4,248,76,184,237,255,252, + 233,244,77,248,2,199,66,12,237,252,233,244,1,248,3,199,66,252,252,237,252, + 233,244,65,248,78,129,252,248,239,15,130,244,62,139,42,129,122,253,4,239, + 15,133,244,62,255,131,189,233,0,15,133,244,62,255,139,106,252,248,139,133, + 233,139,114,252,252,199,66,252,252,237,137,66,252,248,199,66,12,237,184,237, + 252,233,244,77,248,79,129,252,248,239,15,130,244,62,129,122,253,4,239,15, + 133,244,62,129,122,253,12,239,255,139,114,252,252,255,139,66,8,131,192,1, + 199,66,252,252,237,137,66,252,248,255,252,242,15,16,66,8,189,0,0,252,240, + 63,102,15,110,205,102,15,112,201,81,252,242,15,88,193,252,242,15,45,192,252, + 242,15,17,66,252,248,255,221,66,8,217,232,222,193,219,20,36,221,90,252,248, + 139,4,36,255,139,42,59,133,233,15,131,244,248,193,224,3,3,133,233,248,1,129, + 120,253,4,239,15,132,244,80,139,40,139,64,4,137,42,137,66,4,252,233,244,76, + 248,2,131,189,233,0,15,132,244,80,137,252,233,137,213,137,194,232,251,1,14, + 137,252,234,133,192,15,133,244,1,248,80,184,237,252,233,244,77,248,81,255, + 139,106,252,248,139,133,233,139,114,252,252,199,66,252,252,237,137,66,252, + 248,255,199,66,12,237,199,66,8,0,0,0,0,255,15,87,192,252,242,15,17,66,8,255, + 217,252,238,221,90,8,255,184,237,252,233,244,77,248,82,129,252,248,239,15, + 130,244,62,141,74,8,131,232,1,190,237,248,1,15,182,171,233,193,252,237,235, + 131,229,1,1,252,238,252,233,244,28,248,83,129,252,248,239,15,130,244,62,129, + 122,253,12,239,15,133,244,62,255,139,106,4,137,106,12,199,66,4,237,139,42, + 139,114,8,137,106,8,137,50,141,74,16,131,232,2,190,237,252,233,244,1,248, + 84,129,252,248,239,15,130,244,62,139,42,139,114,252,252,137,116,36,24,137, + 44,36,129,122,253,4,239,15,133,244,62,131,189,233,0,15,133,244,62,128,189, + 233,235,15,135,244,62,139,141,233,15,132,244,247,255,59,141,233,15,132,244, + 62,248,1,141,116,193,252,240,59,181,233,15,135,244,62,137,181,233,139,108, + 36,48,137,149,233,131,194,8,137,149,233,141,108,194,232,41,252,245,57,206, + 15,132,244,249,248,2,139,68,46,4,137,70,252,252,139,4,46,137,70,252,248,131, + 252,238,8,57,206,15,133,244,2,248,3,137,76,36,4,49,201,137,76,36,12,137,76, + 36,8,232,244,25,199,131,233,237,255,139,108,36,48,139,52,36,139,149,233,129, + 252,248,239,15,135,244,254,248,4,139,142,233,139,190,233,137,142,233,137, + 252,254,41,206,15,132,244,252,141,4,50,193,252,238,3,59,133,233,15,135,244, + 255,137,213,41,205,248,5,139,1,137,4,41,139,65,4,137,68,41,4,131,193,8,57, + 252,249,15,133,244,5,248,6,141,70,2,199,66,252,252,237,248,7,139,116,36,24, + 137,68,36,20,185,252,248,252,255,252,255,252,255,252,247,198,237,255,15,132, + 244,13,252,233,244,14,248,8,199,66,252,252,237,139,142,233,131,252,233,8, + 137,142,233,139,1,137,2,139,65,4,137,66,4,184,237,252,233,244,7,248,9,139, + 12,36,137,185,233,137,252,242,137,252,233,232,251,1,0,139,52,36,139,149,233, + 252,233,244,4,248,85,139,106,252,248,139,173,233,139,114,252,252,137,116, + 36,24,137,44,36,131,189,233,0,15,133,244,62,255,128,189,233,235,15,135,244, + 62,139,141,233,15,132,244,247,59,141,233,15,132,244,62,248,1,141,116,193, + 252,248,59,181,233,15,135,244,62,137,181,233,139,108,36,48,137,149,233,137, 149,233,141,108,194,252,240,41,252,245,57,206,15,132,244,249,248,2,255,139, 68,46,4,137,70,252,252,139,4,46,137,70,252,248,131,252,238,8,57,206,15,133, 244,2,248,3,137,76,36,4,49,201,137,76,36,12,137,76,36,8,232,244,25,199,131, @@ -183,243 +184,243 @@ static const unsigned char build_actionlist[17058] = { 6,141,70,1,248,7,139,116,36,24,137,68,36,20,49,201,252,247,198,237,15,132, 244,13,252,233,244,14,248,8,137,252,242,137,252,233,232,251,1,15,248,9,139, 12,36,137,185,233,137,252,242,137,252,233,232,251,1,0,139,52,36,139,149,233, - 252,233,244,4,248,85,139,108,36,48,252,247,133,233,237,15,132,244,61,255, + 252,233,244,4,248,86,139,108,36,48,252,247,133,233,237,15,132,244,62,255, 137,149,233,141,68,194,252,248,137,133,233,49,192,137,133,233,176,235,136, - 133,233,252,233,244,16,255,248,69,255,248,71,139,114,252,252,221,90,252,248, - 252,233,244,64,255,248,86,129,252,248,239,15,130,244,61,255,129,122,253,4, - 239,15,133,244,248,139,42,131,252,253,0,15,137,244,69,252,247,221,15,136, - 244,247,248,87,248,69,139,114,252,252,199,66,252,252,237,137,106,252,248, - 252,233,244,64,248,1,139,114,252,252,199,66,252,252,0,0,224,65,199,66,252, - 248,0,0,0,0,252,233,244,64,248,2,15,135,244,61,255,129,122,253,4,239,15,131, - 244,61,255,252,242,15,16,2,102,15,252,239,201,102,15,118,201,102,15,115,209, - 1,15,84,193,248,70,139,114,252,252,252,242,15,17,66,252,248,255,221,2,217, - 225,248,70,248,71,139,114,252,252,221,90,252,248,255,248,64,184,237,248,76, - 137,68,36,20,248,62,252,247,198,237,15,133,244,253,248,5,56,70,252,255,15, + 133,233,252,233,244,16,255,248,70,255,248,72,139,114,252,252,221,90,252,248, + 252,233,244,65,255,248,87,129,252,248,239,15,130,244,62,255,129,122,253,4, + 239,15,133,244,248,139,42,131,252,253,0,15,137,244,70,252,247,221,15,136, + 244,247,248,88,248,70,139,114,252,252,199,66,252,252,237,137,106,252,248, + 252,233,244,65,248,1,139,114,252,252,199,66,252,252,0,0,224,65,199,66,252, + 248,0,0,0,0,252,233,244,65,248,2,15,135,244,62,255,129,122,253,4,239,15,131, + 244,62,255,252,242,15,16,2,102,15,252,239,201,102,15,118,201,102,15,115,209, + 1,15,84,193,248,71,139,114,252,252,252,242,15,17,66,252,248,255,221,2,217, + 225,248,71,248,72,139,114,252,252,221,90,252,248,255,248,65,184,237,248,77, + 137,68,36,20,248,63,252,247,198,237,15,133,244,253,248,5,56,70,252,255,15, 135,244,252,15,182,78,252,253,252,247,209,141,20,202,139,6,15,182,204,15, 182,232,131,198,4,193,232,16,252,255,36,171,248,6,199,68,194,252,244,237, 131,192,1,252,233,244,5,248,7,185,252,248,252,255,252,255,252,255,252,233, - 244,14,248,88,255,129,122,253,4,239,15,133,244,247,139,42,252,233,244,69, - 248,1,15,135,244,61,255,252,242,15,16,2,232,244,89,255,252,242,15,45,232, - 129,252,253,0,0,0,128,15,133,244,69,252,242,15,42,205,102,15,46,193,15,138, - 244,70,15,132,244,69,255,221,2,232,244,89,255,219,20,36,139,44,36,129,252, + 244,14,248,89,255,129,122,253,4,239,15,133,244,247,139,42,252,233,244,70, + 248,1,15,135,244,62,255,252,242,15,16,2,232,244,90,255,252,242,15,45,232, + 129,252,253,0,0,0,128,15,133,244,70,252,242,15,42,205,102,15,46,193,15,138, + 244,71,15,132,244,70,255,221,2,232,244,90,255,219,20,36,139,44,36,129,252, 253,0,0,0,128,15,133,244,248,217,192,219,4,36,255,223,252,233,221,216,255, - 218,252,233,223,224,158,255,15,138,244,71,15,133,244,71,248,2,221,216,252, - 233,244,69,255,248,90,255,252,242,15,16,2,232,244,91,255,221,2,232,244,91, - 255,248,92,129,252,248,239,15,130,244,61,129,122,253,4,239,15,131,244,61, - 252,242,15,81,2,252,233,244,70,255,248,92,129,252,248,239,15,130,244,61,129, - 122,253,4,239,15,131,244,61,221,2,217,252,250,252,233,244,71,255,248,93,129, - 252,248,239,15,130,244,61,129,122,253,4,239,15,131,244,61,217,252,237,221, - 2,217,252,241,252,233,244,71,248,94,129,252,248,239,15,130,244,61,129,122, - 253,4,239,15,131,244,61,217,252,236,221,2,217,252,241,252,233,244,71,248, - 95,129,252,248,239,255,15,130,244,61,129,122,253,4,239,15,131,244,61,221, - 2,232,244,96,252,233,244,71,248,97,129,252,248,239,15,130,244,61,129,122, - 253,4,239,15,131,244,61,221,2,217,252,254,252,233,244,71,248,98,129,252,248, - 239,255,15,130,244,61,129,122,253,4,239,15,131,244,61,221,2,217,252,255,252, - 233,244,71,248,99,129,252,248,239,15,130,244,61,129,122,253,4,239,15,131, - 244,61,221,2,217,252,242,221,216,252,233,244,71,248,100,129,252,248,239,15, - 130,244,61,255,129,122,253,4,239,15,131,244,61,221,2,217,192,216,200,217, - 232,222,225,217,252,250,217,252,243,252,233,244,71,248,101,129,252,248,239, - 15,130,244,61,129,122,253,4,239,15,131,244,61,221,2,217,192,216,200,217,232, - 222,225,217,252,250,217,201,217,252,243,252,233,244,71,248,102,129,252,248, - 239,15,130,244,61,129,122,253,4,239,15,131,244,61,255,221,2,217,232,217,252, - 243,252,233,244,71,255,248,103,129,252,248,239,15,130,244,61,129,122,253, - 4,239,15,131,244,61,252,242,15,16,2,252,242,15,17,4,36,255,248,103,129,252, - 248,239,15,130,244,61,129,122,253,4,239,15,131,244,61,221,2,221,28,36,255, - 137,213,232,251,1,16,137,252,234,252,233,244,71,255,248,104,129,252,248,239, - 15,130,244,61,129,122,253,4,239,15,131,244,61,252,242,15,16,2,252,242,15, - 17,4,36,255,248,104,129,252,248,239,15,130,244,61,129,122,253,4,239,15,131, - 244,61,221,2,221,28,36,255,137,213,232,251,1,17,137,252,234,252,233,244,71, - 255,248,105,129,252,248,239,15,130,244,61,129,122,253,4,239,15,131,244,61, - 252,242,15,16,2,252,242,15,17,4,36,255,248,105,129,252,248,239,15,130,244, - 61,129,122,253,4,239,15,131,244,61,221,2,221,28,36,255,137,213,232,251,1, - 18,137,252,234,252,233,244,71,248,106,255,248,107,129,252,248,239,15,130, - 244,61,129,122,253,4,239,15,131,244,61,252,242,15,16,2,139,106,252,248,252, - 242,15,89,133,233,252,233,244,70,255,248,107,129,252,248,239,15,130,244,61, - 129,122,253,4,239,15,131,244,61,221,2,139,106,252,248,220,141,233,252,233, - 244,71,255,248,108,129,252,248,239,15,130,244,61,129,122,253,4,239,15,131, - 244,61,129,122,253,12,239,15,131,244,61,221,2,221,66,8,217,252,243,252,233, - 244,71,248,109,129,252,248,239,15,130,244,61,129,122,253,4,239,15,131,244, - 61,129,122,253,12,239,255,15,131,244,61,221,66,8,221,2,217,252,253,221,217, - 252,233,244,71,248,110,129,252,248,239,15,130,244,61,139,106,4,129,252,253, - 239,15,131,244,61,139,114,252,252,139,2,137,106,252,252,137,66,252,248,209, + 218,252,233,223,224,158,255,15,138,244,72,15,133,244,72,248,2,221,216,252, + 233,244,70,255,248,91,255,252,242,15,16,2,232,244,92,255,221,2,232,244,92, + 255,248,93,129,252,248,239,15,130,244,62,129,122,253,4,239,15,131,244,62, + 252,242,15,81,2,252,233,244,71,255,248,93,129,252,248,239,15,130,244,62,129, + 122,253,4,239,15,131,244,62,221,2,217,252,250,252,233,244,72,255,248,94,129, + 252,248,239,15,130,244,62,129,122,253,4,239,15,131,244,62,217,252,237,221, + 2,217,252,241,252,233,244,72,248,95,129,252,248,239,15,130,244,62,129,122, + 253,4,239,15,131,244,62,217,252,236,221,2,217,252,241,252,233,244,72,248, + 96,129,252,248,239,255,15,130,244,62,129,122,253,4,239,15,131,244,62,221, + 2,232,244,97,252,233,244,72,248,98,129,252,248,239,15,130,244,62,129,122, + 253,4,239,15,131,244,62,221,2,217,252,254,252,233,244,72,248,99,129,252,248, + 239,255,15,130,244,62,129,122,253,4,239,15,131,244,62,221,2,217,252,255,252, + 233,244,72,248,100,129,252,248,239,15,130,244,62,129,122,253,4,239,15,131, + 244,62,221,2,217,252,242,221,216,252,233,244,72,248,101,129,252,248,239,15, + 130,244,62,255,129,122,253,4,239,15,131,244,62,221,2,217,192,216,200,217, + 232,222,225,217,252,250,217,252,243,252,233,244,72,248,102,129,252,248,239, + 15,130,244,62,129,122,253,4,239,15,131,244,62,221,2,217,192,216,200,217,232, + 222,225,217,252,250,217,201,217,252,243,252,233,244,72,248,103,129,252,248, + 239,15,130,244,62,129,122,253,4,239,15,131,244,62,255,221,2,217,232,217,252, + 243,252,233,244,72,255,248,104,129,252,248,239,15,130,244,62,129,122,253, + 4,239,15,131,244,62,252,242,15,16,2,252,242,15,17,4,36,255,248,104,129,252, + 248,239,15,130,244,62,129,122,253,4,239,15,131,244,62,221,2,221,28,36,255, + 137,213,232,251,1,16,137,252,234,252,233,244,72,255,248,105,129,252,248,239, + 15,130,244,62,129,122,253,4,239,15,131,244,62,252,242,15,16,2,252,242,15, + 17,4,36,255,248,105,129,252,248,239,15,130,244,62,129,122,253,4,239,15,131, + 244,62,221,2,221,28,36,255,137,213,232,251,1,17,137,252,234,252,233,244,72, + 255,248,106,129,252,248,239,15,130,244,62,129,122,253,4,239,15,131,244,62, + 252,242,15,16,2,252,242,15,17,4,36,255,248,106,129,252,248,239,15,130,244, + 62,129,122,253,4,239,15,131,244,62,221,2,221,28,36,255,137,213,232,251,1, + 18,137,252,234,252,233,244,72,248,107,255,248,108,129,252,248,239,15,130, + 244,62,129,122,253,4,239,15,131,244,62,252,242,15,16,2,139,106,252,248,252, + 242,15,89,133,233,252,233,244,71,255,248,108,129,252,248,239,15,130,244,62, + 129,122,253,4,239,15,131,244,62,221,2,139,106,252,248,220,141,233,252,233, + 244,72,255,248,109,129,252,248,239,15,130,244,62,129,122,253,4,239,15,131, + 244,62,129,122,253,12,239,15,131,244,62,221,2,221,66,8,217,252,243,252,233, + 244,72,248,110,129,252,248,239,15,130,244,62,129,122,253,4,239,15,131,244, + 62,129,122,253,12,239,255,15,131,244,62,221,66,8,221,2,217,252,253,221,217, + 252,233,244,72,248,111,129,252,248,239,15,130,244,62,139,106,4,129,252,253, + 239,15,131,244,62,139,114,252,252,139,2,137,106,252,252,137,66,252,248,209, 229,129,252,253,0,0,224,252,255,15,131,244,249,9,232,15,132,244,249,184,252, 254,3,0,0,129,252,253,0,0,32,0,15,130,244,250,248,1,193,252,237,21,41,197, 255,252,242,15,42,197,255,137,108,36,16,219,68,36,16,255,139,106,252,252, 129,229,252,255,252,255,15,128,129,205,0,0,224,63,137,106,252,252,248,2,255, - 252,242,15,17,2,255,221,26,255,184,237,252,233,244,76,248,3,255,15,87,192, + 252,242,15,17,2,255,221,26,255,184,237,252,233,244,77,248,3,255,15,87,192, 252,233,244,2,255,217,252,238,252,233,244,2,255,248,4,255,252,242,15,16,2, 189,0,0,80,67,102,15,110,205,102,15,112,201,81,252,242,15,89,193,252,242, 15,17,66,252,248,255,221,2,199,68,36,16,0,0,128,90,216,76,36,16,221,90,252, - 248,255,139,106,252,252,184,52,4,0,0,209,229,252,233,244,1,255,248,111,129, - 252,248,239,15,130,244,61,129,122,253,4,239,15,131,244,61,252,242,15,16,2, - 255,248,111,129,252,248,239,15,130,244,61,129,122,253,4,239,15,131,244,61, + 248,255,139,106,252,252,184,52,4,0,0,209,229,252,233,244,1,255,248,112,129, + 252,248,239,15,130,244,62,129,122,253,4,239,15,131,244,62,252,242,15,16,2, + 255,248,112,129,252,248,239,15,130,244,62,129,122,253,4,239,15,131,244,62, 221,2,255,139,106,4,139,114,252,252,209,229,129,252,253,0,0,224,252,255,15, - 132,244,250,255,15,40,224,232,244,112,252,242,15,92,224,248,1,252,242,15, - 17,66,252,248,252,242,15,17,34,255,217,192,232,244,112,220,252,233,248,1, + 132,244,250,255,15,40,224,232,244,113,252,242,15,92,224,248,1,252,242,15, + 17,66,252,248,252,242,15,17,34,255,217,192,232,244,113,220,252,233,248,1, 221,90,252,248,221,26,255,139,66,252,252,139,106,4,49,232,15,136,244,249, - 248,2,184,237,252,233,244,76,248,3,129,252,245,0,0,0,128,137,106,4,252,233, + 248,2,184,237,252,233,244,77,248,3,129,252,245,0,0,0,128,137,106,4,252,233, 244,2,248,4,255,15,87,228,252,233,244,1,255,217,252,238,217,201,252,233,244, - 1,255,248,113,129,252,248,239,15,130,244,61,129,122,253,4,239,15,131,244, - 61,129,122,253,12,239,15,131,244,61,221,66,8,221,2,248,1,217,252,248,223, - 224,158,15,138,244,1,221,217,252,233,244,71,255,248,114,129,252,248,239,15, - 130,244,61,129,122,253,4,239,15,131,244,61,129,122,253,12,239,15,131,244, - 61,252,242,15,16,2,252,242,15,16,74,8,232,244,115,252,233,244,70,255,248, - 114,129,252,248,239,15,130,244,61,129,122,253,4,239,15,131,244,61,129,122, - 253,12,239,15,131,244,61,221,2,221,66,8,232,244,115,252,233,244,71,255,248, - 116,185,2,0,0,0,129,122,253,4,239,255,15,133,244,250,139,42,248,1,57,193, - 15,131,244,69,129,124,253,202,252,252,239,15,133,244,249,59,108,202,252,248, - 15,79,108,202,252,248,131,193,1,252,233,244,1,248,3,15,135,244,61,255,252, - 233,244,252,248,4,15,135,244,61,255,252,242,15,16,2,248,5,57,193,15,131,244, - 70,129,124,253,202,252,252,239,255,15,130,244,252,15,135,244,61,252,242,15, + 1,255,248,114,129,252,248,239,15,130,244,62,129,122,253,4,239,15,131,244, + 62,129,122,253,12,239,15,131,244,62,221,66,8,221,2,248,1,217,252,248,223, + 224,158,15,138,244,1,221,217,252,233,244,72,255,248,115,129,252,248,239,15, + 130,244,62,129,122,253,4,239,15,131,244,62,129,122,253,12,239,15,131,244, + 62,252,242,15,16,2,252,242,15,16,74,8,232,244,116,252,233,244,71,255,248, + 115,129,252,248,239,15,130,244,62,129,122,253,4,239,15,131,244,62,129,122, + 253,12,239,15,131,244,62,221,2,221,66,8,232,244,116,252,233,244,72,255,248, + 117,185,2,0,0,0,129,122,253,4,239,255,15,133,244,250,139,42,248,1,57,193, + 15,131,244,70,129,124,253,202,252,252,239,15,133,244,249,59,108,202,252,248, + 15,79,108,202,252,248,131,193,1,252,233,244,1,248,3,15,135,244,62,255,252, + 233,244,252,248,4,15,135,244,62,255,252,242,15,16,2,248,5,57,193,15,131,244, + 71,129,124,253,202,252,252,239,255,15,130,244,252,15,135,244,62,252,242,15, 42,76,202,252,248,252,233,244,253,255,248,6,252,242,15,16,76,202,252,248, 248,7,252,242,15,93,193,131,193,1,252,233,244,5,255,221,2,248,5,57,193,15, - 131,244,71,129,124,253,202,252,252,239,255,15,130,244,252,15,135,244,255, + 131,244,72,129,124,253,202,252,252,239,255,15,130,244,252,15,135,244,255, 219,68,202,252,248,252,233,244,253,255,15,131,244,255,255,248,6,221,68,202, 252,248,248,7,255,219,252,233,219,209,221,217,255,80,221,225,223,224,252, - 246,196,1,15,132,244,248,217,201,248,2,221,216,88,255,248,117,185,2,0,0,0, - 129,122,253,4,239,255,15,133,244,250,139,42,248,1,57,193,15,131,244,69,129, + 246,196,1,15,132,244,248,217,201,248,2,221,216,88,255,248,118,185,2,0,0,0, + 129,122,253,4,239,255,15,133,244,250,139,42,248,1,57,193,15,131,244,70,129, 124,253,202,252,252,239,15,133,244,249,59,108,202,252,248,15,76,108,202,252, - 248,131,193,1,252,233,244,1,248,3,15,135,244,61,255,248,6,252,242,15,16,76, + 248,131,193,1,252,233,244,1,248,3,15,135,244,62,255,248,6,252,242,15,16,76, 202,252,248,248,7,252,242,15,95,193,131,193,1,252,233,244,5,255,219,252,233, 218,209,221,217,255,80,221,225,223,224,252,246,196,1,15,133,244,248,217,201, - 248,2,221,216,88,255,248,9,221,216,252,233,244,61,255,248,118,129,252,248, - 239,15,130,244,61,129,122,253,4,239,15,133,244,61,139,42,255,139,173,233, - 252,233,244,69,255,252,242,15,42,133,233,252,233,244,70,255,219,133,233,252, - 233,244,71,255,248,119,129,252,248,239,15,133,244,61,129,122,253,4,239,15, - 133,244,61,139,42,139,114,252,252,131,189,233,1,15,130,244,79,15,182,173, - 233,255,252,242,15,42,197,252,233,244,70,255,137,108,36,16,219,68,36,16,252, - 233,244,71,255,248,120,139,171,233,59,171,233,15,130,244,247,232,244,73,248, - 1,129,252,248,239,15,133,244,61,129,122,253,4,239,255,15,133,244,61,139,42, - 129,252,253,252,255,0,0,0,15,135,244,61,137,108,36,20,255,15,131,244,61,252, - 242,15,44,42,129,252,253,252,255,0,0,0,15,135,244,61,137,108,36,20,255,15, - 131,244,61,221,2,219,92,36,20,129,124,36,20,252,255,0,0,0,15,135,244,61,255, - 199,68,36,8,1,0,0,0,141,68,36,20,248,121,139,108,36,48,137,149,233,137,68, + 248,2,221,216,88,255,248,9,221,216,252,233,244,62,255,248,119,129,252,248, + 239,15,130,244,62,129,122,253,4,239,15,133,244,62,139,42,255,139,173,233, + 252,233,244,70,255,252,242,15,42,133,233,252,233,244,71,255,219,133,233,252, + 233,244,72,255,248,120,129,252,248,239,15,133,244,62,129,122,253,4,239,15, + 133,244,62,139,42,139,114,252,252,131,189,233,1,15,130,244,80,15,182,173, + 233,255,252,242,15,42,197,252,233,244,71,255,137,108,36,16,219,68,36,16,252, + 233,244,72,255,248,121,139,171,233,59,171,233,15,130,244,247,232,244,74,248, + 1,129,252,248,239,15,133,244,62,129,122,253,4,239,255,15,133,244,62,139,42, + 129,252,253,252,255,0,0,0,15,135,244,62,137,108,36,20,255,15,131,244,62,252, + 242,15,44,42,129,252,253,252,255,0,0,0,15,135,244,62,137,108,36,20,255,15, + 131,244,62,221,2,219,92,36,20,129,124,36,20,252,255,0,0,0,15,135,244,62,255, + 199,68,36,8,1,0,0,0,141,68,36,20,248,122,139,108,36,48,137,149,233,137,68, 36,4,137,44,36,137,116,36,24,232,251,1,19,139,149,233,139,114,252,252,199, - 66,252,252,237,137,66,252,248,252,233,244,64,248,122,139,171,233,59,171,233, - 15,130,244,247,232,244,73,248,1,199,68,36,20,252,255,252,255,252,255,252, - 255,129,252,248,239,15,130,244,61,15,134,244,247,129,122,253,20,239,255,15, - 133,244,61,139,106,16,137,108,36,20,255,15,131,244,61,252,242,15,44,106,16, - 137,108,36,20,255,15,131,244,61,221,66,16,219,92,36,20,255,248,1,129,122, - 253,4,239,15,133,244,61,129,122,253,12,239,255,139,42,137,108,36,12,139,173, + 66,252,252,237,137,66,252,248,252,233,244,65,248,123,139,171,233,59,171,233, + 15,130,244,247,232,244,74,248,1,199,68,36,20,252,255,252,255,252,255,252, + 255,129,252,248,239,15,130,244,62,15,134,244,247,129,122,253,20,239,255,15, + 133,244,62,139,106,16,137,108,36,20,255,15,131,244,62,252,242,15,44,106,16, + 137,108,36,20,255,15,131,244,62,221,66,16,219,92,36,20,255,248,1,129,122, + 253,4,239,15,133,244,62,129,122,253,12,239,255,139,42,137,108,36,12,139,173, 233,255,139,74,8,255,252,242,15,44,74,8,255,221,66,8,219,92,36,8,139,76,36, 8,255,139,68,36,20,57,197,15,130,244,251,248,2,133,201,15,142,244,253,248, - 3,139,108,36,12,41,200,15,140,244,123,141,172,253,13,233,131,192,1,248,4, - 137,68,36,8,137,232,252,233,244,121,248,5,15,140,244,252,141,68,40,1,252, + 3,139,108,36,12,41,200,15,140,244,124,141,172,253,13,233,131,192,1,248,4, + 137,68,36,8,137,232,252,233,244,122,248,5,15,140,244,252,141,68,40,1,252, 233,244,2,248,6,137,232,252,233,244,2,248,7,255,15,132,244,254,1,252,233, - 131,193,1,15,143,244,3,248,8,185,1,0,0,0,252,233,244,3,248,123,49,192,252, - 233,244,4,248,124,129,252,248,239,15,130,244,61,139,171,233,59,171,233,15, - 130,244,247,232,244,73,248,1,255,129,122,253,4,239,15,133,244,61,129,122, - 253,12,239,139,42,255,15,133,244,61,139,66,8,255,15,131,244,61,252,242,15, - 44,66,8,255,15,131,244,61,221,66,8,219,92,36,20,139,68,36,20,255,133,192, - 15,142,244,123,131,189,233,1,15,130,244,123,15,133,244,125,57,131,233,15, - 130,244,125,15,182,141,233,139,171,233,137,68,36,8,248,1,136,77,0,131,197, - 1,131,232,1,15,133,244,1,139,131,233,252,233,244,121,248,126,129,252,248, - 239,255,15,130,244,61,139,171,233,59,171,233,15,130,244,247,232,244,73,248, - 1,129,122,253,4,239,15,133,244,61,139,42,139,133,233,133,192,15,132,244,123, - 57,131,233,15,130,244,127,129,197,239,137,116,36,20,137,68,36,8,139,179,233, + 131,193,1,15,143,244,3,248,8,185,1,0,0,0,252,233,244,3,248,124,49,192,252, + 233,244,4,248,125,129,252,248,239,15,130,244,62,139,171,233,59,171,233,15, + 130,244,247,232,244,74,248,1,255,129,122,253,4,239,15,133,244,62,129,122, + 253,12,239,139,42,255,15,133,244,62,139,66,8,255,15,131,244,62,252,242,15, + 44,66,8,255,15,131,244,62,221,66,8,219,92,36,20,139,68,36,20,255,133,192, + 15,142,244,124,131,189,233,1,15,130,244,124,15,133,244,126,57,131,233,15, + 130,244,126,15,182,141,233,139,171,233,137,68,36,8,248,1,136,77,0,131,197, + 1,131,232,1,15,133,244,1,139,131,233,252,233,244,122,248,127,129,252,248, + 239,255,15,130,244,62,139,171,233,59,171,233,15,130,244,247,232,244,74,248, + 1,129,122,253,4,239,15,133,244,62,139,42,139,133,233,133,192,15,132,244,124, + 57,131,233,15,130,244,128,129,197,239,137,116,36,20,137,68,36,8,139,179,233, 248,1,255,15,182,77,0,131,197,1,131,232,1,136,12,6,15,133,244,1,137,252,240, - 139,116,36,20,252,233,244,121,248,128,129,252,248,239,15,130,244,61,139,171, - 233,59,171,233,15,130,244,247,232,244,73,248,1,129,122,253,4,239,15,133,244, - 61,139,42,139,133,233,57,131,233,255,15,130,244,127,129,197,239,137,116,36, + 139,116,36,20,252,233,244,122,248,129,129,252,248,239,15,130,244,62,139,171, + 233,59,171,233,15,130,244,247,232,244,74,248,1,129,122,253,4,239,15,133,244, + 62,139,42,139,133,233,57,131,233,255,15,130,244,128,129,197,239,137,116,36, 20,137,68,36,8,139,179,233,252,233,244,249,248,1,15,182,76,5,0,131,252,249, 65,15,130,244,248,131,252,249,90,15,135,244,248,131,252,241,32,248,2,136, - 12,6,248,3,131,232,1,15,137,244,1,137,252,240,139,116,36,20,252,233,244,121, - 248,129,129,252,248,239,15,130,244,61,255,139,171,233,59,171,233,15,130,244, - 247,232,244,73,248,1,129,122,253,4,239,15,133,244,61,139,42,139,133,233,57, - 131,233,15,130,244,127,129,197,239,137,116,36,20,137,68,36,8,139,179,233, + 12,6,248,3,131,232,1,15,137,244,1,137,252,240,139,116,36,20,252,233,244,122, + 248,130,129,252,248,239,15,130,244,62,255,139,171,233,59,171,233,15,130,244, + 247,232,244,74,248,1,129,122,253,4,239,15,133,244,62,139,42,139,133,233,57, + 131,233,15,130,244,128,129,197,239,137,116,36,20,137,68,36,8,139,179,233, 252,233,244,249,248,1,15,182,76,5,0,131,252,249,97,15,130,244,248,255,131, 252,249,122,15,135,244,248,131,252,241,32,248,2,136,12,6,248,3,131,232,1, - 15,137,244,1,137,252,240,139,116,36,20,252,233,244,121,248,130,129,252,248, - 239,15,130,244,61,129,122,253,4,239,15,133,244,61,137,213,139,10,232,251, - 1,20,137,252,234,255,137,197,252,233,244,69,255,252,242,15,42,192,252,233, - 244,70,255,137,4,36,219,4,36,252,233,244,71,255,248,131,129,252,248,239,15, - 130,244,61,129,122,253,4,239,255,15,133,244,247,139,42,252,233,244,87,248, - 1,15,135,244,61,255,252,242,15,16,2,189,0,0,56,67,102,15,110,205,102,15,112, + 15,137,244,1,137,252,240,139,116,36,20,252,233,244,122,248,131,129,252,248, + 239,15,130,244,62,129,122,253,4,239,15,133,244,62,137,213,139,10,232,251, + 1,20,137,252,234,255,137,197,252,233,244,70,255,252,242,15,42,192,252,233, + 244,71,255,137,4,36,219,4,36,252,233,244,72,255,248,132,129,252,248,239,15, + 130,244,62,129,122,253,4,239,255,15,133,244,247,139,42,252,233,244,88,248, + 1,15,135,244,62,255,252,242,15,16,2,189,0,0,56,67,102,15,110,205,102,15,112, 201,81,252,242,15,88,193,102,15,126,197,255,221,2,199,68,36,16,0,0,192,89, - 216,68,36,16,221,28,36,255,139,44,36,255,252,233,244,87,255,248,132,129,252, - 248,239,15,130,244,61,255,189,0,0,56,67,102,15,110,205,102,15,112,201,81, + 216,68,36,16,221,28,36,255,139,44,36,255,252,233,244,88,255,248,133,129,252, + 248,239,15,130,244,62,255,189,0,0,56,67,102,15,110,205,102,15,112,201,81, 255,199,68,36,16,0,0,192,89,255,15,133,244,247,139,42,252,233,244,248,248, - 1,15,135,244,61,255,252,242,15,16,2,252,242,15,88,193,102,15,126,197,255, + 1,15,135,244,62,255,252,242,15,16,2,252,242,15,88,193,102,15,126,197,255, 221,2,216,68,36,16,221,28,36,139,44,36,255,248,2,137,68,36,20,141,68,194, - 252,240,248,1,57,208,15,134,244,87,129,120,253,4,239,255,15,133,244,248,35, - 40,131,232,8,252,233,244,1,248,2,15,135,244,133,255,15,131,244,133,255,252, + 252,240,248,1,57,208,15,134,244,88,129,120,253,4,239,255,15,133,244,248,35, + 40,131,232,8,252,233,244,1,248,2,15,135,244,134,255,15,131,244,134,255,252, 242,15,16,0,252,242,15,88,193,102,15,126,193,33,205,255,221,0,216,68,36,16, - 221,28,36,35,44,36,255,131,232,8,252,233,244,1,248,134,129,252,248,239,15, - 130,244,61,255,15,133,244,248,11,40,131,232,8,252,233,244,1,248,2,15,135, - 244,133,255,252,242,15,16,0,252,242,15,88,193,102,15,126,193,9,205,255,221, - 0,216,68,36,16,221,28,36,11,44,36,255,131,232,8,252,233,244,1,248,135,129, - 252,248,239,15,130,244,61,255,15,133,244,248,51,40,131,232,8,252,233,244, - 1,248,2,15,135,244,133,255,252,242,15,16,0,252,242,15,88,193,102,15,126,193, + 221,28,36,35,44,36,255,131,232,8,252,233,244,1,248,135,129,252,248,239,15, + 130,244,62,255,15,133,244,248,11,40,131,232,8,252,233,244,1,248,2,15,135, + 244,134,255,252,242,15,16,0,252,242,15,88,193,102,15,126,193,9,205,255,221, + 0,216,68,36,16,221,28,36,11,44,36,255,131,232,8,252,233,244,1,248,136,129, + 252,248,239,15,130,244,62,255,15,133,244,248,51,40,131,232,8,252,233,244, + 1,248,2,15,135,244,134,255,252,242,15,16,0,252,242,15,88,193,102,15,126,193, 49,205,255,221,0,216,68,36,16,221,28,36,51,44,36,255,131,232,8,252,233,244, - 1,248,136,129,252,248,239,15,130,244,61,129,122,253,4,239,255,221,2,199,68, + 1,248,137,129,252,248,239,15,130,244,62,129,122,253,4,239,255,221,2,199,68, 36,16,0,0,192,89,216,68,36,16,221,28,36,139,44,36,255,248,2,15,205,252,233, - 244,87,248,137,129,252,248,239,15,130,244,61,129,122,253,4,239,255,248,2, - 252,247,213,255,248,87,252,242,15,42,197,252,233,244,70,255,248,87,137,44, - 36,219,4,36,252,233,244,71,255,248,133,139,68,36,20,252,233,244,61,255,248, - 138,129,252,248,239,15,130,244,61,129,122,253,4,239,255,248,2,129,122,253, - 12,239,15,133,244,61,139,74,8,255,248,138,129,252,248,239,15,130,244,61,129, - 122,253,4,239,15,131,244,61,129,122,253,12,239,15,131,244,61,252,242,15,16, + 244,88,248,138,129,252,248,239,15,130,244,62,129,122,253,4,239,255,248,2, + 252,247,213,255,248,88,252,242,15,42,197,252,233,244,71,255,248,88,137,44, + 36,219,4,36,252,233,244,72,255,248,134,139,68,36,20,252,233,244,62,255,248, + 139,129,252,248,239,15,130,244,62,129,122,253,4,239,255,248,2,129,122,253, + 12,239,15,133,244,62,139,74,8,255,248,139,129,252,248,239,15,130,244,62,129, + 122,253,4,239,15,131,244,62,129,122,253,12,239,15,131,244,62,252,242,15,16, 2,252,242,15,16,74,8,189,0,0,56,67,102,15,110,213,102,15,112,210,81,252,242, - 15,88,194,252,242,15,88,202,102,15,126,197,102,15,126,201,255,248,138,129, - 252,248,239,15,130,244,61,129,122,253,4,239,15,131,244,61,129,122,253,12, - 239,15,131,244,61,221,2,221,66,8,199,68,36,16,0,0,192,89,216,68,36,16,221, + 15,88,194,252,242,15,88,202,102,15,126,197,102,15,126,201,255,248,139,129, + 252,248,239,15,130,244,62,129,122,253,4,239,15,131,244,62,129,122,253,12, + 239,15,131,244,62,221,2,221,66,8,199,68,36,16,0,0,192,89,216,68,36,16,221, 92,36,8,216,68,36,16,221,28,36,139,76,36,8,139,44,36,255,211,229,252,233, - 244,87,255,248,139,129,252,248,239,15,130,244,61,129,122,253,4,239,255,248, - 139,129,252,248,239,15,130,244,61,129,122,253,4,239,15,131,244,61,129,122, - 253,12,239,15,131,244,61,252,242,15,16,2,252,242,15,16,74,8,189,0,0,56,67, + 244,88,255,248,140,129,252,248,239,15,130,244,62,129,122,253,4,239,255,248, + 140,129,252,248,239,15,130,244,62,129,122,253,4,239,15,131,244,62,129,122, + 253,12,239,15,131,244,62,252,242,15,16,2,252,242,15,16,74,8,189,0,0,56,67, 102,15,110,213,102,15,112,210,81,252,242,15,88,194,252,242,15,88,202,102, - 15,126,197,102,15,126,201,255,248,139,129,252,248,239,15,130,244,61,129,122, - 253,4,239,15,131,244,61,129,122,253,12,239,15,131,244,61,221,2,221,66,8,199, + 15,126,197,102,15,126,201,255,248,140,129,252,248,239,15,130,244,62,129,122, + 253,4,239,15,131,244,62,129,122,253,12,239,15,131,244,62,221,2,221,66,8,199, 68,36,16,0,0,192,89,216,68,36,16,221,92,36,8,216,68,36,16,221,28,36,139,76, - 36,8,139,44,36,255,211,252,237,252,233,244,87,255,248,140,129,252,248,239, - 15,130,244,61,129,122,253,4,239,255,248,140,129,252,248,239,15,130,244,61, - 129,122,253,4,239,15,131,244,61,129,122,253,12,239,15,131,244,61,252,242, + 36,8,139,44,36,255,211,252,237,252,233,244,88,255,248,141,129,252,248,239, + 15,130,244,62,129,122,253,4,239,255,248,141,129,252,248,239,15,130,244,62, + 129,122,253,4,239,15,131,244,62,129,122,253,12,239,15,131,244,62,252,242, 15,16,2,252,242,15,16,74,8,189,0,0,56,67,102,15,110,213,102,15,112,210,81, 252,242,15,88,194,252,242,15,88,202,102,15,126,197,102,15,126,201,255,248, - 140,129,252,248,239,15,130,244,61,129,122,253,4,239,15,131,244,61,129,122, - 253,12,239,15,131,244,61,221,2,221,66,8,199,68,36,16,0,0,192,89,216,68,36, + 141,129,252,248,239,15,130,244,62,129,122,253,4,239,15,131,244,62,129,122, + 253,12,239,15,131,244,62,221,2,221,66,8,199,68,36,16,0,0,192,89,216,68,36, 16,221,92,36,8,216,68,36,16,221,28,36,139,76,36,8,139,44,36,255,211,252,253, - 252,233,244,87,255,248,141,129,252,248,239,15,130,244,61,129,122,253,4,239, - 255,248,141,129,252,248,239,15,130,244,61,129,122,253,4,239,15,131,244,61, - 129,122,253,12,239,15,131,244,61,252,242,15,16,2,252,242,15,16,74,8,189,0, + 252,233,244,88,255,248,142,129,252,248,239,15,130,244,62,129,122,253,4,239, + 255,248,142,129,252,248,239,15,130,244,62,129,122,253,4,239,15,131,244,62, + 129,122,253,12,239,15,131,244,62,252,242,15,16,2,252,242,15,16,74,8,189,0, 0,56,67,102,15,110,213,102,15,112,210,81,252,242,15,88,194,252,242,15,88, - 202,102,15,126,197,102,15,126,201,255,248,141,129,252,248,239,15,130,244, - 61,129,122,253,4,239,15,131,244,61,129,122,253,12,239,15,131,244,61,221,2, + 202,102,15,126,197,102,15,126,201,255,248,142,129,252,248,239,15,130,244, + 62,129,122,253,4,239,15,131,244,62,129,122,253,12,239,15,131,244,62,221,2, 221,66,8,199,68,36,16,0,0,192,89,216,68,36,16,221,92,36,8,216,68,36,16,221, - 28,36,139,76,36,8,139,44,36,255,211,197,252,233,244,87,255,248,142,129,252, - 248,239,15,130,244,61,129,122,253,4,239,255,248,142,129,252,248,239,15,130, - 244,61,129,122,253,4,239,15,131,244,61,129,122,253,12,239,15,131,244,61,252, + 28,36,139,76,36,8,139,44,36,255,211,197,252,233,244,88,255,248,143,129,252, + 248,239,15,130,244,62,129,122,253,4,239,255,248,143,129,252,248,239,15,130, + 244,62,129,122,253,4,239,15,131,244,62,129,122,253,12,239,15,131,244,62,252, 242,15,16,2,252,242,15,16,74,8,189,0,0,56,67,102,15,110,213,102,15,112,210, 81,252,242,15,88,194,252,242,15,88,202,102,15,126,197,102,15,126,201,255, - 248,142,129,252,248,239,15,130,244,61,129,122,253,4,239,15,131,244,61,129, - 122,253,12,239,15,131,244,61,221,2,221,66,8,199,68,36,16,0,0,192,89,216,68, + 248,143,129,252,248,239,15,130,244,62,129,122,253,4,239,15,131,244,62,129, + 122,253,12,239,15,131,244,62,221,2,221,66,8,199,68,36,16,0,0,192,89,216,68, 36,16,221,92,36,8,216,68,36,16,221,28,36,139,76,36,8,139,44,36,255,211,205, - 252,233,244,87,248,125,184,237,252,233,244,61,248,127,184,237,248,61,139, + 252,233,244,88,248,126,184,237,252,233,244,62,248,128,184,237,248,62,139, 108,36,48,139,114,252,252,137,116,36,24,137,149,233,141,68,194,252,248,141, 136,233,137,133,233,139,66,252,248,59,141,233,15,135,244,251,137,44,36,252, - 255,144,233,139,149,233,133,192,15,143,244,76,248,1,255,139,141,233,41,209, + 255,144,233,139,149,233,133,192,15,143,244,77,248,1,255,139,141,233,41,209, 193,252,233,3,133,192,141,65,1,139,106,252,248,15,133,244,32,139,181,233, 139,14,15,182,252,233,15,182,205,131,198,4,252,255,36,171,248,32,137,209, 252,247,198,237,15,133,244,249,15,182,110,252,253,252,247,213,141,20,252, 234,252,233,244,28,248,3,137,252,245,131,229,252,248,41,252,234,252,233,244, 28,248,5,186,237,137,252,233,232,251,1,0,139,149,233,49,192,252,233,244,1, - 248,73,93,137,108,36,16,139,108,36,48,137,116,36,24,137,149,233,255,141,68, + 248,74,93,137,108,36,16,139,108,36,48,137,116,36,24,137,149,233,255,141,68, 194,252,248,137,252,233,137,133,233,232,251,1,21,139,149,233,139,133,233, - 41,208,193,232,3,131,192,1,139,108,36,16,85,195,248,143,255,15,182,131,233, + 41,208,193,232,3,131,192,1,139,108,36,16,85,195,248,144,255,15,182,131,233, 168,235,15,133,244,251,168,235,15,133,244,247,168,235,15,132,244,247,252, - 255,139,233,252,233,244,247,255,248,144,15,182,131,233,168,235,15,133,244, - 251,252,233,244,247,248,145,15,182,131,233,168,235,15,133,244,251,168,235, + 255,139,233,252,233,244,247,255,248,145,15,182,131,233,168,235,15,133,244, + 251,252,233,244,247,248,146,15,182,131,233,168,235,15,133,244,251,168,235, 15,132,244,251,252,255,139,233,15,132,244,247,168,235,15,132,244,251,248, 1,255,139,108,36,48,137,149,233,137,252,242,137,252,233,232,251,1,22,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,171,233,248,146,131,198,4,139,77,232,137,76,36,20, - 252,233,244,4,248,147,255,139,106,252,248,139,173,233,15,182,133,233,141, + 252,254,252,255,164,253,171,233,248,147,131,198,4,139,77,232,137,76,36,20, + 252,233,244,4,248,148,255,139,106,252,248,139,173,233,15,182,133,233,141, 4,194,139,108,36,48,137,149,233,137,133,233,137,252,242,141,139,233,137,171, - 233,137,116,36,24,232,251,1,23,252,233,244,3,255,248,148,137,116,36,24,255, - 248,149,255,137,116,36,24,131,206,1,248,1,255,141,68,194,252,248,139,108, + 233,137,116,36,24,232,251,1,23,252,233,244,3,255,248,149,137,116,36,24,255, + 248,150,255,137,116,36,24,131,206,1,248,1,255,141,68,194,252,248,139,108, 36,48,137,149,233,137,133,233,137,252,242,137,252,233,232,251,1,24,199,68, 36,24,0,0,0,0,255,131,230,252,254,255,139,149,233,137,193,139,133,233,41, - 208,137,205,15,182,78,252,253,193,232,3,131,192,1,252,255,229,248,150,255, + 208,137,205,15,182,78,252,253,193,232,3,131,192,1,252,255,229,248,151,255, 85,141,108,36,12,85,83,82,81,80,15,182,69,252,252,138,101,252,248,137,125, 252,252,137,117,252,248,139,93,0,139,139,233,199,131,233,237,137,131,233, 137,139,233,129,252,236,239,252,242,15,17,125,216,252,242,15,17,117,208,252, @@ -427,31 +428,31 @@ static const unsigned char build_actionlist[17058] = { 85,176,252,242,15,17,77,168,252,242,15,17,69,160,139,171,233,139,147,233, 137,171,233,199,131,233,0,0,0,0,137,149,233,141,84,36,16,141,139,233,232, 251,1,25,139,141,233,129,225,239,137,204,137,169,233,139,149,233,139,177, - 233,255,248,151,255,133,192,15,136,244,249,137,68,36,20,139,122,252,248,139, + 233,255,248,152,255,133,192,15,136,244,249,137,68,36,20,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,129,252,253,239,15,130,244,248,139,68,36, 20,248,2,252,255,36,171,248,3,252,247,216,137,252,233,137,194,232,251,1,26, - 255,248,89,255,217,124,36,4,137,68,36,8,102,184,0,4,102,11,68,36,4,102,37, + 255,248,90,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,152,102,15,252,239,210,102,15,118,210,102,15,115,210, + 68,36,8,195,255,248,153,102,15,252,239,210,102,15,118,210,102,15,115,210, 1,184,0,0,48,67,102,15,110,216,102,15,112,219,81,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,184,0,0,252,240,63,102,15,110,208,102,15,112,210,81,252, 242,15,194,193,1,102,15,84,194,252,242,15,92,200,15,40,193,248,1,195,248, - 91,255,217,124,36,4,137,68,36,8,102,184,0,8,102,11,68,36,4,102,37,252,255, + 92,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,153,102,15,252,239,210,102,15,118,210,102,15,115,210,1,184,0, + 195,255,248,154,102,15,252,239,210,102,15,118,210,102,15,115,210,1,184,0, 0,48,67,102,15,110,216,102,15,112,219,81,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,184,0,0,252,240,191,102,15,110,208,102,15,112,210,81,252,242,15, - 194,193,6,102,15,84,194,252,242,15,92,200,15,40,193,248,1,195,248,112,255, + 194,193,6,102,15,84,194,252,242,15,92,200,15,40,193,248,1,195,248,113,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,154,102,15,252, + 108,36,6,217,252,252,217,108,36,4,139,68,36,8,195,255,248,155,102,15,252, 239,210,102,15,118,210,102,15,115,210,1,184,0,0,48,67,102,15,110,216,102, 15,112,219,81,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,184,0,0,252,240,63,102, 15,110,216,102,15,112,219,81,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,155,255,15,40,232,252,242,15, + 92,200,102,15,86,202,15,40,193,248,1,195,248,156,255,15,40,232,252,242,15, 94,193,102,15,252,239,210,102,15,118,210,102,15,115,210,1,184,0,0,48,67,102, 15,110,216,102,15,112,219,81,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,184, @@ -460,10 +461,10 @@ static const unsigned char build_actionlist[17058] = { 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,96,217,252,234,222,201,248,156,217,84,36,4,129,124,36,4,0,0,128,127, - 15,132,244,247,129,124,36,4,0,0,128,252,255,15,132,244,248,248,157,217,192, + 255,248,97,217,252,234,222,201,248,157,217,84,36,4,129,124,36,4,0,0,128,127, + 15,132,244,247,129,124,36,4,0,0,128,252,255,15,132,244,248,248,158,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,115,219,84,36,4,219,68, + 217,248,1,195,248,2,221,216,217,252,238,195,255,248,116,219,84,36,4,219,68, 36,4,255,223,252,233,255,221,252,233,223,224,158,255,15,133,244,254,15,138, 244,255,221,216,139,68,36,4,131,252,248,1,15,142,244,252,248,1,169,1,0,0, 0,15,133,244,248,216,200,209,232,252,233,244,1,248,2,209,232,15,132,244,251, @@ -472,14 +473,14 @@ static const unsigned char build_actionlist[17058] = { 222,252,241,252,247,216,131,252,248,1,15,132,244,5,252,233,244,1,248,7,221, 216,217,232,195,248,8,217,84,36,4,217,201,217,84,36,8,139,68,36,4,209,224, 61,0,0,0,252,255,15,132,244,248,139,68,36,8,209,224,15,132,244,250,61,0,0, - 0,252,255,15,132,244,250,217,252,241,252,233,244,157,248,9,255,217,232,255, + 0,252,255,15,132,244,250,217,252,241,252,233,244,158,248,9,255,217,232,255, 223,252,234,255,221,252,234,223,224,158,255,15,132,244,247,217,201,248,1, 221,216,195,248,2,217,225,217,232,255,15,132,244,249,221,216,217,225,217, 252,238,184,0,0,0,0,15,146,208,209,200,51,68,36,4,15,137,244,249,217,201, 248,3,221,217,217,225,195,248,4,131,124,36,4,0,15,141,244,3,221,216,221,216, 133,192,15,132,244,251,217,252,238,195,248,5,199,68,36,4,0,0,128,127,217, - 68,36,4,195,255,248,115,255,248,158,252,242,15,45,193,252,242,15,42,208,102, - 15,46,202,15,133,244,254,15,138,244,255,248,159,131,252,248,1,15,142,244, + 68,36,4,195,255,248,116,255,248,159,252,242,15,45,193,252,242,15,42,208,102, + 15,46,202,15,133,244,254,15,138,244,255,248,160,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, @@ -498,29 +499,29 @@ static const unsigned char build_actionlist[17058] = { 1,102,15,80,193,15,87,192,136,196,15,146,208,48,224,15,133,244,1,248,3,184, 0,0,252,240,127,102,15,110,192,102,15,112,192,81,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,255,15,87,192,195,248,160,255,139,68,36,12,252,242,15,16,68,36,4,131,252, - 248,1,15,132,244,247,15,135,244,248,232,244,89,252,233,244,253,248,1,232, - 244,91,252,233,244,253,248,2,131,252,248,3,15,132,244,247,15,135,244,248, - 232,244,112,255,252,233,244,253,248,1,252,242,15,81,192,248,7,252,242,15, - 17,68,36,4,221,68,36,4,195,248,2,221,68,36,4,131,252,248,5,15,130,244,96, - 15,132,244,156,248,2,131,252,248,7,15,132,244,247,15,135,244,248,217,252, + 3,255,15,87,192,195,248,161,255,139,68,36,12,252,242,15,16,68,36,4,131,252, + 248,1,15,132,244,247,15,135,244,248,232,244,90,252,233,244,253,248,1,232, + 244,92,252,233,244,253,248,2,131,252,248,3,15,132,244,247,15,135,244,248, + 232,244,113,255,252,233,244,253,248,1,252,242,15,81,192,248,7,252,242,15, + 17,68,36,4,221,68,36,4,195,248,2,221,68,36,4,131,252,248,5,15,130,244,97, + 15,132,244,157,248,2,131,252,248,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,248,9,15,132,244,247,15,135,244,248,255,217,252,236,217,201,217,252,241, 195,248,1,217,252,254,195,248,2,131,252,248,11,15,132,244,247,15,135,244, 255,217,252,255,195,248,1,217,252,242,221,216,195,255,139,68,36,12,221,68, - 36,4,131,252,248,1,15,130,244,89,15,132,244,91,131,252,248,3,15,130,244,112, - 15,135,244,248,217,252,250,195,248,2,131,252,248,5,15,130,244,96,15,132,244, - 156,131,252,248,7,15,132,244,247,15,135,244,248,217,252,237,217,201,217,252, + 36,4,131,252,248,1,15,130,244,90,15,132,244,92,131,252,248,3,15,130,244,113, + 15,135,244,248,217,252,250,195,248,2,131,252,248,5,15,130,244,97,15,132,244, + 157,131,252,248,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,248,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,248,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,255,248,161,255,139,68,36, + 195,248,1,217,252,242,221,216,195,255,248,9,204,255,248,162,255,139,68,36, 20,252,242,15,16,68,36,4,252,242,15,16,76,36,12,131,252,248,1,15,132,244, 247,15,135,244,248,252,242,15,88,193,248,7,252,242,15,17,68,36,4,221,68,36, 4,195,248,1,252,242,15,92,193,252,233,244,7,248,2,131,252,248,3,15,132,244, 247,15,135,244,248,252,242,15,89,193,252,233,244,7,248,1,252,242,15,94,193, 252,233,244,7,248,2,131,252,248,5,15,132,244,247,255,15,135,244,248,232,244, - 155,252,233,244,7,248,1,90,232,244,115,82,252,233,244,7,248,2,131,252,248, + 156,252,233,244,7,248,1,90,232,244,116,82,252,233,244,7,248,2,131,252,248, 7,15,132,244,247,15,135,244,248,184,0,0,0,128,102,15,110,200,102,15,112,201, 81,15,87,193,252,233,244,7,248,1,102,15,252,239,201,102,15,118,201,102,15, 115,209,1,15,84,193,252,233,244,7,248,2,255,131,252,248,9,15,135,244,248, @@ -530,21 +531,21 @@ static const unsigned char build_actionlist[17058] = { 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,155,15,132,244,115,131,252,248,7,15,132,244,247,15,135,244,248, + 5,15,130,244,156,15,132,244,116,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,162, + 223,224,252,246,196,1,15,133,244,248,217,201,248,2,221,216,195,255,248,163, 156,90,137,209,129,252,242,0,0,32,0,82,157,156,90,49,192,57,209,15,132,244, 247,139,68,36,4,87,83,15,162,139,124,36,16,137,7,137,95,4,137,79,8,137,87, - 12,91,95,248,1,195,248,163,255,85,137,229,83,137,203,43,163,233,255,137,163, + 12,91,95,248,1,195,248,164,255,85,137,229,83,137,203,43,163,233,255,137,163, 233,255,15,182,139,233,131,252,233,1,15,136,244,248,248,1,139,132,253,139, 233,137,4,140,131,252,233,1,15,137,244,1,248,2,139,139,233,139,147,233,252, 255,147,233,137,131,233,137,147,233,128,187,233,1,15,130,244,253,15,132,244, 252,221,155,233,252,233,244,253,248,6,255,217,155,233,248,7,255,41,163,233, - 255,139,93,252,252,201,195,255,248,164,255,249,255,129,124,253,202,4,239, + 255,139,93,252,252,201,195,255,248,165,255,249,255,129,124,253,202,4,239, 15,133,244,253,129,124,253,194,4,239,15,133,244,254,139,44,202,131,198,4, 59,44,194,255,15,141,244,255,255,15,140,244,255,255,15,143,244,255,255,15, 142,244,255,255,248,6,15,183,70,252,254,141,180,253,134,233,248,9,139,6,15, @@ -604,238 +605,239 @@ static const unsigned char build_actionlist[17058] = { 137,4,202,255,15,87,192,252,242,15,42,128,233,248,1,252,242,15,17,4,202,255, 219,128,233,248,1,221,28,202,255,139,6,15,182,204,15,182,232,131,198,4,193, 232,16,252,255,36,171,248,2,129,124,253,194,4,239,15,133,244,56,139,12,194, - 137,213,232,251,1,20,255,252,242,15,42,192,255,137,4,36,219,4,36,255,137, - 252,234,15,182,78,252,253,252,233,244,1,255,15,182,252,236,15,182,192,255, - 129,124,253,252,234,4,239,15,133,244,50,129,124,253,199,4,239,15,133,244, - 50,139,44,252,234,3,44,199,15,128,244,49,255,129,124,253,252,234,4,239,15, - 133,244,52,129,124,253,199,4,239,15,133,244,52,139,4,199,3,4,252,234,15,128, + 255,139,169,233,131,252,253,0,15,133,244,255,248,3,255,248,57,137,213,232, + 251,1,20,255,252,242,15,42,192,255,137,4,36,219,4,36,255,137,252,234,15,182, + 78,252,253,252,233,244,1,255,248,9,252,246,133,233,235,15,133,244,3,252,233, + 244,56,255,15,182,252,236,15,182,192,255,129,124,253,252,234,4,239,15,133, + 244,50,129,124,253,199,4,239,15,133,244,50,139,44,252,234,3,44,199,15,128, + 244,49,255,129,124,253,252,234,4,239,15,133,244,52,129,124,253,199,4,239, + 15,133,244,52,139,4,199,3,4,252,234,15,128,244,51,255,129,124,253,252,234, + 4,239,15,133,244,55,129,124,253,194,4,239,15,133,244,55,139,44,252,234,3, + 44,194,15,128,244,54,255,199,68,202,4,237,255,129,124,253,252,234,4,239,15, + 131,244,50,255,129,124,253,199,4,239,15,131,244,50,255,252,242,15,16,4,252, + 234,252,242,15,88,4,199,255,221,4,252,234,220,4,199,255,129,124,253,252,234, + 4,239,15,131,244,52,255,129,124,253,199,4,239,15,131,244,52,255,252,242,15, + 16,4,199,252,242,15,88,4,252,234,255,221,4,199,220,4,252,234,255,129,124, + 253,252,234,4,239,15,131,244,55,129,124,253,194,4,239,15,131,244,55,255,252, + 242,15,16,4,252,234,252,242,15,88,4,194,255,221,4,252,234,220,4,194,255,129, + 124,253,252,234,4,239,15,133,244,50,129,124,253,199,4,239,15,133,244,50,139, + 44,252,234,43,44,199,15,128,244,49,255,129,124,253,252,234,4,239,15,133,244, + 52,129,124,253,199,4,239,15,133,244,52,139,4,199,43,4,252,234,15,128,244, + 51,255,129,124,253,252,234,4,239,15,133,244,55,129,124,253,194,4,239,15,133, + 244,55,139,44,252,234,43,44,194,15,128,244,54,255,252,242,15,16,4,252,234, + 252,242,15,92,4,199,255,221,4,252,234,220,36,199,255,252,242,15,16,4,199, + 252,242,15,92,4,252,234,255,221,4,199,220,36,252,234,255,252,242,15,16,4, + 252,234,252,242,15,92,4,194,255,221,4,252,234,220,36,194,255,129,124,253, + 252,234,4,239,15,133,244,50,129,124,253,199,4,239,15,133,244,50,139,44,252, + 234,15,175,44,199,15,128,244,49,255,129,124,253,252,234,4,239,15,133,244, + 52,129,124,253,199,4,239,15,133,244,52,139,4,199,15,175,4,252,234,15,128, 244,51,255,129,124,253,252,234,4,239,15,133,244,55,129,124,253,194,4,239, - 15,133,244,55,139,44,252,234,3,44,194,15,128,244,54,255,199,68,202,4,237, - 255,129,124,253,252,234,4,239,15,131,244,50,255,129,124,253,199,4,239,15, - 131,244,50,255,252,242,15,16,4,252,234,252,242,15,88,4,199,255,221,4,252, - 234,220,4,199,255,129,124,253,252,234,4,239,15,131,244,52,255,129,124,253, - 199,4,239,15,131,244,52,255,252,242,15,16,4,199,252,242,15,88,4,252,234,255, - 221,4,199,220,4,252,234,255,129,124,253,252,234,4,239,15,131,244,55,129,124, - 253,194,4,239,15,131,244,55,255,252,242,15,16,4,252,234,252,242,15,88,4,194, - 255,221,4,252,234,220,4,194,255,129,124,253,252,234,4,239,15,133,244,50,129, - 124,253,199,4,239,15,133,244,50,139,44,252,234,43,44,199,15,128,244,49,255, - 129,124,253,252,234,4,239,15,133,244,52,129,124,253,199,4,239,15,133,244, - 52,139,4,199,43,4,252,234,15,128,244,51,255,129,124,253,252,234,4,239,15, - 133,244,55,129,124,253,194,4,239,15,133,244,55,139,44,252,234,43,44,194,15, - 128,244,54,255,252,242,15,16,4,252,234,252,242,15,92,4,199,255,221,4,252, - 234,220,36,199,255,252,242,15,16,4,199,252,242,15,92,4,252,234,255,221,4, - 199,220,36,252,234,255,252,242,15,16,4,252,234,252,242,15,92,4,194,255,221, - 4,252,234,220,36,194,255,129,124,253,252,234,4,239,15,133,244,50,129,124, - 253,199,4,239,15,133,244,50,139,44,252,234,15,175,44,199,15,128,244,49,255, - 129,124,253,252,234,4,239,15,133,244,52,129,124,253,199,4,239,15,133,244, - 52,139,4,199,15,175,4,252,234,15,128,244,51,255,129,124,253,252,234,4,239, - 15,133,244,55,129,124,253,194,4,239,15,133,244,55,139,44,252,234,15,175,44, - 194,15,128,244,54,255,252,242,15,16,4,252,234,252,242,15,89,4,199,255,221, - 4,252,234,220,12,199,255,252,242,15,16,4,199,252,242,15,89,4,252,234,255, - 221,4,199,220,12,252,234,255,252,242,15,16,4,252,234,252,242,15,89,4,194, - 255,221,4,252,234,220,12,194,255,252,242,15,16,4,252,234,252,242,15,94,4, - 199,255,221,4,252,234,220,52,199,255,252,242,15,16,4,199,252,242,15,94,4, - 252,234,255,221,4,199,220,52,252,234,255,252,242,15,16,4,252,234,252,242, - 15,94,4,194,255,221,4,252,234,220,52,194,255,252,242,15,16,4,252,234,252, - 242,15,16,12,199,255,221,4,252,234,221,4,199,255,252,242,15,16,4,199,252, - 242,15,16,12,252,234,255,221,4,199,221,4,252,234,255,252,242,15,16,4,252, - 234,252,242,15,16,12,194,255,221,4,252,234,221,4,194,255,248,165,232,244, - 155,255,252,233,244,165,255,232,244,115,255,15,182,252,236,15,182,192,141, - 12,194,41,232,137,76,36,4,137,68,36,8,248,35,139,108,36,48,137,44,36,137, - 149,233,137,116,36,24,232,251,1,27,139,149,233,133,192,15,133,244,44,15,182, - 110,252,255,15,182,78,252,253,139,68,252,234,4,139,44,252,234,137,68,202, - 4,137,44,202,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36, - 171,255,252,247,208,139,4,135,199,68,202,4,237,137,4,202,139,6,15,182,204, - 15,182,232,131,198,4,193,232,16,252,255,36,171,255,15,191,192,199,68,202, - 4,237,137,4,202,255,15,191,192,252,242,15,42,192,252,242,15,17,4,202,255, - 223,70,252,254,221,28,202,255,252,242,15,16,4,199,252,242,15,17,4,202,255, - 221,4,199,221,28,202,255,252,247,208,137,68,202,4,139,6,15,182,204,15,182, - 232,131,198,4,193,232,16,252,255,36,171,255,141,76,202,12,141,68,194,4,189, - 237,137,105,252,248,248,1,137,41,131,193,8,57,193,15,134,244,1,139,6,15,182, - 204,15,182,232,131,198,4,193,232,16,252,255,36,171,255,139,106,252,248,139, - 172,253,133,233,139,173,233,139,69,4,139,109,0,137,68,202,4,137,44,202,139, - 6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,171,255,139,106,252, - 248,139,172,253,141,233,128,189,233,0,139,173,233,139,12,194,139,68,194,4, - 137,77,0,137,69,4,15,132,244,247,252,246,133,233,235,15,133,244,248,248,1, - 139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,171,248,2,129, - 232,239,129,252,248,239,15,134,244,1,252,246,129,233,235,15,132,244,1,135, - 213,141,139,233,255,232,251,1,28,137,252,234,252,233,244,1,255,252,247,208, - 139,106,252,248,139,172,253,141,233,139,12,135,139,133,233,137,8,199,64,4, - 237,252,246,133,233,235,15,133,244,248,248,1,139,6,15,182,204,15,182,232, - 131,198,4,193,232,16,252,255,36,171,248,2,252,246,129,233,235,15,132,244, - 1,128,189,233,0,15,132,244,1,137,213,137,194,141,139,233,232,251,1,28,137, - 252,234,252,233,244,1,255,139,106,252,248,255,252,242,15,16,4,199,255,139, - 172,253,141,233,139,141,233,255,252,242,15,17,1,255,221,25,255,252,247,208, - 139,106,252,248,139,172,253,141,233,139,141,233,137,65,4,139,6,15,182,204, - 15,182,232,131,198,4,193,232,16,252,255,36,171,255,141,180,253,134,233,139, - 108,36,48,131,189,233,0,15,132,244,247,137,149,233,141,20,202,137,252,233, - 232,251,1,29,139,149,233,248,1,139,6,15,182,204,15,182,232,131,198,4,193, - 232,16,252,255,36,171,255,252,247,208,139,74,252,248,139,4,135,139,108,36, - 48,137,76,36,8,137,68,36,4,137,44,36,137,149,233,137,116,36,24,232,251,1, - 30,139,149,233,15,182,78,252,253,137,4,202,199,68,202,4,237,139,6,15,182, - 204,15,182,232,131,198,4,193,232,16,252,255,36,171,255,139,108,36,48,137, - 149,233,139,139,233,59,139,233,137,116,36,24,15,131,244,251,248,1,137,193, - 37,252,255,7,0,0,193,252,233,11,137,76,36,8,61,252,255,7,0,0,15,132,244,249, - 248,2,137,44,36,137,68,36,4,232,251,1,31,139,149,233,15,182,78,252,253,137, - 4,202,199,68,202,4,237,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252, - 255,36,171,248,3,184,1,8,0,0,252,233,244,2,248,5,137,252,233,232,251,1,32, - 15,183,70,252,254,252,233,244,1,255,252,247,208,139,108,36,48,139,139,233, - 137,116,36,24,59,139,233,137,149,233,15,131,244,249,248,2,139,20,135,137, - 252,233,232,251,1,33,139,149,233,15,182,78,252,253,137,4,202,199,68,202,4, - 237,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,171,248,3, - 137,252,233,232,251,1,32,15,183,70,252,254,252,247,208,252,233,244,2,255, - 252,247,208,139,106,252,248,139,173,233,139,4,135,252,233,244,166,255,252, - 247,208,139,106,252,248,139,173,233,139,4,135,252,233,244,167,255,15,182, - 252,236,15,182,192,129,124,253,252,234,4,239,15,133,244,38,139,44,252,234, - 255,129,124,253,194,4,239,15,133,244,251,139,4,194,255,129,124,253,194,4, - 239,15,131,244,251,255,252,242,15,16,4,194,252,242,15,45,192,252,242,15,42, - 200,102,15,46,193,255,221,4,194,219,20,36,219,4,36,255,15,133,244,38,255, - 59,133,233,15,131,244,38,193,224,3,3,133,233,129,120,253,4,239,15,132,244, - 248,139,40,139,64,4,137,44,202,137,68,202,4,248,1,139,6,15,182,204,15,182, - 232,131,198,4,193,232,16,252,255,36,171,248,2,131,189,233,0,15,132,244,249, - 139,141,233,252,246,129,233,235,15,132,244,38,15,182,78,252,253,248,3,199, - 68,202,4,237,252,233,244,1,248,5,255,129,124,253,194,4,239,15,133,244,38, - 139,4,194,252,233,244,166,255,15,182,252,236,15,182,192,252,247,208,139,4, - 135,129,124,253,252,234,4,239,15,133,244,36,139,44,252,234,248,166,139,141, - 233,35,136,233,105,201,239,3,141,233,248,1,129,185,233,239,15,133,244,250, - 57,129,233,15,133,244,250,129,121,253,4,239,15,132,244,251,15,182,70,252, - 253,139,41,139,73,4,137,44,194,137,76,194,4,248,2,255,139,6,15,182,204,15, - 182,232,131,198,4,193,232,16,252,255,36,171,248,3,15,182,70,252,253,199,68, - 194,4,237,252,233,244,2,248,4,139,137,233,133,201,15,133,244,1,248,5,139, - 141,233,133,201,15,132,244,3,252,246,129,233,235,15,133,244,3,252,233,244, - 36,255,15,182,252,236,15,182,192,129,124,253,252,234,4,239,15,133,244,37, - 139,44,252,234,59,133,233,15,131,244,37,193,224,3,3,133,233,129,120,253,4, - 239,15,132,244,248,139,40,139,64,4,137,44,202,137,68,202,4,248,1,139,6,15, - 182,204,15,182,232,131,198,4,193,232,16,252,255,36,171,248,2,131,189,233, - 0,15,132,244,249,139,141,233,252,246,129,233,235,15,132,244,37,255,15,182, - 78,252,253,248,3,199,68,202,4,237,252,233,244,1,255,15,182,252,236,15,182, - 192,129,124,253,252,234,4,239,15,133,244,41,139,44,252,234,255,15,133,244, - 41,255,59,133,233,15,131,244,41,193,224,3,3,133,233,129,120,253,4,239,15, - 132,244,249,248,1,252,246,133,233,235,15,133,244,253,248,2,139,108,202,4, - 139,12,202,137,104,4,137,8,139,6,15,182,204,15,182,232,131,198,4,193,232, - 16,252,255,36,171,248,3,131,189,233,0,15,132,244,1,139,141,233,252,246,129, - 233,235,255,15,132,244,41,15,182,78,252,253,252,233,244,1,248,5,129,124,253, - 194,4,239,15,133,244,41,139,4,194,252,233,244,167,248,7,128,165,233,235,139, - 139,233,137,171,233,137,141,233,15,182,78,252,253,252,233,244,2,255,15,182, - 252,236,15,182,192,252,247,208,139,4,135,129,124,253,252,234,4,239,15,133, - 244,39,139,44,252,234,248,167,139,141,233,35,136,233,105,201,239,198,133, - 233,0,3,141,233,248,1,129,185,233,239,15,133,244,251,57,129,233,15,133,244, - 251,129,121,253,4,239,15,132,244,250,248,2,255,252,246,133,233,235,15,133, - 244,253,248,3,15,182,70,252,253,139,108,194,4,139,4,194,137,105,4,137,1,139, - 6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,171,248,4,131,189, - 233,0,15,132,244,2,137,76,36,16,139,141,233,252,246,129,233,235,15,132,244, - 39,139,76,36,16,252,233,244,2,248,5,139,137,233,133,201,15,133,244,1,255, - 139,141,233,133,201,15,132,244,252,252,246,129,233,235,15,132,244,39,248, - 6,137,68,36,16,199,68,36,20,237,137,108,36,12,141,68,36,16,137,108,36,4,139, - 108,36,48,137,68,36,8,137,44,36,137,149,233,137,116,36,24,232,251,1,34,139, - 149,233,139,108,36,12,137,193,252,233,244,2,248,7,128,165,233,235,139,131, - 233,137,171,233,137,133,233,252,233,244,3,255,15,182,252,236,15,182,192,129, - 124,253,252,234,4,239,15,133,244,40,139,44,252,234,59,133,233,15,131,244, - 40,193,224,3,3,133,233,129,120,253,4,239,15,132,244,249,248,1,252,246,133, - 233,235,15,133,244,253,248,2,139,108,202,4,139,12,202,137,104,4,137,8,139, - 6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,171,248,3,131,189, - 233,0,15,132,244,1,255,139,141,233,252,246,129,233,235,15,132,244,40,15,182, - 78,252,253,252,233,244,1,248,7,128,165,233,235,139,139,233,137,171,233,137, - 141,233,15,182,78,252,253,252,233,244,2,255,137,124,36,16,139,60,199,248, - 1,141,12,202,139,105,252,248,252,246,133,233,235,15,133,244,253,248,2,139, - 68,36,20,131,232,1,15,132,244,250,1,252,248,59,133,233,15,135,244,251,41, - 252,248,193,231,3,3,189,233,248,3,139,41,137,47,139,105,4,131,193,8,137,111, - 4,131,199,8,131,232,1,15,133,244,3,248,4,139,124,36,16,139,6,15,182,204,15, - 182,232,131,198,4,193,232,16,252,255,36,171,248,5,137,108,36,4,139,108,36, - 48,137,149,233,137,68,36,8,137,44,36,137,116,36,24,232,251,1,35,139,149,233, - 15,182,78,252,253,252,233,244,1,248,7,255,128,165,233,235,139,131,233,137, - 171,233,137,133,233,252,233,244,2,255,3,68,36,20,255,129,124,253,202,4,239, - 139,44,202,15,133,244,57,141,84,202,8,137,114,252,252,139,181,233,139,14, - 15,182,252,233,15,182,205,131,198,4,252,255,36,171,255,141,76,202,8,137,215, - 139,105,252,248,129,121,253,252,252,239,15,133,244,29,248,58,139,114,252, - 252,252,247,198,237,15,133,244,253,248,1,137,106,252,248,137,68,36,20,131, - 232,1,15,132,244,249,248,2,139,41,137,47,139,105,4,131,193,8,137,111,4,131, - 199,8,131,232,1,15,133,244,2,139,106,252,248,248,3,139,68,36,20,128,189,233, - 1,15,135,244,251,248,4,139,181,233,139,14,15,182,252,233,15,182,205,131,198, - 4,252,255,36,171,248,5,255,252,247,198,237,15,133,244,4,15,182,78,252,253, - 252,247,209,141,12,202,139,121,252,248,139,191,233,139,191,233,252,233,244, - 4,248,7,129,252,238,239,252,247,198,237,15,133,244,254,41,252,242,137,215, - 139,114,252,252,252,233,244,1,248,8,129,198,239,252,233,244,1,255,141,76, - 202,8,139,105,232,139,65,252,236,137,41,137,65,4,139,105,252,240,139,65,252, - 244,137,105,8,137,65,12,139,105,224,139,65,228,137,105,252,248,137,65,252, - 252,129,252,248,239,184,237,15,133,244,29,137,202,137,114,252,252,139,181, - 233,139,14,15,182,252,233,15,182,205,131,198,4,252,255,36,171,255,137,124, - 36,16,137,92,36,20,139,108,202,252,240,139,68,202,252,248,139,157,233,131, - 198,4,139,189,233,248,1,57,216,15,131,244,251,129,124,253,199,4,239,15,132, - 244,250,255,219,68,202,252,248,255,139,108,199,4,137,108,202,12,139,44,199, - 137,108,202,8,131,192,1,255,137,68,202,252,248,248,2,15,183,70,252,254,141, - 180,253,134,233,248,3,139,92,36,20,139,124,36,16,139,6,15,182,204,15,182, - 232,131,198,4,193,232,16,252,255,36,171,248,4,131,192,1,255,137,68,202,252, - 248,255,252,233,244,1,248,5,41,216,248,6,59,133,233,15,135,244,3,105,252, - 248,239,3,189,233,129,191,233,239,15,132,244,253,141,92,24,1,139,175,233, - 139,135,233,137,44,202,137,68,202,4,139,175,233,139,135,233,137,108,202,8, - 137,68,202,12,137,92,202,252,248,252,233,244,2,248,7,255,131,192,1,252,233, - 244,6,255,129,124,253,202,252,236,239,15,133,244,251,139,108,202,232,129, - 124,253,202,252,244,239,15,133,244,251,129,124,253,202,252,252,239,15,133, - 244,251,128,189,233,235,15,133,244,251,141,180,253,134,233,199,68,202,252, - 248,0,0,0,0,248,1,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255, - 36,171,248,5,198,70,252,252,235,141,180,253,134,233,198,6,235,252,233,244, - 1,255,15,182,252,236,15,182,192,137,124,36,16,141,188,253,194,233,141,12, - 202,43,122,252,252,133,252,237,15,132,244,251,141,108,252,233,252,248,57, - 215,15,131,244,248,248,1,139,71,252,248,137,1,139,71,252,252,131,199,8,137, - 65,4,131,193,8,57,252,233,15,131,244,249,57,215,15,130,244,1,248,2,199,65, - 4,237,131,193,8,57,252,233,15,130,244,2,248,3,139,124,36,16,139,6,15,182, - 204,15,182,232,131,198,4,193,232,16,252,255,36,171,248,5,199,68,36,20,1,0, - 0,0,137,208,41,252,248,15,134,244,3,137,197,193,252,237,3,131,197,1,137,108, - 36,20,139,108,36,48,1,200,59,133,233,15,135,244,253,248,6,255,139,71,252, - 248,137,1,139,71,252,252,131,199,8,137,65,4,131,193,8,57,215,15,130,244,6, - 252,233,244,3,248,7,137,149,233,137,141,233,137,116,36,24,41,215,139,84,36, - 20,131,252,234,1,137,252,233,232,251,1,0,139,149,233,139,141,233,1,215,252, - 233,244,6,255,193,225,3,255,248,1,139,114,252,252,137,68,36,20,252,247,198, - 237,15,133,244,253,255,248,13,137,215,131,232,1,15,132,244,249,248,2,139, - 44,15,137,111,252,248,139,108,15,4,137,111,252,252,131,199,8,131,232,1,15, - 133,244,2,248,3,139,68,36,20,15,182,110,252,255,248,5,57,197,15,135,244,252, - 255,139,108,10,4,137,106,252,252,139,44,10,137,106,252,248,255,248,5,56,70, - 252,255,15,135,244,252,255,15,182,78,252,253,252,247,209,141,20,202,139,122, - 252,248,139,191,233,139,191,233,139,6,15,182,204,15,182,232,131,198,4,193, - 232,16,252,255,36,171,248,6,255,199,71,252,252,237,131,199,8,255,199,68,194, - 252,244,237,255,131,192,1,252,233,244,5,248,7,141,174,233,252,247,197,237, - 15,133,244,14,41,252,234,255,1,252,233,255,137,252,245,209,252,237,129,229, - 239,102,131,172,253,43,233,1,15,132,244,147,255,141,12,202,255,129,121,253, - 4,239,15,133,244,255,255,129,121,253,12,239,15,133,244,59,129,121,253,20, - 239,15,133,244,59,139,41,131,121,16,0,15,140,244,251,255,129,121,253,12,239, - 15,133,244,164,129,121,253,20,239,15,133,244,164,255,139,105,16,133,252,237, - 15,136,244,251,3,41,15,128,244,247,137,41,255,59,105,8,199,65,28,237,137, - 105,24,255,15,142,244,253,248,1,248,6,141,180,253,134,233,255,141,180,253, - 134,233,15,183,70,252,254,15,142,245,248,1,248,6,255,15,143,244,253,248,6, - 141,180,253,134,233,248,1,255,248,7,139,6,15,182,204,15,182,232,131,198,4, - 193,232,16,252,255,36,171,248,5,255,3,41,15,128,244,1,137,41,255,15,141,244, - 7,255,141,180,253,134,233,15,183,70,252,254,15,141,245,255,15,140,244,7,255, - 252,233,244,6,248,9,255,129,121,253,4,239,255,15,131,244,59,129,121,253,12, - 239,15,131,244,59,255,129,121,253,12,239,15,131,244,164,129,121,253,20,239, - 15,131,244,164,255,139,105,20,255,129,252,253,239,15,131,244,59,255,252,242, - 15,16,1,252,242,15,16,73,8,255,252,242,15,88,65,16,252,242,15,17,1,133,252, - 237,15,136,244,249,255,15,140,244,249,255,102,15,46,200,248,1,252,242,15, - 17,65,24,255,221,65,8,221,1,255,220,65,16,221,17,221,81,24,133,252,237,15, - 136,244,247,255,221,81,24,15,140,244,247,255,217,201,248,1,255,15,183,70, - 252,254,255,15,131,244,7,255,15,131,244,248,141,180,253,134,233,255,141,180, - 253,134,233,15,183,70,252,254,15,131,245,255,15,130,244,7,255,15,130,244, - 248,141,180,253,134,233,255,248,3,102,15,46,193,252,233,244,1,255,141,12, - 202,139,105,4,129,252,253,239,15,132,244,247,255,137,105,252,252,139,41,137, - 105,252,248,252,233,245,255,141,180,253,134,233,139,1,137,105,252,252,137, - 65,252,248,255,139,139,233,139,4,129,139,128,233,139,108,36,48,137,147,233, - 137,171,233,252,255,224,255,141,180,253,134,233,139,6,15,182,204,15,182,232, - 131,198,4,193,232,16,252,255,36,171,255,137,252,245,209,252,237,129,229,239, - 102,131,172,253,43,233,1,15,132,244,149,255,139,190,233,139,108,36,48,141, - 12,202,59,141,233,15,135,244,24,15,182,142,233,57,200,15,134,244,249,248, - 2,255,15,183,70,252,254,252,233,245,255,248,3,199,68,194,252,252,237,131, - 192,1,57,200,15,134,244,3,252,233,244,2,255,141,44,197,237,141,4,194,139, - 122,252,248,137,104,252,252,137,120,252,248,139,108,36,48,141,12,200,59,141, - 233,15,135,244,23,137,209,137,194,15,182,174,233,133,252,237,15,132,244,248, - 248,1,131,193,8,57,209,15,131,244,249,139,121,252,248,137,56,139,121,252, - 252,137,120,4,131,192,8,199,65,252,252,237,131,252,237,1,15,133,244,1,248, - 2,255,139,190,233,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255, - 36,171,255,248,3,199,64,4,237,131,192,8,131,252,237,1,15,133,244,3,252,233, - 244,2,255,139,106,252,248,139,189,233,139,108,36,48,141,68,194,252,248,137, - 149,233,141,136,233,59,141,233,137,133,233,255,137,44,36,255,137,124,36,4, - 137,44,36,255,15,135,244,22,199,131,233,237,255,252,255,215,255,252,255,147, - 233,255,199,131,233,237,139,149,233,141,12,194,252,247,217,3,141,233,139, - 114,252,252,252,233,244,12,255,254,0 + 15,133,244,55,139,44,252,234,15,175,44,194,15,128,244,54,255,252,242,15,16, + 4,252,234,252,242,15,89,4,199,255,221,4,252,234,220,12,199,255,252,242,15, + 16,4,199,252,242,15,89,4,252,234,255,221,4,199,220,12,252,234,255,252,242, + 15,16,4,252,234,252,242,15,89,4,194,255,221,4,252,234,220,12,194,255,252, + 242,15,16,4,252,234,252,242,15,94,4,199,255,221,4,252,234,220,52,199,255, + 252,242,15,16,4,199,252,242,15,94,4,252,234,255,221,4,199,220,52,252,234, + 255,252,242,15,16,4,252,234,252,242,15,94,4,194,255,221,4,252,234,220,52, + 194,255,252,242,15,16,4,252,234,252,242,15,16,12,199,255,221,4,252,234,221, + 4,199,255,252,242,15,16,4,199,252,242,15,16,12,252,234,255,221,4,199,221, + 4,252,234,255,252,242,15,16,4,252,234,252,242,15,16,12,194,255,221,4,252, + 234,221,4,194,255,248,166,232,244,156,255,252,233,244,166,255,232,244,116, + 255,15,182,252,236,15,182,192,141,12,194,41,232,137,76,36,4,137,68,36,8,248, + 35,139,108,36,48,137,44,36,137,149,233,137,116,36,24,232,251,1,27,139,149, + 233,133,192,15,133,244,44,15,182,110,252,255,15,182,78,252,253,139,68,252, + 234,4,139,44,252,234,137,68,202,4,137,44,202,139,6,15,182,204,15,182,232, + 131,198,4,193,232,16,252,255,36,171,255,252,247,208,139,4,135,199,68,202, + 4,237,137,4,202,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255, + 36,171,255,15,191,192,199,68,202,4,237,137,4,202,255,15,191,192,252,242,15, + 42,192,252,242,15,17,4,202,255,223,70,252,254,221,28,202,255,252,242,15,16, + 4,199,252,242,15,17,4,202,255,221,4,199,221,28,202,255,252,247,208,137,68, + 202,4,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,171,255, + 141,76,202,12,141,68,194,4,189,237,137,105,252,248,248,1,137,41,131,193,8, + 57,193,15,134,244,1,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252, + 255,36,171,255,139,106,252,248,139,172,253,133,233,139,173,233,139,69,4,139, + 109,0,137,68,202,4,137,44,202,139,6,15,182,204,15,182,232,131,198,4,193,232, + 16,252,255,36,171,255,139,106,252,248,139,172,253,141,233,128,189,233,0,139, + 173,233,139,12,194,139,68,194,4,137,77,0,137,69,4,15,132,244,247,252,246, + 133,233,235,15,133,244,248,248,1,139,6,15,182,204,15,182,232,131,198,4,193, + 232,16,252,255,36,171,248,2,129,232,239,129,252,248,239,15,134,244,1,252, + 246,129,233,235,15,132,244,1,135,213,141,139,233,255,232,251,1,28,137,252, + 234,252,233,244,1,255,252,247,208,139,106,252,248,139,172,253,141,233,139, + 12,135,139,133,233,137,8,199,64,4,237,252,246,133,233,235,15,133,244,248, + 248,1,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,171,248, + 2,252,246,129,233,235,15,132,244,1,128,189,233,0,15,132,244,1,137,213,137, + 194,141,139,233,232,251,1,28,137,252,234,252,233,244,1,255,139,106,252,248, + 255,252,242,15,16,4,199,255,139,172,253,141,233,139,141,233,255,252,242,15, + 17,1,255,221,25,255,252,247,208,139,106,252,248,139,172,253,141,233,139,141, + 233,137,65,4,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36, + 171,255,141,180,253,134,233,139,108,36,48,131,189,233,0,15,132,244,247,137, + 149,233,141,20,202,137,252,233,232,251,1,29,139,149,233,248,1,139,6,15,182, + 204,15,182,232,131,198,4,193,232,16,252,255,36,171,255,252,247,208,139,74, + 252,248,139,4,135,139,108,36,48,137,76,36,8,137,68,36,4,137,44,36,137,149, + 233,137,116,36,24,232,251,1,30,139,149,233,15,182,78,252,253,137,4,202,199, + 68,202,4,237,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36, + 171,255,139,108,36,48,137,149,233,139,139,233,59,139,233,137,116,36,24,15, + 131,244,251,248,1,137,193,37,252,255,7,0,0,193,252,233,11,137,76,36,8,61, + 252,255,7,0,0,15,132,244,249,248,2,137,44,36,137,68,36,4,232,251,1,31,139, + 149,233,15,182,78,252,253,137,4,202,199,68,202,4,237,139,6,15,182,204,15, + 182,232,131,198,4,193,232,16,252,255,36,171,248,3,184,1,8,0,0,252,233,244, + 2,248,5,137,252,233,232,251,1,32,15,183,70,252,254,252,233,244,1,255,252, + 247,208,139,108,36,48,139,139,233,137,116,36,24,59,139,233,137,149,233,15, + 131,244,249,248,2,139,20,135,137,252,233,232,251,1,33,139,149,233,15,182, + 78,252,253,137,4,202,199,68,202,4,237,139,6,15,182,204,15,182,232,131,198, + 4,193,232,16,252,255,36,171,248,3,137,252,233,232,251,1,32,15,183,70,252, + 254,252,247,208,252,233,244,2,255,252,247,208,139,106,252,248,139,173,233, + 139,4,135,252,233,244,167,255,252,247,208,139,106,252,248,139,173,233,139, + 4,135,252,233,244,168,255,15,182,252,236,15,182,192,129,124,253,252,234,4, + 239,15,133,244,38,139,44,252,234,255,129,124,253,194,4,239,15,133,244,251, + 139,4,194,255,129,124,253,194,4,239,15,131,244,251,255,252,242,15,16,4,194, + 252,242,15,45,192,252,242,15,42,200,102,15,46,193,255,221,4,194,219,20,36, + 219,4,36,255,15,133,244,38,255,59,133,233,15,131,244,38,193,224,3,3,133,233, + 129,120,253,4,239,15,132,244,248,139,40,139,64,4,137,44,202,137,68,202,4, + 248,1,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,171,248, + 2,131,189,233,0,15,132,244,249,139,141,233,252,246,129,233,235,15,132,244, + 38,15,182,78,252,253,248,3,199,68,202,4,237,252,233,244,1,248,5,255,129,124, + 253,194,4,239,15,133,244,38,139,4,194,252,233,244,167,255,15,182,252,236, + 15,182,192,252,247,208,139,4,135,129,124,253,252,234,4,239,15,133,244,36, + 139,44,252,234,248,167,139,141,233,35,136,233,105,201,239,3,141,233,248,1, + 129,185,233,239,15,133,244,250,57,129,233,15,133,244,250,129,121,253,4,239, + 15,132,244,251,15,182,70,252,253,139,41,139,73,4,137,44,194,137,76,194,4, + 248,2,255,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,171, + 248,3,15,182,70,252,253,199,68,194,4,237,252,233,244,2,248,4,139,137,233, + 133,201,15,133,244,1,248,5,139,141,233,133,201,15,132,244,3,252,246,129,233, + 235,15,133,244,3,252,233,244,36,255,15,182,252,236,15,182,192,129,124,253, + 252,234,4,239,15,133,244,37,139,44,252,234,59,133,233,15,131,244,37,193,224, + 3,3,133,233,129,120,253,4,239,15,132,244,248,139,40,139,64,4,137,44,202,137, + 68,202,4,248,1,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36, + 171,248,2,131,189,233,0,15,132,244,249,139,141,233,252,246,129,233,235,15, + 132,244,37,255,15,182,78,252,253,248,3,199,68,202,4,237,252,233,244,1,255, + 15,182,252,236,15,182,192,129,124,253,252,234,4,239,15,133,244,41,139,44, + 252,234,255,15,133,244,41,255,59,133,233,15,131,244,41,193,224,3,3,133,233, + 129,120,253,4,239,15,132,244,249,248,1,252,246,133,233,235,15,133,244,253, + 248,2,139,108,202,4,139,12,202,137,104,4,137,8,139,6,15,182,204,15,182,232, + 131,198,4,193,232,16,252,255,36,171,248,3,131,189,233,0,15,132,244,1,139, + 141,233,252,246,129,233,235,255,15,132,244,41,15,182,78,252,253,252,233,244, + 1,248,5,129,124,253,194,4,239,15,133,244,41,139,4,194,252,233,244,168,248, + 7,128,165,233,235,139,139,233,137,171,233,137,141,233,15,182,78,252,253,252, + 233,244,2,255,15,182,252,236,15,182,192,252,247,208,139,4,135,129,124,253, + 252,234,4,239,15,133,244,39,139,44,252,234,248,168,139,141,233,35,136,233, + 105,201,239,198,133,233,0,3,141,233,248,1,129,185,233,239,15,133,244,251, + 57,129,233,15,133,244,251,129,121,253,4,239,15,132,244,250,248,2,255,252, + 246,133,233,235,15,133,244,253,248,3,15,182,70,252,253,139,108,194,4,139, + 4,194,137,105,4,137,1,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252, + 255,36,171,248,4,131,189,233,0,15,132,244,2,137,76,36,16,139,141,233,252, + 246,129,233,235,15,132,244,39,139,76,36,16,252,233,244,2,248,5,139,137,233, + 133,201,15,133,244,1,255,139,141,233,133,201,15,132,244,252,252,246,129,233, + 235,15,132,244,39,248,6,137,68,36,16,199,68,36,20,237,137,108,36,12,141,68, + 36,16,137,108,36,4,139,108,36,48,137,68,36,8,137,44,36,137,149,233,137,116, + 36,24,232,251,1,34,139,149,233,139,108,36,12,137,193,252,233,244,2,248,7, + 128,165,233,235,139,131,233,137,171,233,137,133,233,252,233,244,3,255,15, + 182,252,236,15,182,192,129,124,253,252,234,4,239,15,133,244,40,139,44,252, + 234,59,133,233,15,131,244,40,193,224,3,3,133,233,129,120,253,4,239,15,132, + 244,249,248,1,252,246,133,233,235,15,133,244,253,248,2,139,108,202,4,139, + 12,202,137,104,4,137,8,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252, + 255,36,171,248,3,131,189,233,0,15,132,244,1,255,139,141,233,252,246,129,233, + 235,15,132,244,40,15,182,78,252,253,252,233,244,1,248,7,128,165,233,235,139, + 139,233,137,171,233,137,141,233,15,182,78,252,253,252,233,244,2,255,137,124, + 36,16,139,60,199,248,1,141,12,202,139,105,252,248,252,246,133,233,235,15, + 133,244,253,248,2,139,68,36,20,131,232,1,15,132,244,250,1,252,248,59,133, + 233,15,135,244,251,41,252,248,193,231,3,3,189,233,248,3,139,41,137,47,139, + 105,4,131,193,8,137,111,4,131,199,8,131,232,1,15,133,244,3,248,4,139,124, + 36,16,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,171,248, + 5,137,108,36,4,139,108,36,48,137,149,233,137,68,36,8,137,44,36,137,116,36, + 24,232,251,1,35,139,149,233,15,182,78,252,253,252,233,244,1,248,7,255,128, + 165,233,235,139,131,233,137,171,233,137,133,233,252,233,244,2,255,3,68,36, + 20,255,129,124,253,202,4,239,139,44,202,15,133,244,58,141,84,202,8,137,114, + 252,252,139,181,233,139,14,15,182,252,233,15,182,205,131,198,4,252,255,36, + 171,255,141,76,202,8,137,215,139,105,252,248,129,121,253,252,252,239,15,133, + 244,29,248,59,139,114,252,252,252,247,198,237,15,133,244,253,248,1,137,106, + 252,248,137,68,36,20,131,232,1,15,132,244,249,248,2,139,41,137,47,139,105, + 4,131,193,8,137,111,4,131,199,8,131,232,1,15,133,244,2,139,106,252,248,248, + 3,139,68,36,20,128,189,233,1,15,135,244,251,248,4,139,181,233,139,14,15,182, + 252,233,15,182,205,131,198,4,252,255,36,171,248,5,255,252,247,198,237,15, + 133,244,4,15,182,78,252,253,252,247,209,141,12,202,139,121,252,248,139,191, + 233,139,191,233,252,233,244,4,248,7,129,252,238,239,252,247,198,237,15,133, + 244,254,41,252,242,137,215,139,114,252,252,252,233,244,1,248,8,129,198,239, + 252,233,244,1,255,141,76,202,8,139,105,232,139,65,252,236,137,41,137,65,4, + 139,105,252,240,139,65,252,244,137,105,8,137,65,12,139,105,224,139,65,228, + 137,105,252,248,137,65,252,252,129,252,248,239,184,237,15,133,244,29,137, + 202,137,114,252,252,139,181,233,139,14,15,182,252,233,15,182,205,131,198, + 4,252,255,36,171,255,137,124,36,16,137,92,36,20,139,108,202,252,240,139,68, + 202,252,248,139,157,233,131,198,4,139,189,233,248,1,57,216,15,131,244,251, + 129,124,253,199,4,239,15,132,244,250,255,219,68,202,252,248,255,139,108,199, + 4,137,108,202,12,139,44,199,137,108,202,8,131,192,1,255,137,68,202,252,248, + 248,2,15,183,70,252,254,141,180,253,134,233,248,3,139,92,36,20,139,124,36, + 16,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,171,248,4, + 131,192,1,255,137,68,202,252,248,255,252,233,244,1,248,5,41,216,248,6,59, + 133,233,15,135,244,3,105,252,248,239,3,189,233,129,191,233,239,15,132,244, + 253,141,92,24,1,139,175,233,139,135,233,137,44,202,137,68,202,4,139,175,233, + 139,135,233,137,108,202,8,137,68,202,12,137,92,202,252,248,252,233,244,2, + 248,7,255,131,192,1,252,233,244,6,255,129,124,253,202,252,236,239,15,133, + 244,251,139,108,202,232,129,124,253,202,252,244,239,15,133,244,251,129,124, + 253,202,252,252,239,15,133,244,251,128,189,233,235,15,133,244,251,141,180, + 253,134,233,199,68,202,252,248,0,0,0,0,248,1,139,6,15,182,204,15,182,232, + 131,198,4,193,232,16,252,255,36,171,248,5,198,70,252,252,235,141,180,253, + 134,233,198,6,235,252,233,244,1,255,15,182,252,236,15,182,192,137,124,36, + 16,141,188,253,194,233,141,12,202,43,122,252,252,133,252,237,15,132,244,251, + 141,108,252,233,252,248,57,215,15,131,244,248,248,1,139,71,252,248,137,1, + 139,71,252,252,131,199,8,137,65,4,131,193,8,57,252,233,15,131,244,249,57, + 215,15,130,244,1,248,2,199,65,4,237,131,193,8,57,252,233,15,130,244,2,248, + 3,139,124,36,16,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255, + 36,171,248,5,199,68,36,20,1,0,0,0,137,208,41,252,248,15,134,244,3,137,197, + 193,252,237,3,131,197,1,137,108,36,20,139,108,36,48,1,200,59,133,233,15,135, + 244,253,248,6,255,139,71,252,248,137,1,139,71,252,252,131,199,8,137,65,4, + 131,193,8,57,215,15,130,244,6,252,233,244,3,248,7,137,149,233,137,141,233, + 137,116,36,24,41,215,139,84,36,20,131,252,234,1,137,252,233,232,251,1,0,139, + 149,233,139,141,233,1,215,252,233,244,6,255,193,225,3,255,248,1,139,114,252, + 252,137,68,36,20,252,247,198,237,15,133,244,253,255,248,13,137,215,131,232, + 1,15,132,244,249,248,2,139,44,15,137,111,252,248,139,108,15,4,137,111,252, + 252,131,199,8,131,232,1,15,133,244,2,248,3,139,68,36,20,15,182,110,252,255, + 248,5,57,197,15,135,244,252,255,139,108,10,4,137,106,252,252,139,44,10,137, + 106,252,248,255,248,5,56,70,252,255,15,135,244,252,255,15,182,78,252,253, + 252,247,209,141,20,202,139,122,252,248,139,191,233,139,191,233,139,6,15,182, + 204,15,182,232,131,198,4,193,232,16,252,255,36,171,248,6,255,199,71,252,252, + 237,131,199,8,255,199,68,194,252,244,237,255,131,192,1,252,233,244,5,248, + 7,141,174,233,252,247,197,237,15,133,244,14,41,252,234,255,1,252,233,255, + 137,252,245,209,252,237,129,229,239,102,131,172,253,43,233,1,15,132,244,148, + 255,141,12,202,255,129,121,253,4,239,15,133,244,255,255,129,121,253,12,239, + 15,133,244,60,129,121,253,20,239,15,133,244,60,139,41,131,121,16,0,15,140, + 244,251,255,129,121,253,12,239,15,133,244,165,129,121,253,20,239,15,133,244, + 165,255,139,105,16,133,252,237,15,136,244,251,3,41,15,128,244,247,137,41, + 255,59,105,8,199,65,28,237,137,105,24,255,15,142,244,253,248,1,248,6,141, + 180,253,134,233,255,141,180,253,134,233,15,183,70,252,254,15,142,245,248, + 1,248,6,255,15,143,244,253,248,6,141,180,253,134,233,248,1,255,248,7,139, + 6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,171,248,5,255,3,41, + 15,128,244,1,137,41,255,15,141,244,7,255,141,180,253,134,233,15,183,70,252, + 254,15,141,245,255,15,140,244,7,255,252,233,244,6,248,9,255,129,121,253,4, + 239,255,15,131,244,60,129,121,253,12,239,15,131,244,60,255,129,121,253,12, + 239,15,131,244,165,129,121,253,20,239,15,131,244,165,255,139,105,20,255,129, + 252,253,239,15,131,244,60,255,252,242,15,16,1,252,242,15,16,73,8,255,252, + 242,15,88,65,16,252,242,15,17,1,133,252,237,15,136,244,249,255,15,140,244, + 249,255,102,15,46,200,248,1,252,242,15,17,65,24,255,221,65,8,221,1,255,220, + 65,16,221,17,221,81,24,133,252,237,15,136,244,247,255,221,81,24,15,140,244, + 247,255,217,201,248,1,255,15,183,70,252,254,255,15,131,244,7,255,15,131,244, + 248,141,180,253,134,233,255,141,180,253,134,233,15,183,70,252,254,15,131, + 245,255,15,130,244,7,255,15,130,244,248,141,180,253,134,233,255,248,3,102, + 15,46,193,252,233,244,1,255,141,12,202,139,105,4,129,252,253,239,15,132,244, + 247,255,137,105,252,252,139,41,137,105,252,248,252,233,245,255,141,180,253, + 134,233,139,1,137,105,252,252,137,65,252,248,255,139,139,233,139,4,129,139, + 128,233,139,108,36,48,137,147,233,137,171,233,252,255,224,255,141,180,253, + 134,233,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,171,255, + 137,252,245,209,252,237,129,229,239,102,131,172,253,43,233,1,15,132,244,150, + 255,139,190,233,139,108,36,48,141,12,202,59,141,233,15,135,244,24,15,182, + 142,233,57,200,15,134,244,249,248,2,255,15,183,70,252,254,252,233,245,255, + 248,3,199,68,194,252,252,237,131,192,1,57,200,15,134,244,3,252,233,244,2, + 255,141,44,197,237,141,4,194,139,122,252,248,137,104,252,252,137,120,252, + 248,139,108,36,48,141,12,200,59,141,233,15,135,244,23,137,209,137,194,15, + 182,174,233,133,252,237,15,132,244,248,248,1,131,193,8,57,209,15,131,244, + 249,139,121,252,248,137,56,139,121,252,252,137,120,4,131,192,8,199,65,252, + 252,237,131,252,237,1,15,133,244,1,248,2,255,139,190,233,139,6,15,182,204, + 15,182,232,131,198,4,193,232,16,252,255,36,171,255,248,3,199,64,4,237,131, + 192,8,131,252,237,1,15,133,244,3,252,233,244,2,255,139,106,252,248,139,189, + 233,139,108,36,48,141,68,194,252,248,137,149,233,141,136,233,59,141,233,137, + 133,233,255,137,44,36,255,137,124,36,4,137,44,36,255,15,135,244,22,199,131, + 233,237,255,252,255,215,255,252,255,147,233,255,199,131,233,237,139,149,233, + 141,12,194,252,247,217,3,141,233,139,114,252,252,252,233,244,12,255,254,0 }; enum { @@ -886,6 +888,7 @@ enum { GLOB_vmeta_arith_vvo, GLOB_vmeta_arith_vv, GLOB_vmeta_len, + GLOB_BC_LEN_Z, GLOB_vmeta_call_ra, GLOB_BC_CALLT_Z, GLOB_vmeta_for, @@ -1047,6 +1050,7 @@ static const char *const globnames[] = { "vmeta_arith_vvo", "vmeta_arith_vv", "vmeta_len", + "BC_LEN_Z", "vmeta_call_ra", "BC_CALLT_Z", "vmeta_for", @@ -1264,730 +1268,735 @@ static void build_subroutines(BuildCtx *ctx, int cmov, int sse) #if LJ_DUALNUM dasm_put(Dst, 1442); #endif - dasm_put(Dst, 1488, Dt1(->base), Dt1(->base), FRAME_CONT, 2+1, Dt1(->base), Dt1(->base), Dt1(->base)); - dasm_put(Dst, 1643, Dt1(->base), Dt7(->pc), Dt1(->base), Dt1(->base), GG_DISP2STATIC, 1+1, LJ_TISTRUECOND); - dasm_put(Dst, 1820, 1+1, ~LJ_TNUMX); + dasm_put(Dst, 1488, Dt1(->base), Dt1(->base), FRAME_CONT, 2+1, Dt1(->base), Dt1(->base)); +#ifdef LUAJIT_ENABLE_LUA52COMPAT + dasm_put(Dst, 1598); +#else + dasm_put(Dst, 1617); +#endif + dasm_put(Dst, 1622, Dt1(->base), Dt1(->base), Dt7(->pc), Dt1(->base), Dt1(->base), GG_DISP2STATIC, 1+1, LJ_TISTRUECOND); + dasm_put(Dst, 1811, 1+1, ~LJ_TNUMX); if (cmov) { - dasm_put(Dst, 1849); + dasm_put(Dst, 1869); } else { - dasm_put(Dst, 1853); + dasm_put(Dst, 1873); } - dasm_put(Dst, 1862, ((char *)(&((GCfuncC *)0)->upvalue)), LJ_TSTR, 1+1, LJ_TTAB, Dt6(->metatable), LJ_TNIL, DISPATCH_GL(gcroot)+4*(GCROOT_MMNAME+MM_metatable), LJ_TTAB); - dasm_put(Dst, 1945, Dt6(->hmask), Dt5(->hash), sizeof(Node), Dt6(->node), DtB(->key.it), LJ_TSTR, DtB(->key.gcr), DtB(->next), LJ_TNIL); - dasm_put(Dst, 2003, LJ_TUDATA, LJ_TISNUM, LJ_TNUMX, DISPATCH_GL(gcroot[GCROOT_BASEMT]), 2+1); - dasm_put(Dst, 2066, LJ_TTAB, Dt6(->metatable), LJ_TTAB, Dt6(->metatable), LJ_TTAB, Dt6(->marked), LJ_GC_BLACK, Dt6(->marked), (uint8_t)~LJ_GC_BLACK, DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); - dasm_put(Dst, 2138, 2+1, LJ_TTAB, 1+1, LJ_TISNUM); + dasm_put(Dst, 1882, ((char *)(&((GCfuncC *)0)->upvalue)), LJ_TSTR, 1+1, LJ_TTAB, Dt6(->metatable), LJ_TNIL, DISPATCH_GL(gcroot)+4*(GCROOT_MMNAME+MM_metatable), LJ_TTAB); + dasm_put(Dst, 1965, Dt6(->hmask), Dt5(->hash), sizeof(Node), Dt6(->node), DtB(->key.it), LJ_TSTR, DtB(->key.gcr), DtB(->next), LJ_TNIL); + dasm_put(Dst, 2023, LJ_TUDATA, LJ_TISNUM, LJ_TNUMX, DISPATCH_GL(gcroot[GCROOT_BASEMT]), 2+1); + dasm_put(Dst, 2086, LJ_TTAB, Dt6(->metatable), LJ_TTAB, Dt6(->metatable), LJ_TTAB, Dt6(->marked), LJ_GC_BLACK, Dt6(->marked), (uint8_t)~LJ_GC_BLACK, DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); + dasm_put(Dst, 2158, 2+1, LJ_TTAB, 1+1, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 2227); + dasm_put(Dst, 2247); } else { - dasm_put(Dst, 2244); + dasm_put(Dst, 2264); } if (sse) { - dasm_put(Dst, 2249); + dasm_put(Dst, 2269); } else { - dasm_put(Dst, 2259); + dasm_put(Dst, 2279); } - dasm_put(Dst, 2266, 1+1, LJ_TSTR, LJ_TSTR, LJ_TISNUM, DISPATCH_GL(gcroot[GCROOT_BASEMT_NUM]), DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold)); - dasm_put(Dst, 2332, Dt1(->base)); + dasm_put(Dst, 2286, 1+1, LJ_TSTR, LJ_TSTR, LJ_TISNUM, DISPATCH_GL(gcroot[GCROOT_BASEMT_NUM]), DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold)); + dasm_put(Dst, 2352, Dt1(->base)); if (LJ_DUALNUM) { - dasm_put(Dst, 2356); + dasm_put(Dst, 2376); } else { - dasm_put(Dst, 2361); + dasm_put(Dst, 2381); } - dasm_put(Dst, 2366, Dt1(->base), 1+1, LJ_TTAB, Dt1(->base), Dt1(->top), Dt1(->base), 1+2); - dasm_put(Dst, 2475, LJ_TNIL, LJ_TNIL, 1+1, LJ_TTAB); + dasm_put(Dst, 2386, Dt1(->base), 1+1, LJ_TTAB, Dt1(->base), Dt1(->top), Dt1(->base), 1+2); + dasm_put(Dst, 2495, LJ_TNIL, LJ_TNIL, 1+1, LJ_TTAB); #ifdef LUAJIT_ENABLE_LUA52COMPAT - dasm_put(Dst, 2522, Dt6(->metatable)); + dasm_put(Dst, 2542, Dt6(->metatable)); #endif - dasm_put(Dst, 2531, Dt8(->upvalue[0]), LJ_TFUNC, LJ_TNIL, 1+3, 1+1, LJ_TTAB, LJ_TISNUM); + dasm_put(Dst, 2551, Dt8(->upvalue[0]), LJ_TFUNC, LJ_TNIL, 1+3, 1+1, LJ_TTAB, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 2517); + dasm_put(Dst, 2537); } else { - dasm_put(Dst, 2244); + dasm_put(Dst, 2264); } - dasm_put(Dst, 2586); + dasm_put(Dst, 2606); if (LJ_DUALNUM) { - dasm_put(Dst, 2591, LJ_TISNUM); + dasm_put(Dst, 2611, LJ_TISNUM); } else if (sse) { - dasm_put(Dst, 2607); + dasm_put(Dst, 2627); } else { - dasm_put(Dst, 2646); + dasm_put(Dst, 2666); } - dasm_put(Dst, 2664, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->hmask), 1+0); - dasm_put(Dst, 2502, 1+1, LJ_TTAB); + dasm_put(Dst, 2684, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->hmask), 1+0); + dasm_put(Dst, 2522, 1+1, LJ_TTAB); #ifdef LUAJIT_ENABLE_LUA52COMPAT - dasm_put(Dst, 2522, Dt6(->metatable)); + dasm_put(Dst, 2542, Dt6(->metatable)); #endif - dasm_put(Dst, 2745, Dt8(->upvalue[0]), LJ_TFUNC); + dasm_put(Dst, 2765, Dt8(->upvalue[0]), LJ_TFUNC); if (LJ_DUALNUM) { - dasm_put(Dst, 2766, LJ_TISNUM); + dasm_put(Dst, 2786, LJ_TISNUM); } else if (sse) { - dasm_put(Dst, 2778); + dasm_put(Dst, 2798); } else { - dasm_put(Dst, 2788); + dasm_put(Dst, 2808); } - dasm_put(Dst, 2795, 1+3, 1+1, 8+FRAME_PCALL, DISPATCH_GL(hookmask), HOOK_ACTIVE_SHIFT, 2+1, LJ_TFUNC); - dasm_put(Dst, 2859, LJ_TFUNC, 16+FRAME_PCALL, 1+1, LJ_TTHREAD, Dt1(->cframe), Dt1(->status), LUA_YIELD, Dt1(->top)); - dasm_put(Dst, 2947, Dt1(->base), Dt1(->maxstack), Dt1(->top), Dt1(->base), Dt1(->top), DISPATCH_GL(vmstate), ~LJ_VMST_INTERP); - dasm_put(Dst, 3048, Dt1(->base), LUA_YIELD, Dt1(->base), Dt1(->top), Dt1(->top), Dt1(->maxstack), LJ_TTRUE, FRAME_TYPE); - dasm_put(Dst, 3162, LJ_TFALSE, Dt1(->top), Dt1(->top), 1+2, Dt1(->top), Dt1(->base), Dt8(->upvalue[0].gcr), Dt1(->cframe)); - dasm_put(Dst, 3260, Dt1(->status), LUA_YIELD, Dt1(->top), Dt1(->base), Dt1(->maxstack), Dt1(->top), Dt1(->base), Dt1(->top)); - dasm_put(Dst, 3326, DISPATCH_GL(vmstate), ~LJ_VMST_INTERP, Dt1(->base), LUA_YIELD, Dt1(->base), Dt1(->top), Dt1(->top), Dt1(->maxstack)); - dasm_put(Dst, 3427, FRAME_TYPE, Dt1(->top), Dt1(->base), Dt1(->cframe), CFRAME_RESUME); - dasm_put(Dst, 3540, Dt1(->base), Dt1(->top), Dt1(->cframe), LUA_YIELD, Dt1(->status)); + dasm_put(Dst, 2815, 1+3, 1+1, 8+FRAME_PCALL, DISPATCH_GL(hookmask), HOOK_ACTIVE_SHIFT, 2+1, LJ_TFUNC); + dasm_put(Dst, 2879, LJ_TFUNC, 16+FRAME_PCALL, 1+1, LJ_TTHREAD, Dt1(->cframe), Dt1(->status), LUA_YIELD, Dt1(->top)); + dasm_put(Dst, 2967, Dt1(->base), Dt1(->maxstack), Dt1(->top), Dt1(->base), Dt1(->top), DISPATCH_GL(vmstate), ~LJ_VMST_INTERP); + dasm_put(Dst, 3068, Dt1(->base), LUA_YIELD, Dt1(->base), Dt1(->top), Dt1(->top), Dt1(->maxstack), LJ_TTRUE, FRAME_TYPE); + dasm_put(Dst, 3182, LJ_TFALSE, Dt1(->top), Dt1(->top), 1+2, Dt1(->top), Dt1(->base), Dt8(->upvalue[0].gcr), Dt1(->cframe)); + dasm_put(Dst, 3280, Dt1(->status), LUA_YIELD, Dt1(->top), Dt1(->base), Dt1(->maxstack), Dt1(->top), Dt1(->base), Dt1(->top)); + dasm_put(Dst, 3346, DISPATCH_GL(vmstate), ~LJ_VMST_INTERP, Dt1(->base), LUA_YIELD, Dt1(->base), Dt1(->top), Dt1(->top), Dt1(->maxstack)); + dasm_put(Dst, 3447, FRAME_TYPE, Dt1(->top), Dt1(->base), Dt1(->cframe), CFRAME_RESUME); + dasm_put(Dst, 3560, Dt1(->base), Dt1(->top), Dt1(->cframe), LUA_YIELD, Dt1(->status)); if (!LJ_DUALNUM) { - dasm_put(Dst, 3566); + dasm_put(Dst, 3586); } if (sse) { - dasm_put(Dst, 3569); + dasm_put(Dst, 3589); } - dasm_put(Dst, 3584, 1+1); + dasm_put(Dst, 3604, 1+1); if (LJ_DUALNUM) { - dasm_put(Dst, 3595, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 3615, LJ_TISNUM, LJ_TISNUM); } else { - dasm_put(Dst, 3675, LJ_TISNUM); + dasm_put(Dst, 3695, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 3685); + dasm_put(Dst, 3705); } else { - dasm_put(Dst, 3721); + dasm_put(Dst, 3741); } - dasm_put(Dst, 3738, 1+1, FRAME_TYPE, LJ_TNIL); + dasm_put(Dst, 3758, 1+1, FRAME_TYPE, LJ_TNIL); if (LJ_DUALNUM) { - dasm_put(Dst, 3830, LJ_TISNUM); + dasm_put(Dst, 3850, LJ_TISNUM); } else { - dasm_put(Dst, 3675, LJ_TISNUM); + dasm_put(Dst, 3695, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 3852); + dasm_put(Dst, 3872); if (LJ_DUALNUM) { - dasm_put(Dst, 3861); + dasm_put(Dst, 3881); } - dasm_put(Dst, 2254); + dasm_put(Dst, 2274); } else { - dasm_put(Dst, 3895); + dasm_put(Dst, 3915); if (LJ_DUALNUM) { - dasm_put(Dst, 3901); + dasm_put(Dst, 3921); if (cmov) { - dasm_put(Dst, 3924); + dasm_put(Dst, 3944); } else { - dasm_put(Dst, 3930); + dasm_put(Dst, 3950); } - dasm_put(Dst, 3937); - } else { - dasm_put(Dst, 2261); - } - } - dasm_put(Dst, 3954); - if (LJ_DUALNUM) { - dasm_put(Dst, 3830, LJ_TISNUM); - } else { - dasm_put(Dst, 3675, LJ_TISNUM); - } - if (sse) { dasm_put(Dst, 3957); - if (LJ_DUALNUM) { - dasm_put(Dst, 3861); - } - dasm_put(Dst, 2254); - } else { - dasm_put(Dst, 3966); - if (LJ_DUALNUM) { - dasm_put(Dst, 3901); - if (cmov) { - dasm_put(Dst, 3924); - } else { - dasm_put(Dst, 3930); - } - dasm_put(Dst, 3937); } else { - dasm_put(Dst, 2261); + dasm_put(Dst, 2281); + } + } + dasm_put(Dst, 3974); + if (LJ_DUALNUM) { + dasm_put(Dst, 3850, LJ_TISNUM); + } else { + dasm_put(Dst, 3695, LJ_TISNUM); + } + if (sse) { + dasm_put(Dst, 3977); + if (LJ_DUALNUM) { + dasm_put(Dst, 3881); + } + dasm_put(Dst, 2274); + } else { + dasm_put(Dst, 3986); + if (LJ_DUALNUM) { + dasm_put(Dst, 3921); + if (cmov) { + dasm_put(Dst, 3944); + } else { + dasm_put(Dst, 3950); + } + dasm_put(Dst, 3957); + } else { + dasm_put(Dst, 2281); } } if (sse) { - dasm_put(Dst, 3972, 1+1, LJ_TISNUM); + dasm_put(Dst, 3992, 1+1, LJ_TISNUM); } else { - dasm_put(Dst, 4001, 1+1, LJ_TISNUM); + dasm_put(Dst, 4021, 1+1, LJ_TISNUM); } - dasm_put(Dst, 4030, 1+1, LJ_TISNUM, 1+1, LJ_TISNUM, 1+1); - dasm_put(Dst, 4099, LJ_TISNUM, 1+1, LJ_TISNUM, 1+1); - dasm_put(Dst, 4156, LJ_TISNUM, 1+1, LJ_TISNUM, 1+1); - dasm_put(Dst, 4219, LJ_TISNUM, 1+1, LJ_TISNUM, 1+1, LJ_TISNUM); - dasm_put(Dst, 4309); + dasm_put(Dst, 4050, 1+1, LJ_TISNUM, 1+1, LJ_TISNUM, 1+1); + dasm_put(Dst, 4119, LJ_TISNUM, 1+1, LJ_TISNUM, 1+1); + dasm_put(Dst, 4176, LJ_TISNUM, 1+1, LJ_TISNUM, 1+1); + dasm_put(Dst, 4239, LJ_TISNUM, 1+1, LJ_TISNUM, 1+1, LJ_TISNUM); + dasm_put(Dst, 4329); if (sse) { - dasm_put(Dst, 4321, 1+1, LJ_TISNUM); + dasm_put(Dst, 4341, 1+1, LJ_TISNUM); } else { - dasm_put(Dst, 4352, 1+1, LJ_TISNUM); + dasm_put(Dst, 4372, 1+1, LJ_TISNUM); } - dasm_put(Dst, 4377); + dasm_put(Dst, 4397); if (sse) { - dasm_put(Dst, 4391, 1+1, LJ_TISNUM); + dasm_put(Dst, 4411, 1+1, LJ_TISNUM); } else { - dasm_put(Dst, 4422, 1+1, LJ_TISNUM); + dasm_put(Dst, 4442, 1+1, LJ_TISNUM); } - dasm_put(Dst, 4447); + dasm_put(Dst, 4467); if (sse) { - dasm_put(Dst, 4461, 1+1, LJ_TISNUM); + dasm_put(Dst, 4481, 1+1, LJ_TISNUM); } else { - dasm_put(Dst, 4492, 1+1, LJ_TISNUM); + dasm_put(Dst, 4512, 1+1, LJ_TISNUM); } - dasm_put(Dst, 4517); + dasm_put(Dst, 4537); if (sse) { - dasm_put(Dst, 4533, 1+1, LJ_TISNUM, Dt8(->upvalue[0])); + dasm_put(Dst, 4553, 1+1, LJ_TISNUM, Dt8(->upvalue[0])); } else { - dasm_put(Dst, 4572, 1+1, LJ_TISNUM, Dt8(->upvalue[0])); + dasm_put(Dst, 4592, 1+1, LJ_TISNUM, Dt8(->upvalue[0])); } - dasm_put(Dst, 4605, 2+1, LJ_TISNUM, LJ_TISNUM, 2+1, LJ_TISNUM, LJ_TISNUM); - dasm_put(Dst, 4670, 1+1, LJ_TISNUM); + dasm_put(Dst, 4625, 2+1, LJ_TISNUM, LJ_TISNUM, 2+1, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 4690, 1+1, LJ_TISNUM); if (sse) { - dasm_put(Dst, 4769); + dasm_put(Dst, 4789); } else { - dasm_put(Dst, 4775); + dasm_put(Dst, 4795); } - dasm_put(Dst, 4784); + dasm_put(Dst, 4804); if (sse) { - dasm_put(Dst, 4809); - } else { - dasm_put(Dst, 4815); - } - dasm_put(Dst, 4818, 1+2); - if (sse) { - dasm_put(Dst, 4827); + dasm_put(Dst, 4829); } else { dasm_put(Dst, 4835); } - dasm_put(Dst, 4843); + dasm_put(Dst, 4838, 1+2); if (sse) { - dasm_put(Dst, 4846); + dasm_put(Dst, 4847); } else { - dasm_put(Dst, 4878); + dasm_put(Dst, 4855); } - dasm_put(Dst, 4897); + dasm_put(Dst, 4863); if (sse) { - dasm_put(Dst, 4913, 1+1, LJ_TISNUM); + dasm_put(Dst, 4866); } else { - dasm_put(Dst, 4938, 1+1, LJ_TISNUM); + dasm_put(Dst, 4898); } - dasm_put(Dst, 4960); + dasm_put(Dst, 4917); if (sse) { - dasm_put(Dst, 4982); + dasm_put(Dst, 4933, 1+1, LJ_TISNUM); } else { - dasm_put(Dst, 5008); + dasm_put(Dst, 4958, 1+1, LJ_TISNUM); } - dasm_put(Dst, 5025, 1+2); + dasm_put(Dst, 4980); if (sse) { - dasm_put(Dst, 5065); + dasm_put(Dst, 5002); } else { - dasm_put(Dst, 5073); + dasm_put(Dst, 5028); } - dasm_put(Dst, 5083, 2+1, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 5045, 1+2); if (sse) { - dasm_put(Dst, 5135, 2+1, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 5085); } else { - dasm_put(Dst, 5182, 2+1, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 5093); } - dasm_put(Dst, 5223, LJ_TISNUM); + dasm_put(Dst, 5103, 2+1, LJ_TISNUM, LJ_TISNUM); + if (sse) { + dasm_put(Dst, 5155, 2+1, LJ_TISNUM, LJ_TISNUM); + } else { + dasm_put(Dst, 5202, 2+1, LJ_TISNUM, LJ_TISNUM); + } + dasm_put(Dst, 5243, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 5236, LJ_TISNUM); + dasm_put(Dst, 5256, LJ_TISNUM); if (sse) { - dasm_put(Dst, 4769); + dasm_put(Dst, 4789); } else { - dasm_put(Dst, 4775); + dasm_put(Dst, 4795); } - dasm_put(Dst, 5286); + dasm_put(Dst, 5306); } else { - dasm_put(Dst, 2244); + dasm_put(Dst, 2264); } if (sse) { - dasm_put(Dst, 5297, LJ_TISNUM); + dasm_put(Dst, 5317, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 5318); + dasm_put(Dst, 5338); } else { - dasm_put(Dst, 2244); + dasm_put(Dst, 2264); } - dasm_put(Dst, 5339); + dasm_put(Dst, 5359); } else { - dasm_put(Dst, 5364, LJ_TISNUM); + dasm_put(Dst, 5384, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 5382); + dasm_put(Dst, 5402); } else { - dasm_put(Dst, 5400); + dasm_put(Dst, 5420); } - dasm_put(Dst, 5405); + dasm_put(Dst, 5425); if (cmov) { - dasm_put(Dst, 5415); + dasm_put(Dst, 5435); } else { - dasm_put(Dst, 5423); + dasm_put(Dst, 5443); } - dasm_put(Dst, 5356); + dasm_put(Dst, 5376); } - dasm_put(Dst, 5444, LJ_TISNUM); + dasm_put(Dst, 5464, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 5457, LJ_TISNUM); + dasm_put(Dst, 5477, LJ_TISNUM); if (sse) { - dasm_put(Dst, 4769); + dasm_put(Dst, 4789); } else { - dasm_put(Dst, 4775); + dasm_put(Dst, 4795); } - dasm_put(Dst, 5286); + dasm_put(Dst, 5306); } else { - dasm_put(Dst, 2244); + dasm_put(Dst, 2264); } if (sse) { - dasm_put(Dst, 5297, LJ_TISNUM); + dasm_put(Dst, 5317, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 5318); + dasm_put(Dst, 5338); } else { - dasm_put(Dst, 2244); + dasm_put(Dst, 2264); } - dasm_put(Dst, 5507); + dasm_put(Dst, 5527); } else { - dasm_put(Dst, 5364, LJ_TISNUM); + dasm_put(Dst, 5384, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 5382); + dasm_put(Dst, 5402); } else { - dasm_put(Dst, 5400); + dasm_put(Dst, 5420); } - dasm_put(Dst, 5405); + dasm_put(Dst, 5425); if (cmov) { - dasm_put(Dst, 5532); + dasm_put(Dst, 5552); } else { - dasm_put(Dst, 5540); + dasm_put(Dst, 5560); } - dasm_put(Dst, 5356); + dasm_put(Dst, 5376); } if (!sse) { - dasm_put(Dst, 5561); + dasm_put(Dst, 5581); } - dasm_put(Dst, 5570, 1+1, LJ_TSTR); + dasm_put(Dst, 5590, 1+1, LJ_TSTR); if (LJ_DUALNUM) { - dasm_put(Dst, 5592, Dt5(->len)); + dasm_put(Dst, 5612, Dt5(->len)); } else if (sse) { - dasm_put(Dst, 5600, Dt5(->len)); + dasm_put(Dst, 5620, Dt5(->len)); } else { - dasm_put(Dst, 5611, Dt5(->len)); + dasm_put(Dst, 5631, Dt5(->len)); } - dasm_put(Dst, 5619, 1+1, LJ_TSTR, Dt5(->len), Dt5([1])); + dasm_put(Dst, 5639, 1+1, LJ_TSTR, Dt5(->len), Dt5([1])); if (LJ_DUALNUM) { - dasm_put(Dst, 3949); + dasm_put(Dst, 3969); } else if (sse) { - dasm_put(Dst, 5657); + dasm_put(Dst, 5677); } else { - dasm_put(Dst, 5667); + dasm_put(Dst, 5687); } - dasm_put(Dst, 5680, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), 1+1, LJ_TISNUM); + dasm_put(Dst, 5700, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), 1+1, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 5711); + dasm_put(Dst, 5731); } else if (sse) { - dasm_put(Dst, 5734); + dasm_put(Dst, 5754); } else { - dasm_put(Dst, 5760); + dasm_put(Dst, 5780); } - dasm_put(Dst, 5784, Dt1(->base), Dt1(->base), LJ_TSTR, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), 1+2, LJ_TISNUM); + dasm_put(Dst, 5804, Dt1(->base), Dt1(->base), LJ_TSTR, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), 1+2, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 5887); + dasm_put(Dst, 5907); } else if (sse) { - dasm_put(Dst, 5899); + dasm_put(Dst, 5919); } else { - dasm_put(Dst, 5914); + dasm_put(Dst, 5934); } - dasm_put(Dst, 5926, LJ_TSTR, LJ_TISNUM); + dasm_put(Dst, 5946, LJ_TSTR, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 2517); + dasm_put(Dst, 2537); } else { - dasm_put(Dst, 2244); + dasm_put(Dst, 2264); } - dasm_put(Dst, 5943, Dt5(->len)); + dasm_put(Dst, 5963, Dt5(->len)); if (LJ_DUALNUM) { - dasm_put(Dst, 5953); + dasm_put(Dst, 5973); } else if (sse) { - dasm_put(Dst, 5957); + dasm_put(Dst, 5977); } else { - dasm_put(Dst, 5964); + dasm_put(Dst, 5984); } - dasm_put(Dst, 5976, sizeof(GCstr)-1); - dasm_put(Dst, 6051, 2+1, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold)); - dasm_put(Dst, 6110, LJ_TSTR, LJ_TISNUM); + dasm_put(Dst, 5996, sizeof(GCstr)-1); + dasm_put(Dst, 6071, 2+1, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold)); + dasm_put(Dst, 6130, LJ_TSTR, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 6127); + dasm_put(Dst, 6147); } else if (sse) { - dasm_put(Dst, 6135); + dasm_put(Dst, 6155); } else { - dasm_put(Dst, 6146); + dasm_put(Dst, 6166); } - dasm_put(Dst, 6162, Dt5(->len), DISPATCH_GL(tmpbuf.sz), Dt5([1]), DISPATCH_GL(tmpbuf.buf), DISPATCH_GL(tmpbuf.buf), 1+1); - dasm_put(Dst, 6227, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), LJ_TSTR, Dt5(->len), DISPATCH_GL(tmpbuf.sz), sizeof(GCstr), DISPATCH_GL(tmpbuf.buf)); - dasm_put(Dst, 6290, 1+1, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), LJ_TSTR, Dt5(->len), DISPATCH_GL(tmpbuf.sz)); - dasm_put(Dst, 6361, sizeof(GCstr), DISPATCH_GL(tmpbuf.buf), 1+1); - dasm_put(Dst, 6446, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), LJ_TSTR, Dt5(->len), DISPATCH_GL(tmpbuf.sz), sizeof(GCstr), DISPATCH_GL(tmpbuf.buf)); - dasm_put(Dst, 6516, 1+1, LJ_TTAB); + dasm_put(Dst, 6182, Dt5(->len), DISPATCH_GL(tmpbuf.sz), Dt5([1]), DISPATCH_GL(tmpbuf.buf), DISPATCH_GL(tmpbuf.buf), 1+1); + dasm_put(Dst, 6247, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), LJ_TSTR, Dt5(->len), DISPATCH_GL(tmpbuf.sz), sizeof(GCstr), DISPATCH_GL(tmpbuf.buf)); + dasm_put(Dst, 6310, 1+1, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), LJ_TSTR, Dt5(->len), DISPATCH_GL(tmpbuf.sz)); + dasm_put(Dst, 6381, sizeof(GCstr), DISPATCH_GL(tmpbuf.buf), 1+1); + dasm_put(Dst, 6466, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), LJ_TSTR, Dt5(->len), DISPATCH_GL(tmpbuf.sz), sizeof(GCstr), DISPATCH_GL(tmpbuf.buf)); + dasm_put(Dst, 6536, 1+1, LJ_TTAB); if (LJ_DUALNUM) { - dasm_put(Dst, 6584); + dasm_put(Dst, 6604); } else if (sse) { - dasm_put(Dst, 6591); + dasm_put(Dst, 6611); } else { - dasm_put(Dst, 6601); + dasm_put(Dst, 6621); } - dasm_put(Dst, 6612, 1+1, LJ_TISNUM); + dasm_put(Dst, 6632, 1+1, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 6628); + dasm_put(Dst, 6648); } else { - dasm_put(Dst, 2244); + dasm_put(Dst, 2264); } if (sse) { - dasm_put(Dst, 6645); + dasm_put(Dst, 6665); } else { - dasm_put(Dst, 6674); + dasm_put(Dst, 6694); } dasm_put(Dst, 111); if (LJ_DUALNUM || sse) { if (!sse) { - dasm_put(Dst, 6692); + dasm_put(Dst, 6712); } - dasm_put(Dst, 6696); + dasm_put(Dst, 6716); } else { - dasm_put(Dst, 6604); + dasm_put(Dst, 6624); } - dasm_put(Dst, 6701, 1+1); + dasm_put(Dst, 6721, 1+1); if (sse) { - dasm_put(Dst, 6712); + dasm_put(Dst, 6732); } else { - dasm_put(Dst, 6727); + dasm_put(Dst, 6747); } - dasm_put(Dst, 2221, LJ_TISNUM); + dasm_put(Dst, 2241, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 6736); + dasm_put(Dst, 6756); } else { - dasm_put(Dst, 2244); + dasm_put(Dst, 2264); } if (sse) { - dasm_put(Dst, 6753); + dasm_put(Dst, 6773); } else { - dasm_put(Dst, 6768); + dasm_put(Dst, 6788); } - dasm_put(Dst, 6781, LJ_TISNUM); + dasm_put(Dst, 6801, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 6806); - } else { dasm_put(Dst, 6826); + } else { + dasm_put(Dst, 6846); } if (sse) { - dasm_put(Dst, 6831); + dasm_put(Dst, 6851); } else { - dasm_put(Dst, 6848); + dasm_put(Dst, 6868); } - dasm_put(Dst, 6861, 1+1); + dasm_put(Dst, 6881, 1+1); if (sse) { - dasm_put(Dst, 6712); + dasm_put(Dst, 6732); } else { - dasm_put(Dst, 6727); + dasm_put(Dst, 6747); } - dasm_put(Dst, 2221, LJ_TISNUM); + dasm_put(Dst, 2241, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 6736); + dasm_put(Dst, 6756); } else { - dasm_put(Dst, 2244); + dasm_put(Dst, 2264); } if (sse) { - dasm_put(Dst, 6753); + dasm_put(Dst, 6773); } else { - dasm_put(Dst, 6768); + dasm_put(Dst, 6788); } - dasm_put(Dst, 6781, LJ_TISNUM); + dasm_put(Dst, 6801, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 6879); - } else { - dasm_put(Dst, 6826); - } - if (sse) { dasm_put(Dst, 6899); } else { - dasm_put(Dst, 6916); + dasm_put(Dst, 6846); } - dasm_put(Dst, 6929, 1+1); if (sse) { - dasm_put(Dst, 6712); + dasm_put(Dst, 6919); } else { - dasm_put(Dst, 6727); + dasm_put(Dst, 6936); } - dasm_put(Dst, 2221, LJ_TISNUM); + dasm_put(Dst, 6949, 1+1); + if (sse) { + dasm_put(Dst, 6732); + } else { + dasm_put(Dst, 6747); + } + dasm_put(Dst, 2241, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 6736); + dasm_put(Dst, 6756); } else { - dasm_put(Dst, 2244); + dasm_put(Dst, 2264); } if (sse) { - dasm_put(Dst, 6753); + dasm_put(Dst, 6773); } else { - dasm_put(Dst, 6768); + dasm_put(Dst, 6788); } - dasm_put(Dst, 6781, LJ_TISNUM); + dasm_put(Dst, 6801, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 6947); - } else { - dasm_put(Dst, 6826); - } - if (sse) { dasm_put(Dst, 6967); } else { - dasm_put(Dst, 6984); - } - dasm_put(Dst, 6997, 1+1, LJ_TISNUM); - if (LJ_DUALNUM) { - dasm_put(Dst, 6736); - } else { - dasm_put(Dst, 2244); + dasm_put(Dst, 6846); } if (sse) { - dasm_put(Dst, 6645); + dasm_put(Dst, 6987); } else { - dasm_put(Dst, 7020); + dasm_put(Dst, 7004); } - dasm_put(Dst, 7041, 1+1, LJ_TISNUM); + dasm_put(Dst, 7017, 1+1, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 6736); + dasm_put(Dst, 6756); } else { - dasm_put(Dst, 2244); + dasm_put(Dst, 2264); } if (sse) { - dasm_put(Dst, 6645); + dasm_put(Dst, 6665); } else { - dasm_put(Dst, 7020); + dasm_put(Dst, 7040); } - dasm_put(Dst, 7065); + dasm_put(Dst, 7061, 1+1, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 6696); + dasm_put(Dst, 6756); + } else { + dasm_put(Dst, 2264); + } + if (sse) { + dasm_put(Dst, 6665); + } else { + dasm_put(Dst, 7040); + } + dasm_put(Dst, 7085); + if (LJ_DUALNUM) { + dasm_put(Dst, 6716); } else if (sse) { - dasm_put(Dst, 7071); + dasm_put(Dst, 7091); } else { - dasm_put(Dst, 7083); + dasm_put(Dst, 7103); } - dasm_put(Dst, 7096); + dasm_put(Dst, 7116); if (LJ_DUALNUM) { - dasm_put(Dst, 7107, 1+1, LJ_TISNUM); + dasm_put(Dst, 7127, 1+1, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 6736); + dasm_put(Dst, 6756); } else { - dasm_put(Dst, 2244); + dasm_put(Dst, 2264); } if (sse) { - dasm_put(Dst, 6645); + dasm_put(Dst, 6665); } else { - dasm_put(Dst, 7020); + dasm_put(Dst, 7040); } - dasm_put(Dst, 7123, LJ_TISNUM); + dasm_put(Dst, 7143, LJ_TISNUM); } else if (sse) { - dasm_put(Dst, 7138, 2+1, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 7158, 2+1, LJ_TISNUM, LJ_TISNUM); } else { - dasm_put(Dst, 7210, 2+1, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 7230, 2+1, LJ_TISNUM, LJ_TISNUM); } - dasm_put(Dst, 7274); + dasm_put(Dst, 7294); if (LJ_DUALNUM) { - dasm_put(Dst, 7281, 1+1, LJ_TISNUM); + dasm_put(Dst, 7301, 1+1, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 6736); + dasm_put(Dst, 6756); } else { - dasm_put(Dst, 2244); + dasm_put(Dst, 2264); } if (sse) { - dasm_put(Dst, 6645); + dasm_put(Dst, 6665); } else { - dasm_put(Dst, 7020); + dasm_put(Dst, 7040); } - dasm_put(Dst, 7123, LJ_TISNUM); + dasm_put(Dst, 7143, LJ_TISNUM); } else if (sse) { - dasm_put(Dst, 7297, 2+1, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 7317, 2+1, LJ_TISNUM, LJ_TISNUM); } else { - dasm_put(Dst, 7369, 2+1, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 7389, 2+1, LJ_TISNUM, LJ_TISNUM); } - dasm_put(Dst, 7433); + dasm_put(Dst, 7453); if (LJ_DUALNUM) { - dasm_put(Dst, 7441, 1+1, LJ_TISNUM); + dasm_put(Dst, 7461, 1+1, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 6736); + dasm_put(Dst, 6756); } else { - dasm_put(Dst, 2244); + dasm_put(Dst, 2264); } if (sse) { - dasm_put(Dst, 6645); + dasm_put(Dst, 6665); } else { - dasm_put(Dst, 7020); + dasm_put(Dst, 7040); } - dasm_put(Dst, 7123, LJ_TISNUM); + dasm_put(Dst, 7143, LJ_TISNUM); } else if (sse) { - dasm_put(Dst, 7457, 2+1, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 7477, 2+1, LJ_TISNUM, LJ_TISNUM); } else { - dasm_put(Dst, 7529, 2+1, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 7549, 2+1, LJ_TISNUM, LJ_TISNUM); } - dasm_put(Dst, 7593); + dasm_put(Dst, 7613); if (LJ_DUALNUM) { - dasm_put(Dst, 7601, 1+1, LJ_TISNUM); + dasm_put(Dst, 7621, 1+1, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 6736); + dasm_put(Dst, 6756); } else { - dasm_put(Dst, 2244); + dasm_put(Dst, 2264); } if (sse) { - dasm_put(Dst, 6645); + dasm_put(Dst, 6665); } else { - dasm_put(Dst, 7020); + dasm_put(Dst, 7040); } - dasm_put(Dst, 7123, LJ_TISNUM); + dasm_put(Dst, 7143, LJ_TISNUM); } else if (sse) { - dasm_put(Dst, 7617, 2+1, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 7637, 2+1, LJ_TISNUM, LJ_TISNUM); } else { - dasm_put(Dst, 7689, 2+1, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 7709, 2+1, LJ_TISNUM, LJ_TISNUM); } - dasm_put(Dst, 7753); + dasm_put(Dst, 7773); if (LJ_DUALNUM) { - dasm_put(Dst, 7760, 1+1, LJ_TISNUM); + dasm_put(Dst, 7780, 1+1, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 6736); + dasm_put(Dst, 6756); } else { - dasm_put(Dst, 2244); + dasm_put(Dst, 2264); } if (sse) { - dasm_put(Dst, 6645); + dasm_put(Dst, 6665); } else { - dasm_put(Dst, 7020); + dasm_put(Dst, 7040); } - dasm_put(Dst, 7123, LJ_TISNUM); + dasm_put(Dst, 7143, LJ_TISNUM); } else if (sse) { - dasm_put(Dst, 7776, 2+1, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 7796, 2+1, LJ_TISNUM, LJ_TISNUM); } else { - dasm_put(Dst, 7848, 2+1, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 7868, 2+1, LJ_TISNUM, LJ_TISNUM); } - dasm_put(Dst, 7912, 1+2, 1+1, Dt1(->base), 8*LUA_MINSTACK, Dt1(->top), Dt1(->maxstack), Dt8(->f), Dt1(->base)); - dasm_put(Dst, 7988, Dt1(->top), Dt7(->pc), FRAME_TYPE, LUA_MINSTACK, Dt1(->base), Dt1(->base)); - dasm_put(Dst, 8112, Dt1(->top), Dt1(->base), Dt1(->top)); + dasm_put(Dst, 7932, 1+2, 1+1, Dt1(->base), 8*LUA_MINSTACK, Dt1(->top), Dt1(->maxstack), Dt8(->f), Dt1(->base)); + dasm_put(Dst, 8008, Dt1(->top), Dt7(->pc), FRAME_TYPE, LUA_MINSTACK, Dt1(->base), Dt1(->base)); + dasm_put(Dst, 8132, Dt1(->top), Dt1(->base), Dt1(->top)); #if LJ_HASJIT - dasm_put(Dst, 8150, DISPATCH_GL(hookmask), HOOK_VMEVENT, HOOK_ACTIVE, LUA_MASKLINE|LUA_MASKCOUNT, DISPATCH_GL(hookcount)); + dasm_put(Dst, 8170, DISPATCH_GL(hookmask), HOOK_VMEVENT, HOOK_ACTIVE, LUA_MASKLINE|LUA_MASKCOUNT, DISPATCH_GL(hookcount)); #endif - dasm_put(Dst, 8181, DISPATCH_GL(hookmask), HOOK_ACTIVE, DISPATCH_GL(hookmask), HOOK_ACTIVE, LUA_MASKLINE|LUA_MASKCOUNT, DISPATCH_GL(hookcount), LUA_MASKLINE); - dasm_put(Dst, 8232, Dt1(->base), Dt1(->base), GG_DISP2STATIC); + dasm_put(Dst, 8201, DISPATCH_GL(hookmask), HOOK_ACTIVE, DISPATCH_GL(hookmask), HOOK_ACTIVE, LUA_MASKLINE|LUA_MASKCOUNT, DISPATCH_GL(hookcount), LUA_MASKLINE); + dasm_put(Dst, 8252, Dt1(->base), Dt1(->base), GG_DISP2STATIC); #if LJ_HASJIT - dasm_put(Dst, 8298, Dt7(->pc), PC2PROTO(framesize), Dt1(->base), Dt1(->top), GG_DISP2J, DISPATCH_J(L)); + dasm_put(Dst, 8318, Dt7(->pc), PC2PROTO(framesize), Dt1(->base), Dt1(->top), GG_DISP2J, DISPATCH_J(L)); #endif - dasm_put(Dst, 8344); + dasm_put(Dst, 8364); #if LJ_HASJIT - dasm_put(Dst, 8176); + dasm_put(Dst, 8196); #endif - dasm_put(Dst, 8351); + dasm_put(Dst, 8371); #if LJ_HASJIT - dasm_put(Dst, 8354); + dasm_put(Dst, 8374); #endif - dasm_put(Dst, 8364, Dt1(->base), Dt1(->top)); + dasm_put(Dst, 8384, Dt1(->base), Dt1(->top)); #if LJ_HASJIT - dasm_put(Dst, 8398); + dasm_put(Dst, 8418); #endif - dasm_put(Dst, 8403, Dt1(->base), Dt1(->top)); + dasm_put(Dst, 8423, Dt1(->base), Dt1(->top)); #if LJ_HASJIT - dasm_put(Dst, 8432, DISPATCH_GL(vmstate), DISPATCH_GL(vmstate), ~LJ_VMST_EXIT, DISPATCH_J(exitno), DISPATCH_J(parent), 8*8+16, DISPATCH_GL(jit_L), DISPATCH_GL(jit_base), DISPATCH_J(L), DISPATCH_GL(jit_L), Dt1(->base), GG_DISP2J, Dt1(->cframe), CFRAME_RAWMASK, CFRAME_OFS_L, Dt1(->base), CFRAME_OFS_PC); + dasm_put(Dst, 8452, DISPATCH_GL(vmstate), DISPATCH_GL(vmstate), ~LJ_VMST_EXIT, DISPATCH_J(exitno), DISPATCH_J(parent), 8*8+16, DISPATCH_GL(jit_L), DISPATCH_GL(jit_base), DISPATCH_J(L), DISPATCH_GL(jit_L), Dt1(->base), GG_DISP2J, Dt1(->cframe), CFRAME_RAWMASK, CFRAME_OFS_L, Dt1(->base), CFRAME_OFS_PC); #endif - dasm_put(Dst, 8575); + dasm_put(Dst, 8595); #if LJ_HASJIT - dasm_put(Dst, 8578, Dt7(->pc), PC2PROTO(k), DISPATCH_GL(jit_L), DISPATCH_GL(vmstate), ~LJ_VMST_INTERP, BC_FUNCF); + dasm_put(Dst, 8598, Dt7(->pc), PC2PROTO(k), DISPATCH_GL(jit_L), DISPATCH_GL(vmstate), ~LJ_VMST_INTERP, BC_FUNCF); #endif - dasm_put(Dst, 8656); + dasm_put(Dst, 8676); if (!sse) { - dasm_put(Dst, 8659); + dasm_put(Dst, 8679); } - dasm_put(Dst, 8704); + dasm_put(Dst, 8724); if (!sse) { - dasm_put(Dst, 8806); + dasm_put(Dst, 8826); } - dasm_put(Dst, 8851); + dasm_put(Dst, 8871); if (!sse) { - dasm_put(Dst, 8953); + dasm_put(Dst, 8973); } - dasm_put(Dst, 8992); + dasm_put(Dst, 9012); if (sse) { - dasm_put(Dst, 9097); + dasm_put(Dst, 9117); } else { - dasm_put(Dst, 9227); + dasm_put(Dst, 9247); } - dasm_put(Dst, 9274); + dasm_put(Dst, 9294); if (!sse) { - dasm_put(Dst, 9348); + dasm_put(Dst, 9368); if (cmov) { - dasm_put(Dst, 9359); + dasm_put(Dst, 9379); } else { - dasm_put(Dst, 9363); + dasm_put(Dst, 9383); } - dasm_put(Dst, 9370); - dasm_put(Dst, 9444); - dasm_put(Dst, 9544); + dasm_put(Dst, 9390); + dasm_put(Dst, 9464); + dasm_put(Dst, 9564); if (cmov) { - dasm_put(Dst, 9547); + dasm_put(Dst, 9567); } else { - dasm_put(Dst, 9551); + dasm_put(Dst, 9571); } - dasm_put(Dst, 9558); + dasm_put(Dst, 9578); if (cmov) { - dasm_put(Dst, 9359); + dasm_put(Dst, 9379); } else { - dasm_put(Dst, 9363); + dasm_put(Dst, 9383); } - dasm_put(Dst, 9576); + dasm_put(Dst, 9596); } else { - dasm_put(Dst, 9655); + dasm_put(Dst, 9675); } - dasm_put(Dst, 9658); - dasm_put(Dst, 9743); - dasm_put(Dst, 9873); - dasm_put(Dst, 10079); + dasm_put(Dst, 9678); + dasm_put(Dst, 9763); + dasm_put(Dst, 9893); + dasm_put(Dst, 10099); #if LJ_HASJIT if (sse) { - dasm_put(Dst, 10086); - dasm_put(Dst, 10143); - dasm_put(Dst, 10234); + dasm_put(Dst, 10106); + dasm_put(Dst, 10163); + dasm_put(Dst, 10254); } else { - dasm_put(Dst, 10276); - dasm_put(Dst, 10368); + dasm_put(Dst, 10296); + dasm_put(Dst, 10388); } - dasm_put(Dst, 10414); + dasm_put(Dst, 10434); #endif - dasm_put(Dst, 10418); + dasm_put(Dst, 10438); if (sse) { - dasm_put(Dst, 10421); - dasm_put(Dst, 10526); - dasm_put(Dst, 10609); + dasm_put(Dst, 10441); + dasm_put(Dst, 10546); + dasm_put(Dst, 10629); } else { - dasm_put(Dst, 10681); - dasm_put(Dst, 10764); + dasm_put(Dst, 10701); + dasm_put(Dst, 10784); if (cmov) { - dasm_put(Dst, 10819); + dasm_put(Dst, 10839); } else { - dasm_put(Dst, 10838); + dasm_put(Dst, 10858); } - dasm_put(Dst, 10414); + dasm_put(Dst, 10434); } - dasm_put(Dst, 10879); + dasm_put(Dst, 10899); #if LJ_HASFFI #define DtE(_V) (int)(ptrdiff_t)&(((CCallState *)0)_V) - dasm_put(Dst, 10935, DtE(->spadj)); + dasm_put(Dst, 10955, DtE(->spadj)); #if LJ_TARGET_WINDOWS - dasm_put(Dst, 10945, DtE(->spadj)); + dasm_put(Dst, 10965, DtE(->spadj)); #endif - dasm_put(Dst, 10949, DtE(->nsp), offsetof(CCallState, stack), DtE(->gpr[0]), DtE(->gpr[1]), DtE(->func), DtE(->gpr[0]), DtE(->gpr[1]), DtE(->resx87), DtE(->fpr[0].d[0])); - dasm_put(Dst, 11019, DtE(->fpr[0].f[0])); + dasm_put(Dst, 10969, DtE(->nsp), offsetof(CCallState, stack), DtE(->gpr[0]), DtE(->gpr[1]), DtE(->func), DtE(->gpr[0]), DtE(->gpr[1]), DtE(->resx87), DtE(->fpr[0].d[0])); + dasm_put(Dst, 11039, DtE(->fpr[0].f[0])); #if LJ_TARGET_WINDOWS - dasm_put(Dst, 11025, DtE(->spadj)); + dasm_put(Dst, 11045, DtE(->spadj)); #endif - dasm_put(Dst, 11029); + dasm_put(Dst, 11049); #endif - dasm_put(Dst, 11036); + dasm_put(Dst, 11056); #ifdef LUA_USE_ASSERT - dasm_put(Dst, 10416); + dasm_put(Dst, 10436); #endif - dasm_put(Dst, 10416); + dasm_put(Dst, 10436); } /* 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, 11039, defop); + dasm_put(Dst, 11059, defop); switch (op) { @@ -1998,297 +2007,304 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) case BC_ISLT: case BC_ISGE: case BC_ISLE: case BC_ISGT: if (LJ_DUALNUM) { - dasm_put(Dst, 11041, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 11061, LJ_TISNUM, LJ_TISNUM); switch (op) { case BC_ISLT: - dasm_put(Dst, 11071); + dasm_put(Dst, 11091); break; case BC_ISGE: - dasm_put(Dst, 11076); + dasm_put(Dst, 11096); break; case BC_ISLE: - dasm_put(Dst, 11081); + dasm_put(Dst, 11101); break; case BC_ISGT: - dasm_put(Dst, 11086); + dasm_put(Dst, 11106); break; default: break; /* Shut up GCC. */ } - dasm_put(Dst, 11091, -BCBIAS_J*4, LJ_TISNUM); + dasm_put(Dst, 11111, -BCBIAS_J*4, LJ_TISNUM); if (sse) { - dasm_put(Dst, 11144); + dasm_put(Dst, 11164); } else { - dasm_put(Dst, 11155); + dasm_put(Dst, 11175); } - dasm_put(Dst, 11166); + dasm_put(Dst, 11186); if (sse) { - dasm_put(Dst, 11173); + dasm_put(Dst, 11193); switch (op) { case BC_ISLT: - dasm_put(Dst, 11193); + dasm_put(Dst, 11213); break; case BC_ISGE: - dasm_put(Dst, 11198); + dasm_put(Dst, 11218); break; case BC_ISLE: - dasm_put(Dst, 11203); + dasm_put(Dst, 11223); break; case BC_ISGT: - dasm_put(Dst, 11208); + dasm_put(Dst, 11228); break; default: break; /* Shut up GCC. */ } - dasm_put(Dst, 11213); + dasm_put(Dst, 11233); } else { - dasm_put(Dst, 11218); + dasm_put(Dst, 11238); } } else { - dasm_put(Dst, 11226, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 11246, LJ_TISNUM, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 11247); + dasm_put(Dst, 11267); } else { - dasm_put(Dst, 11268); + dasm_put(Dst, 11288); if (cmov) { - dasm_put(Dst, 3924); + dasm_put(Dst, 3944); } else { - dasm_put(Dst, 3930); + dasm_put(Dst, 3950); } } if (LJ_DUALNUM) { switch (op) { case BC_ISLT: - dasm_put(Dst, 11193); + dasm_put(Dst, 11213); break; case BC_ISGE: - dasm_put(Dst, 11198); + dasm_put(Dst, 11218); break; case BC_ISLE: - dasm_put(Dst, 11203); + dasm_put(Dst, 11223); break; case BC_ISGT: - dasm_put(Dst, 11208); + dasm_put(Dst, 11228); break; default: break; /* Shut up GCC. */ } - dasm_put(Dst, 11213); + dasm_put(Dst, 11233); } else { switch (op) { case BC_ISLT: - dasm_put(Dst, 11284); + dasm_put(Dst, 11304); break; case BC_ISGE: - dasm_put(Dst, 11289); + dasm_put(Dst, 11309); break; case BC_ISLE: - dasm_put(Dst, 11294); + dasm_put(Dst, 11314); break; case BC_ISGT: - dasm_put(Dst, 11299); + dasm_put(Dst, 11319); break; default: break; /* Shut up GCC. */ } - dasm_put(Dst, 11304, -BCBIAS_J*4); + dasm_put(Dst, 11324, -BCBIAS_J*4); } break; case BC_ISEQV: case BC_ISNEV: vk = op == BC_ISEQV; - dasm_put(Dst, 11335); + dasm_put(Dst, 11355); if (LJ_DUALNUM) { - dasm_put(Dst, 11343, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 11363, LJ_TISNUM, LJ_TISNUM); if (vk) { - dasm_put(Dst, 11368); + dasm_put(Dst, 11388); } else { - dasm_put(Dst, 11373); + dasm_put(Dst, 11393); } - dasm_put(Dst, 11378, -BCBIAS_J*4, LJ_TISNUM); + dasm_put(Dst, 11398, -BCBIAS_J*4, LJ_TISNUM); if (sse) { - dasm_put(Dst, 11429); + dasm_put(Dst, 11449); } else { - dasm_put(Dst, 11436); + dasm_put(Dst, 11456); } - dasm_put(Dst, 11440); + dasm_put(Dst, 11460); if (sse) { - dasm_put(Dst, 11451); + dasm_put(Dst, 11471); } else { - dasm_put(Dst, 11463); + dasm_put(Dst, 11483); } - dasm_put(Dst, 11470); + dasm_put(Dst, 11490); } else { - dasm_put(Dst, 11475, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 11495, LJ_TISNUM, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 11494); + dasm_put(Dst, 11514); } else { - dasm_put(Dst, 11512); + dasm_put(Dst, 11532); if (cmov) { - dasm_put(Dst, 3924); + dasm_put(Dst, 3944); } else { - dasm_put(Dst, 3930); + dasm_put(Dst, 3950); } } iseqne_fp: if (vk) { - dasm_put(Dst, 11525); + dasm_put(Dst, 11545); } else { - dasm_put(Dst, 11534); + dasm_put(Dst, 11554); } iseqne_end: if (vk) { - dasm_put(Dst, 11543, -BCBIAS_J*4); + dasm_put(Dst, 11563, -BCBIAS_J*4); if (!LJ_HASFFI) { - dasm_put(Dst, 4824); + dasm_put(Dst, 4844); } } else { if (!LJ_HASFFI) { - dasm_put(Dst, 4824); + dasm_put(Dst, 4844); } - dasm_put(Dst, 11558, -BCBIAS_J*4); + dasm_put(Dst, 11578, -BCBIAS_J*4); } if (LJ_DUALNUM && (op == BC_ISEQV || op == BC_ISNEV || op == BC_ISEQN || op == BC_ISNEN)) { - dasm_put(Dst, 11573); + dasm_put(Dst, 11593); } else { - dasm_put(Dst, 11316); + dasm_put(Dst, 11336); } if (op == BC_ISEQV || op == BC_ISNEV) { - dasm_put(Dst, 11578); + dasm_put(Dst, 11598); if (LJ_HASFFI) { - dasm_put(Dst, 11581, LJ_TCDATA, LJ_TCDATA); + dasm_put(Dst, 11601, LJ_TCDATA, LJ_TCDATA); } - dasm_put(Dst, 11600, LJ_TISPRI, LJ_TISTABUD, Dt6(->metatable), Dt6(->nomm), 1<metatable), Dt6(->nomm), 1<len), LJ_TISNUM); + dasm_put(Dst, 12226, Dt5(->len), LJ_TISNUM); } else if (sse) { - dasm_put(Dst, 12220, Dt5(->len)); + dasm_put(Dst, 12240, Dt5(->len)); } else { - dasm_put(Dst, 12238, Dt5(->len)); + dasm_put(Dst, 12258, Dt5(->len)); } - dasm_put(Dst, 12247, LJ_TTAB); + dasm_put(Dst, 12267, LJ_TTAB); +#ifdef LUAJIT_ENABLE_LUA52COMPAT + dasm_put(Dst, 12301, Dt6(->metatable)); +#endif + dasm_put(Dst, 12315); if (LJ_DUALNUM) { } else if (sse) { - dasm_put(Dst, 12287); + dasm_put(Dst, 12324); } else { - dasm_put(Dst, 12293); + dasm_put(Dst, 12330); } - dasm_put(Dst, 12300); + dasm_put(Dst, 12337); +#ifdef LUAJIT_ENABLE_LUA52COMPAT + dasm_put(Dst, 12350, Dt6(->nomm), 1<base), Dt1(->base)); + dasm_put(Dst, 13093, Dt1(->base), Dt1(->base)); break; /* -- Constant ops ------------------------------------------------------ */ case BC_KSTR: - dasm_put(Dst, 13134, LJ_TSTR); + dasm_put(Dst, 13187, LJ_TSTR); break; case BC_KCDATA: #if LJ_HASFFI - dasm_put(Dst, 13134, LJ_TCDATA); + dasm_put(Dst, 13187, LJ_TCDATA); #endif break; case BC_KSHORT: if (LJ_DUALNUM) { - dasm_put(Dst, 13167, LJ_TISNUM); + dasm_put(Dst, 13220, LJ_TISNUM); } else if (sse) { - dasm_put(Dst, 13179); + dasm_put(Dst, 13232); } else { - dasm_put(Dst, 13194); + dasm_put(Dst, 13247); } - dasm_put(Dst, 11316); + dasm_put(Dst, 11336); break; case BC_KNUM: if (sse) { - dasm_put(Dst, 13202); + dasm_put(Dst, 13255); } else { - dasm_put(Dst, 13215); + dasm_put(Dst, 13268); } - dasm_put(Dst, 11316); + dasm_put(Dst, 11336); break; case BC_KPRI: - dasm_put(Dst, 13222); + dasm_put(Dst, 13275); break; case BC_KNIL: - dasm_put(Dst, 13248, LJ_TNIL); + dasm_put(Dst, 13301, LJ_TNIL); break; /* -- Upvalue and function ops ------------------------------------------ */ case BC_UGET: - dasm_put(Dst, 13294, offsetof(GCfuncL, uvptr), DtA(->v)); + dasm_put(Dst, 13347, offsetof(GCfuncL, uvptr), DtA(->v)); break; case BC_USETV: #define TV2MARKOFS \ ((int32_t)offsetof(GCupval, marked)-(int32_t)offsetof(GCupval, tv)) - dasm_put(Dst, 13338, 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, 13428); + dasm_put(Dst, 13391, 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, 13481); break; #undef TV2MARKOFS case BC_USETS: - dasm_put(Dst, 13440, 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, 13493, 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, 13531); + dasm_put(Dst, 13584); if (sse) { - dasm_put(Dst, 13536); + dasm_put(Dst, 13589); } else { - dasm_put(Dst, 11826); + dasm_put(Dst, 11846); } - dasm_put(Dst, 13543, offsetof(GCfuncL, uvptr), DtA(->v)); + dasm_put(Dst, 13596, offsetof(GCfuncL, uvptr), DtA(->v)); if (sse) { - dasm_put(Dst, 13552); + dasm_put(Dst, 13605); } else { - dasm_put(Dst, 13558); + dasm_put(Dst, 13611); } - dasm_put(Dst, 11316); + dasm_put(Dst, 11336); break; case BC_USETP: - dasm_put(Dst, 13561, offsetof(GCfuncL, uvptr), DtA(->v)); + dasm_put(Dst, 13614, offsetof(GCfuncL, uvptr), DtA(->v)); break; case BC_UCLO: - dasm_put(Dst, 13598, -BCBIAS_J*4, Dt1(->openupval), Dt1(->base), Dt1(->base)); + dasm_put(Dst, 13651, -BCBIAS_J*4, Dt1(->openupval), Dt1(->base), Dt1(->base)); break; case BC_FNEW: - dasm_put(Dst, 13652, Dt1(->base), Dt1(->base), LJ_TFUNC); + dasm_put(Dst, 13705, Dt1(->base), Dt1(->base), LJ_TFUNC); break; /* -- Table ops --------------------------------------------------------- */ case BC_TNEW: - dasm_put(Dst, 13723, Dt1(->base), DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), LJ_TTAB); + dasm_put(Dst, 13776, Dt1(->base), DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), LJ_TTAB); break; case BC_TDUP: - dasm_put(Dst, 13849, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), Dt1(->base), LJ_TTAB); + dasm_put(Dst, 13902, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), Dt1(->base), LJ_TTAB); break; case BC_GGET: - dasm_put(Dst, 13941, Dt7(->env)); + dasm_put(Dst, 13994, Dt7(->env)); break; case BC_GSET: - dasm_put(Dst, 13959, Dt7(->env)); + dasm_put(Dst, 14012, Dt7(->env)); break; case BC_TGETV: - dasm_put(Dst, 13977, LJ_TTAB); + dasm_put(Dst, 14030, LJ_TTAB); if (LJ_DUALNUM) { - dasm_put(Dst, 14000, LJ_TISNUM); + dasm_put(Dst, 14053, LJ_TISNUM); } else { - dasm_put(Dst, 14014, LJ_TISNUM); + dasm_put(Dst, 14067, LJ_TISNUM); if (sse) { - dasm_put(Dst, 14025); + dasm_put(Dst, 14078); } else { - dasm_put(Dst, 14046); + dasm_put(Dst, 14099); if (cmov) { - dasm_put(Dst, 3924); + dasm_put(Dst, 3944); } else { - dasm_put(Dst, 3930); + dasm_put(Dst, 3950); } - dasm_put(Dst, 2660); + dasm_put(Dst, 2680); } - dasm_put(Dst, 14056); + dasm_put(Dst, 14109); } - dasm_put(Dst, 14061, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<asize), Dt6(->array), LJ_TNIL, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<hmask), Dt5(->hash), sizeof(Node), Dt6(->node), DtB(->key.it), LJ_TSTR, DtB(->key.gcr), LJ_TNIL); - dasm_put(Dst, 14262, LJ_TNIL, DtB(->next), Dt6(->metatable), Dt6(->nomm), 1<hmask), Dt5(->hash), sizeof(Node), Dt6(->node), DtB(->key.it), LJ_TSTR, DtB(->key.gcr), LJ_TNIL); + dasm_put(Dst, 14315, LJ_TNIL, DtB(->next), Dt6(->metatable), Dt6(->nomm), 1<asize), Dt6(->array), LJ_TNIL, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<asize), Dt6(->array), LJ_TNIL, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<asize), Dt6(->array), LJ_TNIL, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<marked), (uint8_t)~LJ_GC_BLACK, DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); + dasm_put(Dst, 14529, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<marked), (uint8_t)~LJ_GC_BLACK, DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); break; case BC_TSETS: - dasm_put(Dst, 14617, 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, 14692, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<next)); - dasm_put(Dst, 14784, Dt6(->metatable), Dt6(->nomm), 1<base), Dt1(->base), Dt6(->marked), (uint8_t)~LJ_GC_BLACK, DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); + dasm_put(Dst, 14670, 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, 14745, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<next)); + dasm_put(Dst, 14837, Dt6(->metatable), Dt6(->nomm), 1<base), Dt1(->base), Dt6(->marked), (uint8_t)~LJ_GC_BLACK, DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); break; case BC_TSETB: - dasm_put(Dst, 14880, LJ_TTAB, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable)); - dasm_put(Dst, 14978, Dt6(->metatable), Dt6(->nomm), 1<marked), (uint8_t)~LJ_GC_BLACK, DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); + dasm_put(Dst, 14933, LJ_TTAB, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable)); + dasm_put(Dst, 15031, Dt6(->metatable), Dt6(->nomm), 1<marked), (uint8_t)~LJ_GC_BLACK, DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); break; case BC_TSETM: - dasm_put(Dst, 15024, Dt6(->marked), LJ_GC_BLACK, Dt6(->asize), Dt6(->array), Dt1(->base), Dt1(->base)); - dasm_put(Dst, 15173, Dt6(->marked), (uint8_t)~LJ_GC_BLACK, DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); + dasm_put(Dst, 15077, Dt6(->marked), LJ_GC_BLACK, Dt6(->asize), Dt6(->array), Dt1(->base), Dt1(->base)); + dasm_put(Dst, 15226, Dt6(->marked), (uint8_t)~LJ_GC_BLACK, DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); break; /* -- Calls and vararg handling ----------------------------------------- */ case BC_CALL: case BC_CALLM: - dasm_put(Dst, 12317); + dasm_put(Dst, 12370); if (op == BC_CALLM) { - dasm_put(Dst, 15191); + dasm_put(Dst, 15244); } - dasm_put(Dst, 15196, LJ_TFUNC, Dt7(->pc)); + dasm_put(Dst, 15249, LJ_TFUNC, Dt7(->pc)); break; case BC_CALLMT: - dasm_put(Dst, 15191); + dasm_put(Dst, 15244); break; case BC_CALLT: - dasm_put(Dst, 15237, LJ_TFUNC, FRAME_TYPE, Dt7(->ffid), Dt7(->pc)); - dasm_put(Dst, 15355, FRAME_TYPE, Dt7(->pc), PC2PROTO(k), FRAME_VARG, FRAME_TYPEP, FRAME_VARG); + dasm_put(Dst, 15290, LJ_TFUNC, FRAME_TYPE, Dt7(->ffid), Dt7(->pc)); + dasm_put(Dst, 15408, FRAME_TYPE, Dt7(->pc), PC2PROTO(k), FRAME_VARG, FRAME_TYPEP, FRAME_VARG); break; case BC_ITERC: - dasm_put(Dst, 15425, LJ_TFUNC, 2+1, Dt7(->pc)); + dasm_put(Dst, 15478, LJ_TFUNC, 2+1, Dt7(->pc)); break; case BC_ITERN: #if LJ_HASJIT #endif - dasm_put(Dst, 15505, Dt6(->asize), Dt6(->array), LJ_TNIL); + dasm_put(Dst, 15558, Dt6(->asize), Dt6(->array), LJ_TNIL); if (LJ_DUALNUM) { - dasm_put(Dst, 12211, LJ_TISNUM); + dasm_put(Dst, 12231, LJ_TISNUM); } else if (sse) { - dasm_put(Dst, 12287); + dasm_put(Dst, 12324); } else { - dasm_put(Dst, 15551); + dasm_put(Dst, 15604); } - dasm_put(Dst, 15557); + dasm_put(Dst, 15610); if (LJ_DUALNUM) { } else if (sse) { - dasm_put(Dst, 12176); + dasm_put(Dst, 12196); } else { - dasm_put(Dst, 12188); + dasm_put(Dst, 12208); } - dasm_put(Dst, 15576, -BCBIAS_J*4); + dasm_put(Dst, 15629, -BCBIAS_J*4); if (!LJ_DUALNUM && !sse) { - dasm_put(Dst, 15627); + dasm_put(Dst, 15680); } - dasm_put(Dst, 15633, Dt6(->hmask), sizeof(Node), Dt6(->node), DtB(->val.it), LJ_TNIL, DtB(->key.gcr), DtB(->key.it), DtB(->val.gcr), DtB(->val.it)); - dasm_put(Dst, 15708); + dasm_put(Dst, 15686, Dt6(->hmask), sizeof(Node), Dt6(->node), DtB(->val.it), LJ_TNIL, DtB(->key.gcr), DtB(->key.it), DtB(->val.gcr), DtB(->val.it)); + dasm_put(Dst, 15761); break; case BC_ISNEXT: - dasm_put(Dst, 15716, LJ_TFUNC, LJ_TTAB, LJ_TNIL, Dt8(->ffid), FF_next_N, -BCBIAS_J*4, BC_JMP, -BCBIAS_J*4, BC_ITERC); + dasm_put(Dst, 15769, LJ_TFUNC, LJ_TTAB, LJ_TNIL, Dt8(->ffid), FF_next_N, -BCBIAS_J*4, BC_JMP, -BCBIAS_J*4, BC_ITERC); break; case BC_VARG: - dasm_put(Dst, 15815, (8+FRAME_VARG), LJ_TNIL, Dt1(->maxstack)); - dasm_put(Dst, 15979, Dt1(->base), Dt1(->top), Dt1(->base), Dt1(->top)); + dasm_put(Dst, 15868, (8+FRAME_VARG), LJ_TNIL, Dt1(->maxstack)); + dasm_put(Dst, 16032, Dt1(->base), Dt1(->top), Dt1(->base), Dt1(->top)); break; /* -- Returns ----------------------------------------------------------- */ case BC_RETM: - dasm_put(Dst, 15191); + dasm_put(Dst, 15244); break; case BC_RET: case BC_RET0: case BC_RET1: if (op != BC_RET0) { - dasm_put(Dst, 16050); + dasm_put(Dst, 16103); } - dasm_put(Dst, 16054, FRAME_TYPE); + dasm_put(Dst, 16107, FRAME_TYPE); switch (op) { case BC_RET: - dasm_put(Dst, 16073); + dasm_put(Dst, 16126); break; case BC_RET1: - dasm_put(Dst, 16131); + dasm_put(Dst, 16184); /* fallthrough */ case BC_RET0: - dasm_put(Dst, 16147); + dasm_put(Dst, 16200); default: break; } - dasm_put(Dst, 16158, Dt7(->pc), PC2PROTO(k)); + dasm_put(Dst, 16211, Dt7(->pc), PC2PROTO(k)); if (op == BC_RET) { - dasm_put(Dst, 16200, LJ_TNIL); + dasm_put(Dst, 16253, LJ_TNIL); } else { - dasm_put(Dst, 16209, LJ_TNIL); + dasm_put(Dst, 16262, LJ_TNIL); } - dasm_put(Dst, 16216, -FRAME_VARG, FRAME_TYPEP); + dasm_put(Dst, 16269, -FRAME_VARG, FRAME_TYPEP); if (op != BC_RET0) { - dasm_put(Dst, 16240); + dasm_put(Dst, 16293); } - dasm_put(Dst, 4908); + dasm_put(Dst, 4928); break; /* -- Loops and branches ------------------------------------------------ */ @@ -2917,7 +2933,7 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) case BC_FORL: #if LJ_HASJIT - dasm_put(Dst, 16244, HOTCOUNT_PCMASK, GG_DISP2HOT); + dasm_put(Dst, 16297, HOTCOUNT_PCMASK, GG_DISP2HOT); #endif break; @@ -2929,111 +2945,111 @@ 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, 16265); + dasm_put(Dst, 16318); if (LJ_DUALNUM) { - dasm_put(Dst, 16269, LJ_TISNUM); + dasm_put(Dst, 16322, LJ_TISNUM); if (!vk) { - dasm_put(Dst, 16279, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 16332, LJ_TISNUM, LJ_TISNUM); } else { #ifdef LUA_USE_ASSERT - dasm_put(Dst, 16308, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 16361, LJ_TISNUM, LJ_TISNUM); #endif - dasm_put(Dst, 16327); + dasm_put(Dst, 16380); } - dasm_put(Dst, 16346, LJ_TISNUM); + dasm_put(Dst, 16399, LJ_TISNUM); if (op == BC_FORI) { - dasm_put(Dst, 16357, -BCBIAS_J*4); + dasm_put(Dst, 16410, -BCBIAS_J*4); } else if (op == BC_JFORI) { - dasm_put(Dst, 16371, -BCBIAS_J*4, BC_JLOOP); + dasm_put(Dst, 16424, -BCBIAS_J*4, BC_JLOOP); } else if (op == BC_IFORL) { - dasm_put(Dst, 16389, -BCBIAS_J*4); + dasm_put(Dst, 16442, -BCBIAS_J*4); } else { - dasm_put(Dst, 16381, BC_JLOOP); + dasm_put(Dst, 16434, BC_JLOOP); } - dasm_put(Dst, 16403); + dasm_put(Dst, 16456); if (vk) { - dasm_put(Dst, 16426); + dasm_put(Dst, 16479); } - dasm_put(Dst, 16346, LJ_TISNUM); + dasm_put(Dst, 16399, LJ_TISNUM); if (op == BC_FORI) { - dasm_put(Dst, 16435); + dasm_put(Dst, 16488); } else if (op == BC_JFORI) { - dasm_put(Dst, 16440, -BCBIAS_J*4, BC_JLOOP); + dasm_put(Dst, 16493, -BCBIAS_J*4, BC_JLOOP); } else if (op == BC_IFORL) { - dasm_put(Dst, 16454); + dasm_put(Dst, 16507); } else { - dasm_put(Dst, 16450, BC_JLOOP); + dasm_put(Dst, 16503, BC_JLOOP); } - dasm_put(Dst, 16459); + dasm_put(Dst, 16512); } else if (!vk) { - dasm_put(Dst, 16466, LJ_TISNUM); + dasm_put(Dst, 16519, LJ_TISNUM); } if (!vk) { - dasm_put(Dst, 16472, LJ_TISNUM); + dasm_put(Dst, 16525, LJ_TISNUM); } else { #ifdef LUA_USE_ASSERT - dasm_put(Dst, 16486, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 16539, LJ_TISNUM, LJ_TISNUM); #endif } - dasm_put(Dst, 16505); + dasm_put(Dst, 16558); if (!vk) { - dasm_put(Dst, 16509, LJ_TISNUM); + dasm_put(Dst, 16562, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 16518); + dasm_put(Dst, 16571); if (vk) { - dasm_put(Dst, 16530); + dasm_put(Dst, 16583); } else { - dasm_put(Dst, 16549); + dasm_put(Dst, 16602); } - dasm_put(Dst, 16554); + dasm_put(Dst, 16607); } else { - dasm_put(Dst, 16567); + dasm_put(Dst, 16620); if (vk) { - dasm_put(Dst, 16573); + dasm_put(Dst, 16626); } else { - dasm_put(Dst, 16589); + dasm_put(Dst, 16642); } - dasm_put(Dst, 16597); + dasm_put(Dst, 16650); if (cmov) { - dasm_put(Dst, 3924); + dasm_put(Dst, 3944); } else { - dasm_put(Dst, 3930); + dasm_put(Dst, 3950); } if (!cmov) { - dasm_put(Dst, 16602); + dasm_put(Dst, 16655); } } if (op == BC_FORI) { if (LJ_DUALNUM) { - dasm_put(Dst, 16608); + dasm_put(Dst, 16661); } else { - dasm_put(Dst, 16613, -BCBIAS_J*4); + dasm_put(Dst, 16666, -BCBIAS_J*4); } } else if (op == BC_JFORI) { - dasm_put(Dst, 16623, -BCBIAS_J*4, BC_JLOOP); + dasm_put(Dst, 16676, -BCBIAS_J*4, BC_JLOOP); } else if (op == BC_IFORL) { if (LJ_DUALNUM) { - dasm_put(Dst, 16637); + dasm_put(Dst, 16690); } else { - dasm_put(Dst, 16642, -BCBIAS_J*4); + dasm_put(Dst, 16695, -BCBIAS_J*4); } } else { - dasm_put(Dst, 16633, BC_JLOOP); + dasm_put(Dst, 16686, BC_JLOOP); } if (LJ_DUALNUM) { - dasm_put(Dst, 11213); + dasm_put(Dst, 11233); } else { - dasm_put(Dst, 11954); + dasm_put(Dst, 11974); } if (sse) { - dasm_put(Dst, 16652); + dasm_put(Dst, 16705); } break; case BC_ITERL: #if LJ_HASJIT - dasm_put(Dst, 16244, HOTCOUNT_PCMASK, GG_DISP2HOT); + dasm_put(Dst, 16297, HOTCOUNT_PCMASK, GG_DISP2HOT); #endif break; @@ -3042,33 +3058,33 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) break; #endif case BC_IITERL: - dasm_put(Dst, 16663, LJ_TNIL); + dasm_put(Dst, 16716, LJ_TNIL); if (op == BC_JITERL) { - dasm_put(Dst, 16678, BC_JLOOP); + dasm_put(Dst, 16731, BC_JLOOP); } else { - dasm_put(Dst, 16692, -BCBIAS_J*4); + dasm_put(Dst, 16745, -BCBIAS_J*4); } - dasm_put(Dst, 11314); + dasm_put(Dst, 11334); break; case BC_LOOP: #if LJ_HASJIT - dasm_put(Dst, 16244, HOTCOUNT_PCMASK, GG_DISP2HOT); + dasm_put(Dst, 16297, HOTCOUNT_PCMASK, GG_DISP2HOT); #endif break; case BC_ILOOP: - dasm_put(Dst, 11316); + dasm_put(Dst, 11336); break; case BC_JLOOP: #if LJ_HASJIT - dasm_put(Dst, 16708, DISPATCH_J(trace), DtD(->mcode), DISPATCH_GL(jit_base), DISPATCH_GL(jit_L)); + dasm_put(Dst, 16761, DISPATCH_J(trace), DtD(->mcode), DISPATCH_GL(jit_base), DISPATCH_GL(jit_L)); #endif break; case BC_JMP: - dasm_put(Dst, 16731, -BCBIAS_J*4); + dasm_put(Dst, 16784, -BCBIAS_J*4); break; /* -- Function headers -------------------------------------------------- */ @@ -3082,7 +3098,7 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) case BC_FUNCF: #if LJ_HASJIT - dasm_put(Dst, 16755, HOTCOUNT_PCMASK, GG_DISP2HOT); + dasm_put(Dst, 16808, HOTCOUNT_PCMASK, GG_DISP2HOT); #endif case BC_FUNCV: /* NYI: compiled vararg functions. */ break; @@ -3092,47 +3108,47 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) break; #endif case BC_IFUNCF: - dasm_put(Dst, 16776, -4+PC2PROTO(k), Dt1(->maxstack), -4+PC2PROTO(numparams)); + dasm_put(Dst, 16829, -4+PC2PROTO(k), Dt1(->maxstack), -4+PC2PROTO(numparams)); if (op == BC_JFUNCF) { - dasm_put(Dst, 16806, BC_JLOOP); + dasm_put(Dst, 16859, BC_JLOOP); } else { - dasm_put(Dst, 11316); + dasm_put(Dst, 11336); } - dasm_put(Dst, 16815, LJ_TNIL); + dasm_put(Dst, 16868, LJ_TNIL); break; case BC_JFUNCV: #if !LJ_HASJIT break; #endif - dasm_put(Dst, 10416); + dasm_put(Dst, 10436); break; /* NYI: compiled vararg functions. */ case BC_IFUNCV: - dasm_put(Dst, 16837, FRAME_VARG, Dt1(->maxstack), -4+PC2PROTO(numparams), LJ_TNIL); + dasm_put(Dst, 16890, FRAME_VARG, Dt1(->maxstack), -4+PC2PROTO(numparams), LJ_TNIL); if (op == BC_JFUNCV) { - dasm_put(Dst, 16806, BC_JLOOP); + dasm_put(Dst, 16859, BC_JLOOP); } else { - dasm_put(Dst, 16928, -4+PC2PROTO(k)); + dasm_put(Dst, 16981, -4+PC2PROTO(k)); } - dasm_put(Dst, 16950, LJ_TNIL); + dasm_put(Dst, 17003, LJ_TNIL); break; case BC_FUNCC: case BC_FUNCCW: - dasm_put(Dst, 16972, Dt8(->f), Dt1(->base), 8*LUA_MINSTACK, Dt1(->maxstack), Dt1(->top)); + dasm_put(Dst, 17025, Dt8(->f), Dt1(->base), 8*LUA_MINSTACK, Dt1(->maxstack), Dt1(->top)); if (op == BC_FUNCC) { - dasm_put(Dst, 17001); + dasm_put(Dst, 17054); } else { - dasm_put(Dst, 17005); + dasm_put(Dst, 17058); } - dasm_put(Dst, 17013, DISPATCH_GL(vmstate), ~LJ_VMST_C); + dasm_put(Dst, 17066, DISPATCH_GL(vmstate), ~LJ_VMST_C); if (op == BC_FUNCC) { - dasm_put(Dst, 17022); + dasm_put(Dst, 17075); } else { - dasm_put(Dst, 17026, DISPATCH_GL(wrapf)); + dasm_put(Dst, 17079, DISPATCH_GL(wrapf)); } - dasm_put(Dst, 17031, DISPATCH_GL(vmstate), ~LJ_VMST_INTERP, Dt1(->base), Dt1(->top)); + dasm_put(Dst, 17084, DISPATCH_GL(vmstate), ~LJ_VMST_INTERP, Dt1(->base), Dt1(->top)); break; /* ---------------------------------------------------------------------- */ @@ -3160,7 +3176,7 @@ static int build_backend(BuildCtx *ctx) build_subroutines(ctx, cmov, sse); - dasm_put(Dst, 17056); + dasm_put(Dst, 17109); for (op = 0; op < BC__MAX; op++) build_ins(ctx, (BCOp)op, op, cmov, sse); diff --git a/src/lj_meta.c b/src/lj_meta.c index fcb9df66..278d2d34 100644 --- a/src/lj_meta.c +++ b/src/lj_meta.c @@ -309,10 +309,19 @@ TValue * LJ_FASTCALL lj_meta_len(lua_State *L, cTValue *o) { cTValue *mo = lj_meta_lookup(L, o, MM_len); if (tvisnil(mo)) { - lj_err_optype(L, o, LJ_ERR_OPLEN); - return NULL; /* unreachable */ +#ifdef LUAJIT_ENABLE_LUA52COMPAT + if (tvistab(o)) + tabref(tabV(o)->metatable)->nomm |= (uint8_t)(1u<tab and ix->tabv. */ @@ -830,7 +830,7 @@ static TRef rec_mm_arith(jit_State *J, RecordIndex *ix, MMS mm) copyTV(J->L, basev+1, &ix->tabv); copyTV(J->L, basev+2, &ix->keyv); if (!lj_record_mm_lookup(J, ix, mm)) { /* Lookup mm on 1st operand. */ - if (mm != MM_len) { + if (mm != MM_unm) { ix->tab = ix->key; copyTV(J->L, &ix->tabv, &ix->keyv); if (lj_record_mm_lookup(J, ix, mm)) /* Lookup mm on 2nd operand. */ @@ -845,6 +845,34 @@ ok: return 0; /* No result yet. */ } +/* Record call to __len metamethod. */ +static TRef rec_mm_len(jit_State *J, TRef tr, TValue *tv) +{ + RecordIndex ix; + ix.tab = tr; + copyTV(J->L, &ix.tabv, tv); + if (lj_record_mm_lookup(J, &ix, MM_len)) { + BCReg func = rec_mm_prep(J, lj_cont_ra); + TRef *base = J->base + func; + TValue *basev = J->L->base + func; + base[0] = ix.mobj; copyTV(J->L, basev+0, &ix.mobjv); + base[1] = tr; copyTV(J->L, basev+1, tv); +#ifdef LUAJIT_ENABLE_LUA52COMPAT + base[2] = tr; copyTV(J->L, basev+2, tv); +#else + base[2] = TREF_NIL; setnilV(basev+2); +#endif + lj_record_call(J, func, 2); + } else { +#ifdef LUAJIT_ENABLE_LUA52COMPAT + if (tref_istab(tr)) + return lj_ir_call(J, IRCALL_lj_tab_len, tr); +#endif + lj_trace_err(J, LJ_TRERR_NOMM); + } + return 0; /* No result yet. */ +} + /* Call a comparison metamethod. */ static void rec_mm_callcomp(jit_State *J, RecordIndex *ix, int op) { @@ -1667,17 +1695,14 @@ void lj_record_ins(jit_State *J) break; case BC_LEN: - if (tref_isstr(rc)) { + if (tref_isstr(rc)) rc = emitir(IRTI(IR_FLOAD), rc, IRFL_STR_LEN); - } else if (tref_istab(rc)) { +#ifndef LUAJIT_ENABLE_LUA52COMPAT + else if (tref_istab(rc)) rc = lj_ir_call(J, IRCALL_lj_tab_len, rc); - } else { - ix.tab = rc; - copyTV(J->L, &ix.tabv, rcv); - ix.key = TREF_NIL; - setnilV(&ix.keyv); - rc = rec_mm_arith(J, &ix, MM_len); - } +#endif + else + rc = rec_mm_len(J, rc, rcv); break; /* -- Arithmetic ops ---------------------------------------------------- */