From aca1e5b3e69d8e7ed155de3d2db959bc49597bf1 Mon Sep 17 00:00:00 2001 From: Mike Pall Date: Thu, 6 Jan 2011 23:37:04 +0100 Subject: [PATCH] Fix Windows/x86 build and update pregenerated files. --- src/buildvm_ppcspe.h | 332 +++++++------- src/buildvm_x64.h | 1012 +++++++++++++++++++++--------------------- src/buildvm_x64win.h | 1007 ++++++++++++++++++++--------------------- src/buildvm_x86.dasc | 2 +- src/buildvm_x86.h | 839 +++++++++++++++++----------------- 5 files changed, 1619 insertions(+), 1573 deletions(-) diff --git a/src/buildvm_ppcspe.h b/src/buildvm_ppcspe.h index 8a10c24a..96f7e55b 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[4947] = { +static const unsigned int build_actionlist[4950] = { 0x00010001, 0x00060014, 0x72000000, @@ -2804,6 +2804,9 @@ static const unsigned int build_actionlist[4947] = { 0x4e800020, 0x0006000c, 0x7c810808, +0x00060098, +0x00000000, +0x7c810808, 0x00000000, 0x00080000, 0x00000000, @@ -3263,7 +3266,7 @@ static const unsigned int build_actionlist[4947] = { 0x40830000, 0x0005083c, 0x00000000, -0x00060098, +0x00060099, 0x108caae9, 0x48000001, 0x00050091, @@ -3301,7 +3304,7 @@ static const unsigned int build_actionlist[4947] = { 0x0005083c, 0x00000000, 0x48000000, -0x00050098, +0x00050099, 0x00000000, 0x108e5300, 0x10ce5b00, @@ -3736,10 +3739,10 @@ static const unsigned int build_actionlist[4947] = { 0x7d6f402e, 0x00000000, 0x48000000, -0x00050099, +0x0005009a, 0x00000000, 0x48000000, -0x0005009a, +0x0005009b, 0x00000000, 0x114e5300, 0x116e5b00, @@ -3795,7 +3798,7 @@ static const unsigned int build_actionlist[4947] = { 0x0006000f, 0x100bba34, 0x41800000, -0x00050899, +0x0005089a, 0x48000000, 0x0005002e, 0x00000000, @@ -3807,7 +3810,7 @@ static const unsigned int build_actionlist[4947] = { 0x7d6f402e, 0x40800000, 0x0005082b, -0x00060099, +0x0006009a, 0x800a0000, 0x00098200, 0x810b0000, @@ -3974,7 +3977,7 @@ static const unsigned int build_actionlist[4947] = { 0x0006000f, 0x100bba34, 0x41800000, -0x0005089a, +0x0005089b, 0x48000000, 0x00050032, 0x00060011, @@ -3999,7 +4002,7 @@ static const unsigned int build_actionlist[4947] = { 0x7d6f402e, 0x40800000, 0x0005082f, -0x0006009a, +0x0006009b, 0x800a0000, 0x00098200, 0x810b0000, @@ -4600,7 +4603,7 @@ static const unsigned int build_actionlist[4947] = { 0x6a080000, 0x00090200, 0x40820000, -0x0005089b, +0x0005089c, 0x00060017, 0x80f0fffc, 0x2c0c0008, @@ -4651,7 +4654,7 @@ static const unsigned int build_actionlist[4947] = { 0x13494320, 0x48000000, 0x0005000f, -0x0006009b, +0x0006009c, 0x71090000, 0x00090200, 0x40820000, @@ -4669,7 +4672,7 @@ static const unsigned int build_actionlist[4947] = { 0x6a080000, 0x00090200, 0x40820000, -0x0005089b, +0x0005089c, 0x80f0fffc, 0x392efff8, 0x54ea5d78, @@ -5095,6 +5098,7 @@ enum { GLOB_vm_powi, GLOB_vm_foldfpm, GLOB_vm_foldarith, + GLOB_vm_ffi_call, GLOB_BC_MODVN_Z, GLOB_BC_TGETS_Z, GLOB_BC_TSETS_Z, @@ -5234,6 +5238,7 @@ static const char *const globnames[] = { "vm_powi", "vm_foldfpm", "vm_foldarith", + "vm_ffi_call", "BC_MODVN_Z", "BC_TGETS_Z", "BC_TSETS_Z", @@ -5409,13 +5414,16 @@ static void build_subroutines(BuildCtx *ctx) dasm_put(Dst, 2728); #endif dasm_put(Dst, 2730); +#if LJ_HASFFI + dasm_put(Dst, 2793); +#endif } /* Generate the code for a single instruction. */ static void build_ins(BuildCtx *ctx, BCOp op, int defop) { int vk = 0; - dasm_put(Dst, 2792, defop); + dasm_put(Dst, 2795, defop); switch (op) { @@ -5424,112 +5432,112 @@ 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, 2794, -(BCBIAS_J*4 >> 16)); + dasm_put(Dst, 2797, -(BCBIAS_J*4 >> 16)); if (op == BC_ISLE || op == BC_ISGT) { - dasm_put(Dst, 2808); + dasm_put(Dst, 2811); } if (op == BC_ISLT || op == BC_ISLE) { - dasm_put(Dst, 2811); + dasm_put(Dst, 2814); } else { - dasm_put(Dst, 2813); + dasm_put(Dst, 2816); } - dasm_put(Dst, 2815); + dasm_put(Dst, 2818); break; case BC_ISEQV: case BC_ISNEV: vk = op == BC_ISEQV; - dasm_put(Dst, 2826, -(BCBIAS_J*4 >> 16)); + dasm_put(Dst, 2829, -(BCBIAS_J*4 >> 16)); if (vk) { - dasm_put(Dst, 2840); + dasm_put(Dst, 2843); } else { - dasm_put(Dst, 2842); + dasm_put(Dst, 2845); } - dasm_put(Dst, 2844, ~LJ_TISPRI, ~LJ_TISTABUD); + dasm_put(Dst, 2847, ~LJ_TISPRI, ~LJ_TISTABUD); if (vk) { - dasm_put(Dst, 2866); + dasm_put(Dst, 2869); } else { - dasm_put(Dst, 2868); + dasm_put(Dst, 2871); } - dasm_put(Dst, 2870); + dasm_put(Dst, 2873); if (vk) { - dasm_put(Dst, 2872); + dasm_put(Dst, 2875); } else { - dasm_put(Dst, 2874); + dasm_put(Dst, 2877); } - dasm_put(Dst, 2876, Dt6(->metatable), 1-vk, Dt6(->nomm), 1<metatable), 1-vk, Dt6(->nomm), 1<> 16)); + dasm_put(Dst, 2900, 32-1, -(BCBIAS_J*4 >> 16)); if (vk) { - dasm_put(Dst, 2911); + dasm_put(Dst, 2914); } else { - dasm_put(Dst, 2913); + dasm_put(Dst, 2916); } - dasm_put(Dst, 2915); + dasm_put(Dst, 2918); break; case BC_ISEQN: case BC_ISNEN: vk = op == BC_ISEQN; - dasm_put(Dst, 2926, -(BCBIAS_J*4 >> 16)); + dasm_put(Dst, 2929, -(BCBIAS_J*4 >> 16)); if (vk) { - dasm_put(Dst, 2940); - } else { dasm_put(Dst, 2943); + } else { + dasm_put(Dst, 2946); } - dasm_put(Dst, 2945); + dasm_put(Dst, 2948); if (!vk) { - dasm_put(Dst, 2957); + dasm_put(Dst, 2960); } break; case BC_ISEQP: case BC_ISNEP: vk = op == BC_ISEQP; - dasm_put(Dst, 2963, 32-3, -(BCBIAS_J*4 >> 16)); + dasm_put(Dst, 2966, 32-3, -(BCBIAS_J*4 >> 16)); if (vk) { - dasm_put(Dst, 2975); + dasm_put(Dst, 2978); } else { - dasm_put(Dst, 2977); + dasm_put(Dst, 2980); } - dasm_put(Dst, 2979); + dasm_put(Dst, 2982); break; /* -- Unary test and copy ops ------------------------------------------- */ case BC_ISTC: case BC_ISFC: case BC_IST: case BC_ISF: - dasm_put(Dst, 2990); + dasm_put(Dst, 2993); if (op == BC_IST || op == BC_ISF) { - dasm_put(Dst, 2996, -(BCBIAS_J*4 >> 16)); + dasm_put(Dst, 2999, -(BCBIAS_J*4 >> 16)); if (op == BC_IST) { - dasm_put(Dst, 3001); + dasm_put(Dst, 3004); } else { - dasm_put(Dst, 3003); + dasm_put(Dst, 3006); } } else { if (op == BC_ISTC) { - dasm_put(Dst, 3005); - } else { dasm_put(Dst, 3008); + } else { + dasm_put(Dst, 3011); } - dasm_put(Dst, 3011, -(BCBIAS_J*4 >> 16)); + dasm_put(Dst, 3014, -(BCBIAS_J*4 >> 16)); } - dasm_put(Dst, 3018); + dasm_put(Dst, 3021); break; /* -- Unary ops --------------------------------------------------------- */ case BC_MOV: - dasm_put(Dst, 3029); + dasm_put(Dst, 3032); break; case BC_NOT: - dasm_put(Dst, 3042, LJ_TTRUE); + dasm_put(Dst, 3045, LJ_TTRUE); break; case BC_UNM: - dasm_put(Dst, 3058); + dasm_put(Dst, 3061); break; case BC_LEN: - dasm_put(Dst, 3075, Dt5(->len)); + dasm_put(Dst, 3078, Dt5(->len)); break; /* -- Binary ops -------------------------------------------------------- */ @@ -5539,262 +5547,262 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop) vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 3103); + dasm_put(Dst, 3106); break; case 1: - dasm_put(Dst, 3109); + dasm_put(Dst, 3112); break; default: - dasm_put(Dst, 3115); + dasm_put(Dst, 3118); break; } - dasm_put(Dst, 3122); + dasm_put(Dst, 3125); break; case BC_SUBVN: case BC_SUBNV: case BC_SUBVV: vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 3135); + dasm_put(Dst, 3138); break; case 1: - dasm_put(Dst, 3141); + dasm_put(Dst, 3144); break; default: - dasm_put(Dst, 3147); + dasm_put(Dst, 3150); break; } - dasm_put(Dst, 3154); + dasm_put(Dst, 3157); break; case BC_MULVN: case BC_MULNV: case BC_MULVV: vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 3167); + dasm_put(Dst, 3170); break; case 1: - dasm_put(Dst, 3173); + dasm_put(Dst, 3176); break; default: - dasm_put(Dst, 3179); + dasm_put(Dst, 3182); break; } - dasm_put(Dst, 3186); + dasm_put(Dst, 3189); break; case BC_DIVVN: case BC_DIVNV: case BC_DIVVV: vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 3199); + dasm_put(Dst, 3202); break; case 1: - dasm_put(Dst, 3205); + dasm_put(Dst, 3208); break; default: - dasm_put(Dst, 3211); + dasm_put(Dst, 3214); break; } - dasm_put(Dst, 3218); + dasm_put(Dst, 3221); break; case BC_MODVN: vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 3231); + dasm_put(Dst, 3234); break; case 1: - dasm_put(Dst, 3237); + dasm_put(Dst, 3240); break; default: - dasm_put(Dst, 3243); + dasm_put(Dst, 3246); break; } - dasm_put(Dst, 3250); + dasm_put(Dst, 3253); break; case BC_MODNV: case BC_MODVV: vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 3268); + dasm_put(Dst, 3271); break; case 1: - dasm_put(Dst, 3274); + dasm_put(Dst, 3277); break; default: - dasm_put(Dst, 3280); + dasm_put(Dst, 3283); break; } - dasm_put(Dst, 3287); + dasm_put(Dst, 3290); break; case BC_POW: - dasm_put(Dst, 3290); + dasm_put(Dst, 3293); break; case BC_CAT: - dasm_put(Dst, 3312, Dt1(->base), 32-3, Dt1(->base)); + dasm_put(Dst, 3315, Dt1(->base), 32-3, Dt1(->base)); break; /* -- Constant ops ------------------------------------------------------ */ case BC_KSTR: - dasm_put(Dst, 3342, 32-1); + dasm_put(Dst, 3345, 32-1); break; case BC_KCDATA: #if LJ_HASFFI - dasm_put(Dst, 3359, 32-1, LJ_TCDATA); + dasm_put(Dst, 3362, 32-1, LJ_TCDATA); #endif break; case BC_KSHORT: - dasm_put(Dst, 3378, 32-3); + dasm_put(Dst, 3381, 32-3); break; case BC_KNUM: - dasm_put(Dst, 3394); + dasm_put(Dst, 3397); break; case BC_KPRI: - dasm_put(Dst, 3407, 32-3); + dasm_put(Dst, 3410, 32-3); break; case BC_KNIL: - dasm_put(Dst, 3422); + dasm_put(Dst, 3425); break; /* -- Upvalue and function ops ------------------------------------------ */ case BC_UGET: - dasm_put(Dst, 3441, 32-1, offsetof(GCfuncL, uvptr), DtA(->v)); + dasm_put(Dst, 3444, 32-1, offsetof(GCfuncL, uvptr), DtA(->v)); break; case BC_USETV: - dasm_put(Dst, 3462, 32-1, offsetof(GCfuncL, uvptr), DtA(->marked), DtA(->v), LJ_GC_BLACK, DtA(->closed), -LJ_TISNUM, LJ_TISGCV - LJ_TISNUM, Dt4(->gch.marked), LJ_GC_WHITES, GG_DISP2G); + dasm_put(Dst, 3465, 32-1, offsetof(GCfuncL, uvptr), DtA(->marked), DtA(->v), LJ_GC_BLACK, DtA(->closed), -LJ_TISNUM, LJ_TISGCV - LJ_TISNUM, Dt4(->gch.marked), LJ_GC_WHITES, GG_DISP2G); break; case BC_USETS: - dasm_put(Dst, 3514, 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, 3517, 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, 3563, 32-1, offsetof(GCfuncL, uvptr), DtA(->v)); + dasm_put(Dst, 3566, 32-1, offsetof(GCfuncL, uvptr), DtA(->v)); break; case BC_USETP: - dasm_put(Dst, 3584, 32-1, offsetof(GCfuncL, uvptr), 32-3, DtA(->v)); + dasm_put(Dst, 3587, 32-1, offsetof(GCfuncL, uvptr), 32-3, DtA(->v)); break; case BC_UCLO: - dasm_put(Dst, 3607, Dt1(->openupval), 32-1, -(BCBIAS_J*4 >> 16), Dt1(->base), Dt1(->base)); + dasm_put(Dst, 3610, Dt1(->openupval), 32-1, -(BCBIAS_J*4 >> 16), Dt1(->base), Dt1(->base)); break; case BC_FNEW: - dasm_put(Dst, 3637, 32-1, Dt1(->base), Dt1(->base)); + dasm_put(Dst, 3640, 32-1, Dt1(->base), Dt1(->base)); break; /* -- Table ops --------------------------------------------------------- */ case BC_TNEW: case BC_TDUP: - dasm_put(Dst, 3663, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base)); + dasm_put(Dst, 3666, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base)); if (op == BC_TNEW) { - dasm_put(Dst, 3676); + dasm_put(Dst, 3679); } else { - dasm_put(Dst, 3684, 32-1); + dasm_put(Dst, 3687, 32-1); } - dasm_put(Dst, 3691, Dt1(->base)); + dasm_put(Dst, 3694, Dt1(->base)); break; case BC_GGET: case BC_GSET: - dasm_put(Dst, 3714, 32-1, Dt7(->env)); + dasm_put(Dst, 3717, 32-1, Dt7(->env)); if (op == BC_GGET) { - dasm_put(Dst, 3722); - } else { dasm_put(Dst, 3725); + } else { + dasm_put(Dst, 3728); } break; case BC_TGETV: - dasm_put(Dst, 3728, 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, 3902, 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, 3978, 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, 4039, 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, 4090, Dt6(->marked), Dt6(->gclist)); + dasm_put(Dst, 3981, 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, 4042, 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, 4093, Dt6(->marked), Dt6(->gclist)); break; case BC_TSETB: - dasm_put(Dst, 4097, 32-3, Dt6(->asize), Dt6(->array), Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->nomm), 1<marked)); - dasm_put(Dst, 4157, Dt6(->gclist)); + dasm_put(Dst, 4100, 32-3, Dt6(->asize), Dt6(->array), Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->nomm), 1<marked)); + dasm_put(Dst, 4160, Dt6(->gclist)); break; case BC_TSETM: - dasm_put(Dst, 4162, 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, 4231); + dasm_put(Dst, 4165, 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, 4234); break; /* -- Calls and vararg handling ----------------------------------------- */ case BC_CALLM: - dasm_put(Dst, 4234); + dasm_put(Dst, 4237); break; case BC_CALL: - dasm_put(Dst, 4236, Dt7(->pc)); + dasm_put(Dst, 4239, Dt7(->pc)); break; case BC_CALLMT: - dasm_put(Dst, 4256); + dasm_put(Dst, 4259); break; case BC_CALLT: - dasm_put(Dst, 4258, FRAME_TYPE, Dt7(->ffid), FRAME_VARG, Dt7(->pc), -4-8, Dt7(->pc), PC2PROTO(k), FRAME_TYPEP); - dasm_put(Dst, 4323, FRAME_TYPE); + dasm_put(Dst, 4261, FRAME_TYPE, Dt7(->ffid), FRAME_VARG, Dt7(->pc), -4-8, Dt7(->pc), PC2PROTO(k), FRAME_TYPEP); + dasm_put(Dst, 4326, FRAME_TYPE); break; case BC_ITERC: - dasm_put(Dst, 4330, Dt7(->pc)); + dasm_put(Dst, 4333, Dt7(->pc)); break; case BC_ITERN: #if LJ_HASJIT #endif - dasm_put(Dst, 4356, 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, 4435); + dasm_put(Dst, 4359, 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, 4438); break; case BC_ISNEXT: - dasm_put(Dst, 4439, 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, 4442, 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, 4490, FRAME_VARG, Dt1(->maxstack), Dt1(->top), Dt1(->base), 32-3, Dt1(->base)); - dasm_put(Dst, 4570); + dasm_put(Dst, 4493, FRAME_VARG, Dt1(->maxstack), Dt1(->top), Dt1(->base), 32-3, Dt1(->base)); + dasm_put(Dst, 4573); break; /* -- Returns ----------------------------------------------------------- */ case BC_RETM: - dasm_put(Dst, 4576); + dasm_put(Dst, 4579); break; case BC_RET: - dasm_put(Dst, 4578, FRAME_TYPE, FRAME_VARG, Dt7(->pc), PC2PROTO(k), FRAME_TYPEP); + dasm_put(Dst, 4581, FRAME_TYPE, FRAME_VARG, Dt7(->pc), PC2PROTO(k), FRAME_TYPEP); break; case BC_RET0: case BC_RET1: - dasm_put(Dst, 4648, FRAME_TYPE, FRAME_VARG); + dasm_put(Dst, 4651, FRAME_TYPE, FRAME_VARG); if (op == BC_RET1) { - dasm_put(Dst, 4661); + dasm_put(Dst, 4664); } - dasm_put(Dst, 4664, Dt7(->pc), PC2PROTO(k)); + dasm_put(Dst, 4667, Dt7(->pc), PC2PROTO(k)); break; /* -- Loops and branches ------------------------------------------------ */ case BC_FORL: #if LJ_HASJIT - dasm_put(Dst, 4692); + dasm_put(Dst, 4695); #endif break; @@ -5806,35 +5814,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, 4694, FORL_IDX*8, FORL_STEP*8, FORL_STOP*8); + dasm_put(Dst, 4697, FORL_IDX*8, FORL_STEP*8, FORL_STOP*8); if (!vk) { - dasm_put(Dst, 4702); + dasm_put(Dst, 4705); } if (vk) { - dasm_put(Dst, 4710, FORL_IDX*8); + dasm_put(Dst, 4713, FORL_IDX*8); } - dasm_put(Dst, 4714, FORL_EXT*8); + dasm_put(Dst, 4717, FORL_EXT*8); if (op != BC_JFORL) { - dasm_put(Dst, 4722, 32-1); + dasm_put(Dst, 4725, 32-1); if (op == BC_JFORI) { - dasm_put(Dst, 4726, -(BCBIAS_J*4 >> 16)); - } else { dasm_put(Dst, 4729, -(BCBIAS_J*4 >> 16)); + } else { + dasm_put(Dst, 4732, -(BCBIAS_J*4 >> 16)); } } if (op == BC_FORI) { - dasm_put(Dst, 4732); + dasm_put(Dst, 4735); } else if (op == BC_IFORL) { - dasm_put(Dst, 4734); + dasm_put(Dst, 4737); } else { - dasm_put(Dst, 4736, BC_JLOOP); + dasm_put(Dst, 4739, BC_JLOOP); } - dasm_put(Dst, 4739); + dasm_put(Dst, 4742); break; case BC_ITERL: #if LJ_HASJIT - dasm_put(Dst, 4754); + dasm_put(Dst, 4757); #endif break; @@ -5843,40 +5851,40 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop) break; #endif case BC_IITERL: - dasm_put(Dst, 4756); + dasm_put(Dst, 4759); if (op == BC_JITERL) { - dasm_put(Dst, 4762); + dasm_put(Dst, 4765); } else { - dasm_put(Dst, 4764, 32-1, -(BCBIAS_J*4 >> 16)); + dasm_put(Dst, 4767, 32-1, -(BCBIAS_J*4 >> 16)); } - dasm_put(Dst, 4771); + dasm_put(Dst, 4774); break; case BC_LOOP: #if LJ_HASJIT - dasm_put(Dst, 4783); + dasm_put(Dst, 4786); #endif break; case BC_ILOOP: - dasm_put(Dst, 4785); + dasm_put(Dst, 4788); break; case BC_JLOOP: #if LJ_HASJIT - dasm_put(Dst, 4796); + dasm_put(Dst, 4799); #endif break; case BC_JMP: - dasm_put(Dst, 4798, 32-1, -(BCBIAS_J*4 >> 16)); + dasm_put(Dst, 4801, 32-1, -(BCBIAS_J*4 >> 16)); break; /* -- Function headers -------------------------------------------------- */ case BC_FUNCF: #if LJ_HASJIT - dasm_put(Dst, 4814); + dasm_put(Dst, 4817); #endif case BC_FUNCV: /* NYI: compiled vararg functions. */ break; @@ -5886,38 +5894,38 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop) break; #endif case BC_IFUNCF: - dasm_put(Dst, 4816, Dt1(->maxstack), -4+PC2PROTO(numparams), -4+PC2PROTO(k), 31-3); + dasm_put(Dst, 4819, Dt1(->maxstack), -4+PC2PROTO(numparams), -4+PC2PROTO(k), 31-3); if (op == BC_JFUNCF) { - dasm_put(Dst, 4834); + dasm_put(Dst, 4837); } else { - dasm_put(Dst, 4836); + dasm_put(Dst, 4839); } - dasm_put(Dst, 4845); + dasm_put(Dst, 4848); break; case BC_JFUNCV: #if !LJ_HASJIT break; #endif - dasm_put(Dst, 4851); + dasm_put(Dst, 4854); break; /* NYI: compiled vararg functions. */ case BC_IFUNCV: - dasm_put(Dst, 4853, Dt1(->maxstack), 8+FRAME_VARG, -4+PC2PROTO(k), -4+PC2PROTO(numparams)); + dasm_put(Dst, 4856, 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, 4903, Dt8(->f)); + dasm_put(Dst, 4906, Dt8(->f)); } else { - dasm_put(Dst, 4906, DISPATCH_GL(wrapf)); + dasm_put(Dst, 4909, DISPATCH_GL(wrapf)); } - dasm_put(Dst, 4909, Dt1(->maxstack), Dt1(->base), Dt1(->top), ~LJ_VMST_C); + dasm_put(Dst, 4912, Dt1(->maxstack), Dt1(->base), Dt1(->top), ~LJ_VMST_C); if (op == BC_FUNCCW) { - dasm_put(Dst, 4922, Dt8(->f)); + dasm_put(Dst, 4925, Dt8(->f)); } - dasm_put(Dst, 4925, DISPATCH_GL(vmstate), Dt1(->top), 31-3, Dt1(->base), ~LJ_VMST_INTERP, DISPATCH_GL(vmstate)); + dasm_put(Dst, 4928, DISPATCH_GL(vmstate), Dt1(->top), 31-3, Dt1(->base), ~LJ_VMST_INTERP, DISPATCH_GL(vmstate)); break; /* ---------------------------------------------------------------------- */ @@ -5937,7 +5945,7 @@ static int build_backend(BuildCtx *ctx) build_subroutines(ctx); - dasm_put(Dst, 4946); + dasm_put(Dst, 4949); 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 73cbbb6d..b6756867 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[14278] = { +static const unsigned char build_actionlist[14436] = { 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, @@ -469,241 +469,248 @@ static const unsigned char build_actionlist[14278] = { 252,233,218,209,221,217,195,255,221,225,223,224,252,246,196,1,15,132,244, 248,217,201,248,2,221,216,195,248,1,221,225,223,224,252,246,196,1,15,133, 244,248,217,201,248,2,221,216,195,255,248,155,137,252,248,83,15,162,137,6, - 137,94,4,137,78,8,137,86,12,91,195,255,129,124,253,202,4,239,15,135,244,41, - 129,124,253,194,4,239,15,135,244,41,255,252,242,15,16,4,194,131,195,4,102, - 15,46,4,202,255,221,4,202,221,4,194,131,195,4,255,223,252,233,221,216,255, - 218,252,233,223,224,158,255,15,134,244,248,255,15,131,244,248,255,248,1,15, - 183,67,252,254,141,156,253,131,233,248,2,139,3,15,182,204,15,182,232,131, - 195,4,193,232,16,65,252,255,36,252,238,255,139,108,194,4,131,195,4,129,252, - 253,239,15,135,244,251,129,124,253,202,4,239,15,135,244,251,255,252,242,15, - 16,4,194,102,15,46,4,202,255,221,4,202,221,4,194,255,15,138,244,248,15,133, - 244,248,255,15,138,244,248,15,132,244,247,255,248,1,15,183,67,252,254,141, - 156,253,131,233,248,2,255,248,2,15,183,67,252,254,141,156,253,131,233,248, - 1,255,248,5,57,108,202,4,15,133,244,2,129,252,253,239,15,131,244,1,139,12, - 202,139,4,194,57,193,15,132,244,1,129,252,253,239,15,135,244,2,139,169,233, - 133,252,237,15,132,244,2,252,246,133,233,235,15,133,244,2,255,49,252,237, - 255,189,1,0,0,0,255,252,233,244,45,255,72,252,247,208,131,195,4,129,124,253, - 202,4,239,15,133,244,248,139,12,202,65,59,12,135,255,131,195,4,129,124,253, - 202,4,239,15,135,244,248,255,252,242,65,15,16,4,199,102,15,46,4,202,255,221, - 4,202,65,221,4,199,255,72,252,247,208,131,195,4,57,68,202,4,255,139,108,194, - 4,131,195,4,129,252,253,239,255,15,131,244,247,255,15,130,244,247,255,137, - 108,202,4,139,44,194,137,44,202,255,15,183,67,252,254,141,156,253,131,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,139,44,194,72,137,44,202,139,3,15,182,204,15,182,232,131,195,4, - 193,232,16,65,252,255,36,252,238,255,49,252,237,129,124,253,194,4,239,129, - 213,239,137,108,202,4,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65, - 252,255,36,252,238,255,129,124,253,194,4,239,15,135,244,48,255,252,242,15, - 16,4,194,72,184,237,237,102,72,15,110,200,15,87,193,252,242,15,17,4,202,255, - 221,4,194,217,224,221,28,202,255,129,124,253,194,4,239,15,133,244,248,139, - 4,194,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,50,139,60, - 194,137,213,232,251,1,18,255,252,242,15,42,192,137,252,234,255,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,135,244,46,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,135,244,47,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,135,244,49,129,124,253,194,4,239,15, - 135,244,49,255,252,242,15,16,4,252,234,252,242,15,88,4,194,255,221,4,252, - 234,220,4,194,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,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,156,232,244,148,255,252,233,244,156,255,232, - 244,107,255,15,182,252,236,15,182,192,139,124,36,24,137,151,233,141,52,194, - 137,194,41,252,234,248,33,137,252,253,137,92,36,28,232,251,1,25,139,149,233, - 133,192,15,133,244,42,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,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,26,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,26,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,27,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,28,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,29,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,30,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,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,137,252,239,232,251,1,30,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,157,255,72,252,247,208,139,106,252,248, - 139,173,233,65,139,4,135,252,233,244,158,255,15,182,252,236,15,182,192,129, - 124,253,252,234,4,239,15,133,244,36,139,44,252,234,129,124,253,194,4,239, - 15,135,244,251,255,252,242,15,16,4,194,252,242,15,45,192,252,242,15,42,200, - 102,15,46,193,255,15,133,244,36,59,133,233,15,131,244,36,193,224,3,3,133, - 233,129,120,253,4,239,15,132,244,248,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,36,15, - 182,75,252,253,248,3,255,199,68,202,4,237,252,233,244,1,248,5,129,124,253, - 194,4,239,15,133,244,36,139,4,194,252,233,244,157,255,15,182,252,236,15,182, - 192,72,252,247,208,65,139,4,135,129,124,253,252,234,4,239,15,133,244,34,139, - 44,252,234,248,157,139,141,233,35,136,233,105,201,239,3,141,233,248,1,129, - 185,233,239,15,133,244,250,57,129,233,15,133,244,250,129,121,253,4,239,15, - 132,244,251,15,182,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,34,255,15,182,252,236,15,182,192,129,124,253,252,234,4,239, - 15,133,244,35,139,44,252,234,59,133,233,15,131,244,35,193,224,3,3,133,233, - 129,120,253,4,239,15,132,244,248,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,35,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,39,139,44,252,234,129,124,253,194, - 4,239,15,135,244,251,255,15,133,244,39,59,133,233,15,131,244,39,193,224,3, - 3,133,233,129,120,253,4,239,15,132,244,249,248,1,252,246,133,233,235,15,133, - 244,253,248,2,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,255,252,246,129,233,235,15,132,244,39,15,182,75,252,253,252,233,244,1, - 248,5,129,124,253,194,4,239,15,133,244,39,139,4,194,252,233,244,158,248,7, - 128,165,233,235,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,37,139,44,252,234,248,158,139,141,233,35, - 136,233,105,201,239,198,133,233,0,3,141,233,248,1,129,185,233,239,15,133, - 244,251,57,129,233,15,133,244,251,129,121,253,4,239,15,132,244,250,248,2, - 255,252,246,133,233,235,15,133,244,253,248,3,15,182,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,37,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,37,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,32,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,38,139,44,252,234,59,133,233,15,131, - 244,38,193,224,3,3,133,233,129,120,253,4,239,15,132,244,249,248,1,252,246, - 133,233,235,15,133,244,253,248,2,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,38,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,33,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,51,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, - 28,248,52,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,28,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,252,242,15,42,192,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, + 137,94,4,137,78,8,137,86,12,91,195,248,156,255,85,72,137,229,83,72,137,252, + 251,139,131,233,72,41,196,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,72,139,179,233,72,139,147,233,72,139, + 139,233,76,139,131,233,76,139,139,233,133,192,15,132,244,251,15,40,131,233, + 255,15,40,139,233,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,72,139,93,252, + 248,201,195,255,129,124,253,202,4,239,15,135,244,41,129,124,253,194,4,239, + 15,135,244,41,255,252,242,15,16,4,194,131,195,4,102,15,46,4,202,255,221,4, + 202,221,4,194,131,195,4,255,223,252,233,221,216,255,218,252,233,223,224,158, + 255,15,134,244,248,255,15,131,244,248,255,248,1,15,183,67,252,254,141,156, + 253,131,233,248,2,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65,252, + 255,36,252,238,255,139,108,194,4,131,195,4,129,252,253,239,15,135,244,251, + 129,124,253,202,4,239,15,135,244,251,255,252,242,15,16,4,194,102,15,46,4, + 202,255,221,4,202,221,4,194,255,15,138,244,248,15,133,244,248,255,15,138, + 244,248,15,132,244,247,255,248,1,15,183,67,252,254,141,156,253,131,233,248, + 2,255,248,2,15,183,67,252,254,141,156,253,131,233,248,1,255,248,5,57,108, + 202,4,15,133,244,2,129,252,253,239,15,131,244,1,139,12,202,139,4,194,57,193, + 15,132,244,1,129,252,253,239,15,135,244,2,139,169,233,133,252,237,15,132, + 244,2,252,246,133,233,235,15,133,244,2,255,49,252,237,255,189,1,0,0,0,255, + 252,233,244,45,255,72,252,247,208,131,195,4,129,124,253,202,4,239,15,133, + 244,248,139,12,202,65,59,12,135,255,131,195,4,129,124,253,202,4,239,15,135, + 244,248,255,252,242,65,15,16,4,199,102,15,46,4,202,255,221,4,202,65,221,4, + 199,255,72,252,247,208,131,195,4,57,68,202,4,255,139,108,194,4,131,195,4, + 129,252,253,239,255,15,131,244,247,255,15,130,244,247,255,137,108,202,4,139, + 44,194,137,44,202,255,15,183,67,252,254,141,156,253,131,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,139, + 44,194,72,137,44,202,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65, + 252,255,36,252,238,255,49,252,237,129,124,253,194,4,239,129,213,239,137,108, + 202,4,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36,252, + 238,255,129,124,253,194,4,239,15,135,244,48,255,252,242,15,16,4,194,72,184, + 237,237,102,72,15,110,200,15,87,193,252,242,15,17,4,202,255,221,4,194,217, + 224,221,28,202,255,129,124,253,194,4,239,15,133,244,248,139,4,194,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,50,139,60,194,137,213, + 232,251,1,18,255,252,242,15,42,192,137,252,234,255,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, + 135,244,46,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,135,244,47,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,135,244,49,129,124,253,194,4,239,15,135,244, + 49,255,252,242,15,16,4,252,234,252,242,15,88,4,194,255,221,4,252,234,220, + 4,194,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,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,157,232,244,148,255,252,233,244,157,255,232,244, + 107,255,15,182,252,236,15,182,192,139,124,36,24,137,151,233,141,52,194,137, + 194,41,252,234,248,33,137,252,253,137,92,36,28,232,251,1,25,139,149,233,133, + 192,15,133,244,42,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,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,26,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,26,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,27,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,28,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,29,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,30,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,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,137,252,239,232,251,1,30,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,158,255,72,252,247,208,139,106,252,248,139,173, + 233,65,139,4,135,252,233,244,159,255,15,182,252,236,15,182,192,129,124,253, + 252,234,4,239,15,133,244,36,139,44,252,234,129,124,253,194,4,239,15,135,244, + 251,255,252,242,15,16,4,194,252,242,15,45,192,252,242,15,42,200,102,15,46, + 193,255,15,133,244,36,59,133,233,15,131,244,36,193,224,3,3,133,233,129,120, + 253,4,239,15,132,244,248,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,36,15,182,75,252,253, + 248,3,255,199,68,202,4,237,252,233,244,1,248,5,129,124,253,194,4,239,15,133, + 244,36,139,4,194,252,233,244,158,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,34,139,44,252,234,248, + 158,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, + 34,255,15,182,252,236,15,182,192,129,124,253,252,234,4,239,15,133,244,35, + 139,44,252,234,59,133,233,15,131,244,35,193,224,3,3,133,233,129,120,253,4, + 239,15,132,244,248,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,35,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,39,139,44,252,234,129,124,253,194,4,239,15,135, + 244,251,255,15,133,244,39,59,133,233,15,131,244,39,193,224,3,3,133,233,129, + 120,253,4,239,15,132,244,249,248,1,252,246,133,233,235,15,133,244,253,248, + 2,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,255,252, + 246,129,233,235,15,132,244,39,15,182,75,252,253,252,233,244,1,248,5,129,124, + 253,194,4,239,15,133,244,39,139,4,194,252,233,244,159,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,37,139,44,252,234,248,159,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,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,140,255,141,12,202,255,129,121,253,4,239,15,135, - 244,53,129,121,253,12,239,15,135,244,53,255,139,105,20,255,129,252,253,239, - 15,135,244,53,255,252,242,15,16,1,252,242,15,16,73,8,255,252,242,15,88,65, - 16,252,242,15,17,1,133,252,237,15,136,244,249,255,15,140,244,249,255,102, - 15,46,200,248,1,252,242,15,17,65,24,255,221,65,8,221,1,255,220,65,16,221, - 17,221,81,24,133,252,237,15,136,244,247,255,221,81,24,15,140,244,247,255, - 217,201,248,1,255,15,183,67,252,254,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,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,142,255,68,139,187,233,139,108,36,24,141,12,202,59, - 141,233,15,135,244,23,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,22,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,137, - 252,239,255,76,137,252,254,137,252,239,255,15,135,244,21,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 + 131,189,233,0,15,132,244,2,137,12,36,139,141,233,252,246,129,233,235,15,132, + 244,37,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,37,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,32,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,38,139,44,252,234,59,133,233,15,131,244,38,193,224,3, + 3,133,233,129,120,253,4,239,15,132,244,249,248,1,252,246,133,233,235,15,133, + 244,253,248,2,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,38,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,33,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,51,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,28,248,52,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,28,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, + 252,242,15,42,192,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, + 140,255,141,12,202,255,129,121,253,4,239,15,135,244,53,129,121,253,12,239, + 15,135,244,53,255,139,105,20,255,129,252,253,239,15,135,244,53,255,252,242, + 15,16,1,252,242,15,16,73,8,255,252,242,15,88,65,16,252,242,15,17,1,133,252, + 237,15,136,244,249,255,15,140,244,249,255,102,15,46,200,248,1,252,242,15, + 17,65,24,255,221,65,8,221,1,255,220,65,16,221,17,221,81,24,133,252,237,15, + 136,244,247,255,221,81,24,15,140,244,247,255,217,201,248,1,255,15,183,67, + 252,254,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,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,142, + 255,68,139,187,233,139,108,36,24,141,12,202,59,141,233,15,135,244,23,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,22,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,137,252,239,255,76,137,252,254,137, + 252,239,255,15,135,244,21,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 { @@ -853,6 +860,7 @@ enum { GLOB_vm_foldfpm, GLOB_vm_foldarith, GLOB_vm_cpuid, + GLOB_vm_ffi_call, GLOB_BC_MODVN_Z, GLOB_BC_TGETS_Z, GLOB_BC_TSETS_Z, @@ -1005,6 +1013,7 @@ static const char *const globnames[] = { "vm_foldfpm", "vm_foldarith", "vm_cpuid", + "vm_ffi_call@4", "BC_MODVN_Z", "BC_TGETS_Z", "BC_TSETS_Z", @@ -1444,6 +1453,11 @@ static void build_subroutines(BuildCtx *ctx, int cmov, int sse) dasm_put(Dst, 8989); } dasm_put(Dst, 9407); +#if LJ_HASFFI +#define DtE(_V) (int)(ptrdiff_t)&(((CCallState *)0)_V) + dasm_put(Dst, 9431, DtE(->spadj), 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])); + dasm_put(Dst, 9521, DtE(->fpr[1]), 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])); +#endif } /* Generate the code for a single instruction. */ @@ -1459,20 +1473,20 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) /* Remember: all ops branch for a true comparison, fall through otherwise. */ case BC_ISLT: case BC_ISGE: case BC_ISLE: case BC_ISGT: - dasm_put(Dst, 9429, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 9587, LJ_TISNUM, LJ_TISNUM); if (sse) { - dasm_put(Dst, 9450); + dasm_put(Dst, 9608); } else { - dasm_put(Dst, 9465); + dasm_put(Dst, 9623); if (cmov) { - dasm_put(Dst, 9475); + dasm_put(Dst, 9633); } else { - dasm_put(Dst, 9481); + dasm_put(Dst, 9639); } } switch (op) { case BC_ISLT: - dasm_put(Dst, 9488); + dasm_put(Dst, 9646); break; case BC_ISGE: dasm_put(Dst, 9287); @@ -1481,599 +1495,599 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) dasm_put(Dst, 5894); break; case BC_ISGT: - dasm_put(Dst, 9493); + dasm_put(Dst, 9651); break; default: break; /* Shut up GCC. */ } - dasm_put(Dst, 9498, -BCBIAS_J*4); + dasm_put(Dst, 9656, -BCBIAS_J*4); break; case BC_ISEQV: case BC_ISNEV: vk = op == BC_ISEQV; - dasm_put(Dst, 9533, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 9691, LJ_TISNUM, LJ_TISNUM); if (sse) { - dasm_put(Dst, 9559); + dasm_put(Dst, 9717); } else { - dasm_put(Dst, 9571); + dasm_put(Dst, 9729); if (cmov) { - dasm_put(Dst, 9475); + dasm_put(Dst, 9633); } else { - dasm_put(Dst, 9481); + dasm_put(Dst, 9639); } } iseqne_fp: if (vk) { - dasm_put(Dst, 9578); + dasm_put(Dst, 9736); } else { - dasm_put(Dst, 9587); + dasm_put(Dst, 9745); } iseqne_end: if (vk) { - dasm_put(Dst, 9596, -BCBIAS_J*4); + dasm_put(Dst, 9754, -BCBIAS_J*4); } else { - dasm_put(Dst, 9611, -BCBIAS_J*4); + dasm_put(Dst, 9769, -BCBIAS_J*4); } - dasm_put(Dst, 9512); + dasm_put(Dst, 9670); if (op == BC_ISEQV || op == BC_ISNEV) { - dasm_put(Dst, 9626, LJ_TISPRI, LJ_TISTABUD, Dt6(->metatable), Dt6(->nomm), 1<metatable), Dt6(->nomm), 1<>32)); + dasm_put(Dst, 10072, (unsigned int)(U64x(80000000,00000000)), (unsigned int)((U64x(80000000,00000000))>>32)); } else { - dasm_put(Dst, 9939); + dasm_put(Dst, 10097); } - dasm_put(Dst, 9512); + dasm_put(Dst, 9670); break; case BC_LEN: - dasm_put(Dst, 9948, LJ_TSTR); + dasm_put(Dst, 10106, LJ_TSTR); if (sse) { - dasm_put(Dst, 9962, Dt5(->len)); + dasm_put(Dst, 10120, Dt5(->len)); } else { - dasm_put(Dst, 9980, Dt5(->len)); + dasm_put(Dst, 10138, Dt5(->len)); } - dasm_put(Dst, 9989, LJ_TTAB); + dasm_put(Dst, 10147, LJ_TTAB); if (sse) { - dasm_put(Dst, 10031); + dasm_put(Dst, 10189); } else { } - dasm_put(Dst, 10040); + dasm_put(Dst, 10198); break; /* -- Binary ops -------------------------------------------------------- */ case BC_ADDVN: case BC_ADDNV: case BC_ADDVV: - dasm_put(Dst, 10050); + dasm_put(Dst, 10208); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 10058, LJ_TISNUM); + dasm_put(Dst, 10216, LJ_TISNUM); if (sse) { - dasm_put(Dst, 10070); + dasm_put(Dst, 10228); } else { - dasm_put(Dst, 10085); + dasm_put(Dst, 10243); } break; case 1: - dasm_put(Dst, 10094, LJ_TISNUM); + dasm_put(Dst, 10252, LJ_TISNUM); if (sse) { - dasm_put(Dst, 10106); + dasm_put(Dst, 10264); } else { - dasm_put(Dst, 10121); + dasm_put(Dst, 10279); } break; default: - dasm_put(Dst, 10130, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 10288, LJ_TISNUM, LJ_TISNUM); if (sse) { - dasm_put(Dst, 10152); + dasm_put(Dst, 10310); } else { - dasm_put(Dst, 10166); + dasm_put(Dst, 10324); } break; } if (sse) { - dasm_put(Dst, 9932); + dasm_put(Dst, 10090); } else { - dasm_put(Dst, 9944); + dasm_put(Dst, 10102); } - dasm_put(Dst, 9512); + dasm_put(Dst, 9670); break; case BC_SUBVN: case BC_SUBNV: case BC_SUBVV: - dasm_put(Dst, 10050); + dasm_put(Dst, 10208); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 10058, LJ_TISNUM); + dasm_put(Dst, 10216, LJ_TISNUM); if (sse) { - dasm_put(Dst, 10174); + dasm_put(Dst, 10332); } else { - dasm_put(Dst, 10189); + dasm_put(Dst, 10347); } break; case 1: - dasm_put(Dst, 10094, LJ_TISNUM); + dasm_put(Dst, 10252, LJ_TISNUM); if (sse) { - dasm_put(Dst, 10198); + dasm_put(Dst, 10356); } else { - dasm_put(Dst, 10213); + dasm_put(Dst, 10371); } break; default: - dasm_put(Dst, 10130, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 10288, LJ_TISNUM, LJ_TISNUM); if (sse) { - dasm_put(Dst, 10222); + dasm_put(Dst, 10380); } else { - dasm_put(Dst, 10236); + dasm_put(Dst, 10394); } break; } if (sse) { - dasm_put(Dst, 9932); + dasm_put(Dst, 10090); } else { - dasm_put(Dst, 9944); + dasm_put(Dst, 10102); } - dasm_put(Dst, 9512); + dasm_put(Dst, 9670); break; case BC_MULVN: case BC_MULNV: case BC_MULVV: - dasm_put(Dst, 10050); + dasm_put(Dst, 10208); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 10058, LJ_TISNUM); + dasm_put(Dst, 10216, LJ_TISNUM); if (sse) { - dasm_put(Dst, 10244); + dasm_put(Dst, 10402); } else { - dasm_put(Dst, 10259); + dasm_put(Dst, 10417); } break; case 1: - dasm_put(Dst, 10094, LJ_TISNUM); + dasm_put(Dst, 10252, LJ_TISNUM); if (sse) { - dasm_put(Dst, 10268); + dasm_put(Dst, 10426); } else { - dasm_put(Dst, 10283); + dasm_put(Dst, 10441); } break; default: - dasm_put(Dst, 10130, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 10288, LJ_TISNUM, LJ_TISNUM); if (sse) { - dasm_put(Dst, 10292); + dasm_put(Dst, 10450); } else { - dasm_put(Dst, 10306); + dasm_put(Dst, 10464); } break; } if (sse) { - dasm_put(Dst, 9932); + dasm_put(Dst, 10090); } else { - dasm_put(Dst, 9944); + dasm_put(Dst, 10102); } - dasm_put(Dst, 9512); + dasm_put(Dst, 9670); break; case BC_DIVVN: case BC_DIVNV: case BC_DIVVV: - dasm_put(Dst, 10050); + dasm_put(Dst, 10208); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 10058, LJ_TISNUM); + dasm_put(Dst, 10216, LJ_TISNUM); if (sse) { - dasm_put(Dst, 10314); + dasm_put(Dst, 10472); } else { - dasm_put(Dst, 10329); + dasm_put(Dst, 10487); } break; case 1: - dasm_put(Dst, 10094, LJ_TISNUM); + dasm_put(Dst, 10252, LJ_TISNUM); if (sse) { - dasm_put(Dst, 10338); + dasm_put(Dst, 10496); } else { - dasm_put(Dst, 10353); + dasm_put(Dst, 10511); } break; default: - dasm_put(Dst, 10130, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 10288, LJ_TISNUM, LJ_TISNUM); if (sse) { - dasm_put(Dst, 10362); + dasm_put(Dst, 10520); } else { - dasm_put(Dst, 10376); + dasm_put(Dst, 10534); } break; } if (sse) { - dasm_put(Dst, 9932); + dasm_put(Dst, 10090); } else { - dasm_put(Dst, 9944); + dasm_put(Dst, 10102); } - dasm_put(Dst, 9512); + dasm_put(Dst, 9670); break; case BC_MODVN: - dasm_put(Dst, 10050); + dasm_put(Dst, 10208); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 10058, LJ_TISNUM); + dasm_put(Dst, 10216, LJ_TISNUM); if (sse) { - dasm_put(Dst, 10384); + dasm_put(Dst, 10542); } else { - dasm_put(Dst, 10399); + dasm_put(Dst, 10557); } break; case 1: - dasm_put(Dst, 10094, LJ_TISNUM); + dasm_put(Dst, 10252, LJ_TISNUM); if (sse) { - dasm_put(Dst, 10408); + dasm_put(Dst, 10566); } else { - dasm_put(Dst, 10423); + dasm_put(Dst, 10581); } break; default: - dasm_put(Dst, 10130, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 10288, LJ_TISNUM, LJ_TISNUM); if (sse) { - dasm_put(Dst, 10432); + dasm_put(Dst, 10590); } else { - dasm_put(Dst, 10446); + dasm_put(Dst, 10604); } break; } - dasm_put(Dst, 10454); + dasm_put(Dst, 10612); if (sse) { - dasm_put(Dst, 9932); + dasm_put(Dst, 10090); } else { - dasm_put(Dst, 9944); + dasm_put(Dst, 10102); } - dasm_put(Dst, 9512); + dasm_put(Dst, 9670); break; case BC_MODNV: case BC_MODVV: - dasm_put(Dst, 10050); + dasm_put(Dst, 10208); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 10058, LJ_TISNUM); + dasm_put(Dst, 10216, LJ_TISNUM); if (sse) { - dasm_put(Dst, 10384); + dasm_put(Dst, 10542); } else { - dasm_put(Dst, 10399); + dasm_put(Dst, 10557); } break; case 1: - dasm_put(Dst, 10094, LJ_TISNUM); + dasm_put(Dst, 10252, LJ_TISNUM); if (sse) { - dasm_put(Dst, 10408); + dasm_put(Dst, 10566); } else { - dasm_put(Dst, 10423); + dasm_put(Dst, 10581); } break; default: - dasm_put(Dst, 10130, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 10288, LJ_TISNUM, LJ_TISNUM); if (sse) { - dasm_put(Dst, 10432); + dasm_put(Dst, 10590); } else { - dasm_put(Dst, 10446); + dasm_put(Dst, 10604); } break; } - dasm_put(Dst, 10460); + dasm_put(Dst, 10618); break; case BC_POW: - dasm_put(Dst, 10050); + dasm_put(Dst, 10208); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 10058, LJ_TISNUM); + dasm_put(Dst, 10216, LJ_TISNUM); if (sse) { - dasm_put(Dst, 10384); + dasm_put(Dst, 10542); } else { - dasm_put(Dst, 10399); + dasm_put(Dst, 10557); } break; case 1: - dasm_put(Dst, 10094, LJ_TISNUM); + dasm_put(Dst, 10252, LJ_TISNUM); if (sse) { - dasm_put(Dst, 10408); + dasm_put(Dst, 10566); } else { - dasm_put(Dst, 10423); + dasm_put(Dst, 10581); } break; default: - dasm_put(Dst, 10130, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 10288, LJ_TISNUM, LJ_TISNUM); if (sse) { - dasm_put(Dst, 10432); + dasm_put(Dst, 10590); } else { - dasm_put(Dst, 10446); + dasm_put(Dst, 10604); } break; } - dasm_put(Dst, 10465); + dasm_put(Dst, 10623); if (sse) { - dasm_put(Dst, 9932); + dasm_put(Dst, 10090); } else { - dasm_put(Dst, 9944); + dasm_put(Dst, 10102); } - dasm_put(Dst, 9512); + dasm_put(Dst, 9670); break; case BC_CAT: - dasm_put(Dst, 10469, Dt1(->base), Dt1(->base)); + dasm_put(Dst, 10627, Dt1(->base), Dt1(->base)); break; /* -- Constant ops ------------------------------------------------------ */ case BC_KSTR: - dasm_put(Dst, 10553, LJ_TSTR); + dasm_put(Dst, 10711, LJ_TSTR); break; case BC_KCDATA: #if LJ_HASFFI - dasm_put(Dst, 10553, LJ_TCDATA); + dasm_put(Dst, 10711, LJ_TCDATA); #endif break; case BC_KSHORT: if (sse) { - dasm_put(Dst, 10590); + dasm_put(Dst, 10748); } else { - dasm_put(Dst, 10605); + dasm_put(Dst, 10763); } - dasm_put(Dst, 9512); + dasm_put(Dst, 9670); break; case BC_KNUM: if (sse) { - dasm_put(Dst, 10613); + dasm_put(Dst, 10771); } else { - dasm_put(Dst, 10627); + dasm_put(Dst, 10785); } - dasm_put(Dst, 9512); + dasm_put(Dst, 9670); break; case BC_KPRI: - dasm_put(Dst, 10635); + dasm_put(Dst, 10793); break; case BC_KNIL: - dasm_put(Dst, 10664, LJ_TNIL); + dasm_put(Dst, 10822, LJ_TNIL); break; /* -- Upvalue and function ops ------------------------------------------ */ case BC_UGET: - dasm_put(Dst, 10712, offsetof(GCfuncL, uvptr), DtA(->v)); + dasm_put(Dst, 10870, offsetof(GCfuncL, uvptr), DtA(->v)); break; case BC_USETV: #define TV2MARKOFS \ ((int32_t)offsetof(GCupval, marked)-(int32_t)offsetof(GCupval, tv)) - dasm_put(Dst, 10753, 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, 10849); + dasm_put(Dst, 10911, 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, 11007); break; #undef TV2MARKOFS case BC_USETS: - dasm_put(Dst, 10861, 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, 11019, 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, 10957); + dasm_put(Dst, 11115); if (sse) { - dasm_put(Dst, 10962); + dasm_put(Dst, 11120); } else { - dasm_put(Dst, 9754); + dasm_put(Dst, 9912); } - dasm_put(Dst, 10970, offsetof(GCfuncL, uvptr), DtA(->v)); + dasm_put(Dst, 11128, offsetof(GCfuncL, uvptr), DtA(->v)); if (sse) { - dasm_put(Dst, 10979); + dasm_put(Dst, 11137); } else { - dasm_put(Dst, 10985); + dasm_put(Dst, 11143); } - dasm_put(Dst, 9512); + dasm_put(Dst, 9670); break; case BC_USETP: - dasm_put(Dst, 10988, offsetof(GCfuncL, uvptr), DtA(->v)); + dasm_put(Dst, 11146, offsetof(GCfuncL, uvptr), DtA(->v)); break; case BC_UCLO: - dasm_put(Dst, 11028, -BCBIAS_J*4, Dt1(->openupval), Dt1(->base), Dt1(->base)); + dasm_put(Dst, 11186, -BCBIAS_J*4, Dt1(->openupval), Dt1(->base), Dt1(->base)); break; case BC_FNEW: - dasm_put(Dst, 11084, Dt1(->base), Dt1(->base), LJ_TFUNC); + dasm_put(Dst, 11242, Dt1(->base), Dt1(->base), LJ_TFUNC); break; /* -- Table ops --------------------------------------------------------- */ case BC_TNEW: - dasm_put(Dst, 11151, Dt1(->base), DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), LJ_TTAB); + dasm_put(Dst, 11309, Dt1(->base), DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), LJ_TTAB); break; case BC_TDUP: - dasm_put(Dst, 11275, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), Dt1(->base), LJ_TTAB); + dasm_put(Dst, 11433, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), Dt1(->base), LJ_TTAB); break; case BC_GGET: - dasm_put(Dst, 11374, Dt7(->env)); + dasm_put(Dst, 11532, Dt7(->env)); break; case BC_GSET: - dasm_put(Dst, 11394, Dt7(->env)); + dasm_put(Dst, 11552, Dt7(->env)); break; case BC_TGETV: - dasm_put(Dst, 11414, LJ_TTAB, LJ_TISNUM); + dasm_put(Dst, 11572, LJ_TTAB, LJ_TISNUM); if (sse) { - dasm_put(Dst, 11447); + dasm_put(Dst, 11605); } else { } - dasm_put(Dst, 11468, 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, 11667, 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, 11825, 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)); - dasm_put(Dst, 11965, Dt6(->nomm), 1<marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); + dasm_put(Dst, 12043, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->metatable)); + dasm_put(Dst, 12123, Dt6(->nomm), 1<marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); break; case BC_TSETS: - dasm_put(Dst, 12029, 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, 12106, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<next)); - dasm_put(Dst, 12193, Dt6(->metatable), Dt6(->nomm), 1<base), Dt1(->base), Dt6(->marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); + dasm_put(Dst, 12187, 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, 12264, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<next)); + dasm_put(Dst, 12351, Dt6(->metatable), Dt6(->nomm), 1<base), Dt1(->base), Dt6(->marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); break; case BC_TSETB: - dasm_put(Dst, 12285, LJ_TTAB, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable)); - dasm_put(Dst, 12380, Dt6(->metatable), Dt6(->nomm), 1<marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); + dasm_put(Dst, 12443, LJ_TTAB, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable)); + dasm_put(Dst, 12538, Dt6(->metatable), Dt6(->nomm), 1<marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); break; case BC_TSETM: - dasm_put(Dst, 12428, Dt6(->marked), LJ_GC_BLACK, Dt6(->asize), Dt6(->array), Dt1(->base), Dt1(->base)); - dasm_put(Dst, 12578, Dt6(->marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); + dasm_put(Dst, 12586, Dt6(->marked), LJ_GC_BLACK, Dt6(->asize), Dt6(->array), Dt1(->base), Dt1(->base)); + dasm_put(Dst, 12736, Dt6(->marked), cast_byte(~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, 10054); + dasm_put(Dst, 10212); if (op == BC_CALLM) { - dasm_put(Dst, 12598); + dasm_put(Dst, 12756); } - dasm_put(Dst, 12603, LJ_TFUNC, Dt7(->pc)); + dasm_put(Dst, 12761, LJ_TFUNC, Dt7(->pc)); break; case BC_CALLMT: - dasm_put(Dst, 12598); + dasm_put(Dst, 12756); break; case BC_CALLT: - dasm_put(Dst, 12646, LJ_TFUNC, FRAME_TYPE, Dt7(->ffid), Dt7(->pc)); - dasm_put(Dst, 12764, FRAME_TYPE, Dt7(->pc), PC2PROTO(k), FRAME_VARG, FRAME_TYPEP, FRAME_VARG); + dasm_put(Dst, 12804, LJ_TFUNC, FRAME_TYPE, Dt7(->ffid), Dt7(->pc)); + dasm_put(Dst, 12922, FRAME_TYPE, Dt7(->pc), PC2PROTO(k), FRAME_VARG, FRAME_TYPEP, FRAME_VARG); break; case BC_ITERC: - dasm_put(Dst, 12838, LJ_TFUNC, 2+1, Dt7(->pc)); + dasm_put(Dst, 12996, LJ_TFUNC, 2+1, Dt7(->pc)); break; case BC_ITERN: #if LJ_HASJIT #endif - dasm_put(Dst, 12910, Dt6(->asize), Dt6(->array), LJ_TNIL); + dasm_put(Dst, 13068, Dt6(->asize), Dt6(->array), LJ_TNIL); if (sse) { - dasm_put(Dst, 12962); + dasm_put(Dst, 13120); } else { - dasm_put(Dst, 12968); + dasm_put(Dst, 13126); } - dasm_put(Dst, 12974); + dasm_put(Dst, 13132); if (sse) { - dasm_put(Dst, 9932); + dasm_put(Dst, 10090); } else { - dasm_put(Dst, 9944); + dasm_put(Dst, 10102); } - dasm_put(Dst, 12987, -BCBIAS_J*4); + dasm_put(Dst, 13145, -BCBIAS_J*4); if (!sse) { - dasm_put(Dst, 13041); + dasm_put(Dst, 13199); } - dasm_put(Dst, 13047, Dt6(->hmask), sizeof(Node), Dt6(->node), DtB(->val.it), LJ_TNIL, DtB(->key), DtB(->val)); + dasm_put(Dst, 13205, Dt6(->hmask), sizeof(Node), Dt6(->node), DtB(->val.it), LJ_TNIL, DtB(->key), DtB(->val)); break; case BC_ISNEXT: - dasm_put(Dst, 13126, LJ_TFUNC, LJ_TTAB, LJ_TNIL, Dt8(->ffid), FF_next_N, -BCBIAS_J*4, BC_JMP, -BCBIAS_J*4, BC_ITERC); + dasm_put(Dst, 13284, 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, 13227, (8+FRAME_VARG), LJ_TNIL, Dt1(->maxstack)); - dasm_put(Dst, 13394, Dt1(->base), Dt1(->top), Dt1(->base), Dt1(->top)); + dasm_put(Dst, 13385, (8+FRAME_VARG), LJ_TNIL, Dt1(->maxstack)); + dasm_put(Dst, 13552, Dt1(->base), Dt1(->top), Dt1(->base), Dt1(->top)); break; /* -- Returns ----------------------------------------------------------- */ case BC_RETM: - dasm_put(Dst, 12598); + dasm_put(Dst, 12756); break; case BC_RET: case BC_RET0: case BC_RET1: if (op != BC_RET0) { - dasm_put(Dst, 13464); + dasm_put(Dst, 13622); } - dasm_put(Dst, 13468, FRAME_TYPE); + dasm_put(Dst, 13626, FRAME_TYPE); switch (op) { case BC_RET: - dasm_put(Dst, 13487); + dasm_put(Dst, 13645); break; case BC_RET1: - dasm_put(Dst, 13541); + dasm_put(Dst, 13699); /* fallthrough */ case BC_RET0: - dasm_put(Dst, 13551); + dasm_put(Dst, 13709); default: break; } - dasm_put(Dst, 13562, Dt7(->pc), PC2PROTO(k)); + dasm_put(Dst, 13720, Dt7(->pc), PC2PROTO(k)); if (op == BC_RET) { - dasm_put(Dst, 13610, LJ_TNIL); + dasm_put(Dst, 13768, LJ_TNIL); } else { - dasm_put(Dst, 13621, LJ_TNIL); + dasm_put(Dst, 13779, LJ_TNIL); } - dasm_put(Dst, 13628, -FRAME_VARG, FRAME_TYPEP); + dasm_put(Dst, 13786, -FRAME_VARG, FRAME_TYPEP); if (op != BC_RET0) { - dasm_put(Dst, 13652); + dasm_put(Dst, 13810); } dasm_put(Dst, 4546); break; @@ -2083,7 +2097,7 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) case BC_FORL: #if LJ_HASJIT - dasm_put(Dst, 13656, HOTCOUNT_PCMASK, GG_DISP2HOT); + dasm_put(Dst, 13814, HOTCOUNT_PCMASK, GG_DISP2HOT); #endif break; @@ -2095,57 +2109,57 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) case BC_FORI: case BC_IFORL: vk = (op == BC_IFORL || op == BC_JFORL); - dasm_put(Dst, 13677); + dasm_put(Dst, 13835); if (!vk) { - dasm_put(Dst, 13681, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 13839, LJ_TISNUM, LJ_TISNUM); } - dasm_put(Dst, 13700); + dasm_put(Dst, 13858); if (!vk) { - dasm_put(Dst, 13704, LJ_TISNUM); + dasm_put(Dst, 13862, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 13713); + dasm_put(Dst, 13871); if (vk) { - dasm_put(Dst, 13725); + dasm_put(Dst, 13883); } else { - dasm_put(Dst, 13744); + dasm_put(Dst, 13902); } - dasm_put(Dst, 13749); + dasm_put(Dst, 13907); } else { - dasm_put(Dst, 13762); + dasm_put(Dst, 13920); if (vk) { - dasm_put(Dst, 13768); + dasm_put(Dst, 13926); } else { - dasm_put(Dst, 13784); + dasm_put(Dst, 13942); } - dasm_put(Dst, 13792); + dasm_put(Dst, 13950); if (cmov) { - dasm_put(Dst, 9475); + dasm_put(Dst, 9633); } else { - dasm_put(Dst, 9481); + dasm_put(Dst, 9639); } if (!cmov) { - dasm_put(Dst, 13797); + dasm_put(Dst, 13955); } } if (op == BC_FORI) { - dasm_put(Dst, 13803, -BCBIAS_J*4); + dasm_put(Dst, 13961, -BCBIAS_J*4); } else if (op == BC_JFORI) { - dasm_put(Dst, 13813, -BCBIAS_J*4, BC_JLOOP); + dasm_put(Dst, 13971, -BCBIAS_J*4, BC_JLOOP); } else if (op == BC_IFORL) { - dasm_put(Dst, 13827, -BCBIAS_J*4); + dasm_put(Dst, 13985, -BCBIAS_J*4); } else { - dasm_put(Dst, 13823, BC_JLOOP); + dasm_put(Dst, 13981, BC_JLOOP); } - dasm_put(Dst, 9510); + dasm_put(Dst, 9668); if (sse) { - dasm_put(Dst, 13837); + dasm_put(Dst, 13995); } break; case BC_ITERL: #if LJ_HASJIT - dasm_put(Dst, 13656, HOTCOUNT_PCMASK, GG_DISP2HOT); + dasm_put(Dst, 13814, HOTCOUNT_PCMASK, GG_DISP2HOT); #endif break; @@ -2154,33 +2168,33 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) break; #endif case BC_IITERL: - dasm_put(Dst, 13848, LJ_TNIL); + dasm_put(Dst, 14006, LJ_TNIL); if (op == BC_JITERL) { - dasm_put(Dst, 13863, BC_JLOOP); + dasm_put(Dst, 14021, BC_JLOOP); } else { - dasm_put(Dst, 13877, -BCBIAS_J*4); + dasm_put(Dst, 14035, -BCBIAS_J*4); } - dasm_put(Dst, 9814); + dasm_put(Dst, 9972); break; case BC_LOOP: #if LJ_HASJIT - dasm_put(Dst, 13656, HOTCOUNT_PCMASK, GG_DISP2HOT); + dasm_put(Dst, 13814, HOTCOUNT_PCMASK, GG_DISP2HOT); #endif break; case BC_ILOOP: - dasm_put(Dst, 9512); + dasm_put(Dst, 9670); break; case BC_JLOOP: #if LJ_HASJIT - dasm_put(Dst, 13893, DISPATCH_J(trace), DtD(->mcode), DISPATCH_GL(jit_base), DISPATCH_GL(jit_L)); + dasm_put(Dst, 14051, DISPATCH_J(trace), DtD(->mcode), DISPATCH_GL(jit_base), DISPATCH_GL(jit_L)); #endif break; case BC_JMP: - dasm_put(Dst, 13934, -BCBIAS_J*4); + dasm_put(Dst, 14092, -BCBIAS_J*4); break; /* -- Function headers -------------------------------------------------- */ @@ -2194,7 +2208,7 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) case BC_FUNCF: #if LJ_HASJIT - dasm_put(Dst, 13960, HOTCOUNT_PCMASK, GG_DISP2HOT); + dasm_put(Dst, 14118, HOTCOUNT_PCMASK, GG_DISP2HOT); #endif case BC_FUNCV: /* NYI: compiled vararg functions. */ break; @@ -2204,13 +2218,13 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) break; #endif case BC_IFUNCF: - dasm_put(Dst, 13981, -4+PC2PROTO(k), Dt1(->maxstack), -4+PC2PROTO(numparams)); + dasm_put(Dst, 14139, -4+PC2PROTO(k), Dt1(->maxstack), -4+PC2PROTO(numparams)); if (op == BC_JFUNCF) { - dasm_put(Dst, 14012, BC_JLOOP); + dasm_put(Dst, 14170, BC_JLOOP); } else { - dasm_put(Dst, 9512); + dasm_put(Dst, 9670); } - dasm_put(Dst, 14021, LJ_TNIL); + dasm_put(Dst, 14179, LJ_TNIL); break; case BC_JFUNCV: @@ -2221,30 +2235,30 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) break; /* NYI: compiled vararg functions. */ case BC_IFUNCV: - dasm_put(Dst, 14043, FRAME_VARG, Dt1(->maxstack), -4+PC2PROTO(numparams), LJ_TNIL); + dasm_put(Dst, 14201, FRAME_VARG, Dt1(->maxstack), -4+PC2PROTO(numparams), LJ_TNIL); if (op == BC_JFUNCV) { - dasm_put(Dst, 14012, BC_JLOOP); + dasm_put(Dst, 14170, BC_JLOOP); } else { - dasm_put(Dst, 14140, -4+PC2PROTO(k)); + dasm_put(Dst, 14298, -4+PC2PROTO(k)); } - dasm_put(Dst, 14165, LJ_TNIL); + dasm_put(Dst, 14323, LJ_TNIL); break; case BC_FUNCC: case BC_FUNCCW: - dasm_put(Dst, 14187, Dt8(->f), Dt1(->base), 8*LUA_MINSTACK, Dt1(->maxstack), Dt1(->top)); + dasm_put(Dst, 14345, Dt8(->f), Dt1(->base), 8*LUA_MINSTACK, Dt1(->maxstack), Dt1(->top)); if (op == BC_FUNCC) { - dasm_put(Dst, 14217); + dasm_put(Dst, 14375); } else { - dasm_put(Dst, 14221); + dasm_put(Dst, 14379); } - dasm_put(Dst, 14229, DISPATCH_GL(vmstate), ~LJ_VMST_C); + dasm_put(Dst, 14387, DISPATCH_GL(vmstate), ~LJ_VMST_C); if (op == BC_FUNCC) { - dasm_put(Dst, 14239); + dasm_put(Dst, 14397); } else { - dasm_put(Dst, 14244, DISPATCH_GL(wrapf)); + dasm_put(Dst, 14402, DISPATCH_GL(wrapf)); } - dasm_put(Dst, 14250, DISPATCH_GL(vmstate), ~LJ_VMST_INTERP, Dt1(->base), Dt1(->top)); + dasm_put(Dst, 14408, DISPATCH_GL(vmstate), ~LJ_VMST_INTERP, Dt1(->base), Dt1(->top)); break; /* ---------------------------------------------------------------------- */ @@ -2272,7 +2286,7 @@ static int build_backend(BuildCtx *ctx) build_subroutines(ctx, cmov, sse); - dasm_put(Dst, 14276); + dasm_put(Dst, 14434); 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 94dbe50f..84b94f1a 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[14223] = { +static const unsigned char build_actionlist[14340] = { 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, @@ -471,239 +471,245 @@ static const unsigned char build_actionlist[14223] = { 221,217,195,255,221,225,223,224,252,246,196,1,15,132,244,248,217,201,248, 2,221,216,195,248,1,221,225,223,224,252,246,196,1,15,133,244,248,217,201, 248,2,221,216,195,255,248,155,137,200,86,72,137,214,83,15,162,137,6,137,94, - 4,137,78,8,137,86,12,91,94,195,255,129,124,253,202,4,239,15,135,244,41,129, - 124,253,194,4,239,15,135,244,41,255,252,242,15,16,4,194,131,198,4,102,15, - 46,4,202,255,221,4,202,221,4,194,131,198,4,255,223,252,233,221,216,255,218, - 252,233,223,224,158,255,15,134,244,248,255,15,131,244,248,255,248,1,15,183, - 70,252,254,141,180,253,134,233,248,2,139,6,15,182,204,15,182,232,131,198, - 4,193,232,16,252,255,36,252,235,255,139,108,194,4,131,198,4,129,252,253,239, - 15,135,244,251,129,124,253,202,4,239,15,135,244,251,255,252,242,15,16,4,194, - 102,15,46,4,202,255,221,4,202,221,4,194,255,15,138,244,248,15,133,244,248, - 255,15,138,244,248,15,132,244,247,255,248,1,15,183,70,252,254,141,180,253, - 134,233,248,2,255,248,2,15,183,70,252,254,141,180,253,134,233,248,1,255,248, - 5,57,108,202,4,15,133,244,2,129,252,253,239,15,131,244,1,139,12,202,139,4, - 194,57,193,15,132,244,1,129,252,253,239,15,135,244,2,139,169,233,133,252, - 237,15,132,244,2,252,246,133,233,235,15,133,244,2,255,49,252,237,255,189, - 1,0,0,0,255,252,233,244,45,255,72,252,247,208,131,198,4,129,124,253,202,4, - 239,15,133,244,248,139,12,202,59,12,135,255,131,198,4,129,124,253,202,4,239, - 15,135,244,248,255,252,242,15,16,4,199,102,15,46,4,202,255,221,4,202,221, - 4,199,255,72,252,247,208,131,198,4,57,68,202,4,255,139,108,194,4,131,198, - 4,129,252,253,239,255,15,131,244,247,255,15,130,244,247,255,137,108,202,4, - 139,44,194,137,44,202,255,15,183,70,252,254,141,180,253,134,233,248,1,139, - 6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,252,235,255,72,139, - 44,194,72,137,44,202,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252, - 255,36,252,235,255,49,252,237,129,124,253,194,4,239,129,213,239,137,108,202, - 4,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,252,235,255, - 129,124,253,194,4,239,15,135,244,48,255,252,242,15,16,4,194,72,184,237,237, - 102,72,15,110,200,15,87,193,252,242,15,17,4,202,255,221,4,194,217,224,221, - 28,202,255,129,124,253,194,4,239,15,133,244,248,139,4,194,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,50,139,12,194,137,213,232,251,1,18, - 255,252,242,15,42,192,137,252,234,255,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,135,244,46,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,135,244,47,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, - 135,244,49,129,124,253,194,4,239,15,135,244,49,255,252,242,15,16,4,252,234, - 252,242,15,88,4,194,255,221,4,252,234,220,4,194,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,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,156,232,244,148,255,252,233,244,156,255,232,244,107, - 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,33,137,205,137,116,36,100,232,251,1,25,139,149,233,133, - 192,15,133,244,42,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,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, - 26,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,26,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,27,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,28,139,149,233,15,182,78,252,253, + 4,137,78,8,137,86,12,91,94,195,248,156,255,85,72,137,229,83,72,137,203,139, + 131,233,72,41,196,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,255,15,40,155, + 233,248,5,252,255,147,233,72,137,131,233,15,41,131,233,72,139,93,252,248, + 201,195,255,129,124,253,202,4,239,15,135,244,41,129,124,253,194,4,239,15, + 135,244,41,255,252,242,15,16,4,194,131,198,4,102,15,46,4,202,255,221,4,202, + 221,4,194,131,198,4,255,223,252,233,221,216,255,218,252,233,223,224,158,255, + 15,134,244,248,255,15,131,244,248,255,248,1,15,183,70,252,254,141,180,253, + 134,233,248,2,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36, + 252,235,255,139,108,194,4,131,198,4,129,252,253,239,15,135,244,251,129,124, + 253,202,4,239,15,135,244,251,255,252,242,15,16,4,194,102,15,46,4,202,255, + 221,4,202,221,4,194,255,15,138,244,248,15,133,244,248,255,15,138,244,248, + 15,132,244,247,255,248,1,15,183,70,252,254,141,180,253,134,233,248,2,255, + 248,2,15,183,70,252,254,141,180,253,134,233,248,1,255,248,5,57,108,202,4, + 15,133,244,2,129,252,253,239,15,131,244,1,139,12,202,139,4,194,57,193,15, + 132,244,1,129,252,253,239,15,135,244,2,139,169,233,133,252,237,15,132,244, + 2,252,246,133,233,235,15,133,244,2,255,49,252,237,255,189,1,0,0,0,255,252, + 233,244,45,255,72,252,247,208,131,198,4,129,124,253,202,4,239,15,133,244, + 248,139,12,202,59,12,135,255,131,198,4,129,124,253,202,4,239,15,135,244,248, + 255,252,242,15,16,4,199,102,15,46,4,202,255,221,4,202,221,4,199,255,72,252, + 247,208,131,198,4,57,68,202,4,255,139,108,194,4,131,198,4,129,252,253,239, + 255,15,131,244,247,255,15,130,244,247,255,137,108,202,4,139,44,194,137,44, + 202,255,15,183,70,252,254,141,180,253,134,233,248,1,139,6,15,182,204,15,182, + 232,131,198,4,193,232,16,252,255,36,252,235,255,72,139,44,194,72,137,44,202, + 139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,252,235,255,49, + 252,237,129,124,253,194,4,239,129,213,239,137,108,202,4,139,6,15,182,204, + 15,182,232,131,198,4,193,232,16,252,255,36,252,235,255,129,124,253,194,4, + 239,15,135,244,48,255,252,242,15,16,4,194,72,184,237,237,102,72,15,110,200, + 15,87,193,252,242,15,17,4,202,255,221,4,194,217,224,221,28,202,255,129,124, + 253,194,4,239,15,133,244,248,139,4,194,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,50,139,12,194,137,213,232,251,1,18,255,252,242,15,42, + 192,137,252,234,255,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,135,244,46,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,135,244,47,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,135,244,49,129,124,253, + 194,4,239,15,135,244,49,255,252,242,15,16,4,252,234,252,242,15,88,4,194,255, + 221,4,252,234,220,4,194,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,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,157, + 232,244,148,255,252,233,244,157,255,232,244,107,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,33,137,205, + 137,116,36,100,232,251,1,25,139,149,233,133,192,15,133,244,42,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,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,26,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,26,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,27,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,28,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,29,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,29, - 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,30,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,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,137,252,233,232,251,1,30, - 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,157,255,72,252,247,208,139,106, - 252,248,139,173,233,139,4,135,252,233,244,158,255,15,182,252,236,15,182,192, - 129,124,253,252,234,4,239,15,133,244,36,139,44,252,234,129,124,253,194,4, - 239,15,135,244,251,255,252,242,15,16,4,194,252,242,15,45,192,252,242,15,42, - 200,102,15,46,193,255,15,133,244,36,59,133,233,15,131,244,36,193,224,3,3, - 133,233,129,120,253,4,239,15,132,244,248,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,36,15, - 182,78,252,253,248,3,255,199,68,202,4,237,252,233,244,1,248,5,129,124,253, - 194,4,239,15,133,244,36,139,4,194,252,233,244,157,255,15,182,252,236,15,182, - 192,72,252,247,208,139,4,135,129,124,253,252,234,4,239,15,133,244,34,139, - 44,252,234,248,157,139,141,233,35,136,233,105,201,239,3,141,233,248,1,129, - 185,233,239,15,133,244,250,57,129,233,15,133,244,250,129,121,253,4,239,15, - 132,244,251,15,182,70,252,253,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,34,255,15,182,252,236,15,182,192,129,124,253,252,234,4,239,15, - 133,244,35,139,44,252,234,59,133,233,15,131,244,35,193,224,3,3,133,233,129, - 120,253,4,239,15,132,244,248,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,35,255,15,182,78,252, - 253,248,3,199,68,202,4,237,252,233,244,1,255,15,182,252,236,15,182,192,129, - 124,253,252,234,4,239,15,133,244,39,139,44,252,234,129,124,253,194,4,239, - 15,135,244,251,255,15,133,244,39,59,133,233,15,131,244,39,193,224,3,3,133, - 233,129,120,253,4,239,15,132,244,249,248,1,252,246,133,233,235,15,133,244, - 253,248,2,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,255, - 252,246,129,233,235,15,132,244,39,15,182,78,252,253,252,233,244,1,248,5,129, - 124,253,194,4,239,15,133,244,39,139,4,194,252,233,244,158,248,7,128,165,233, - 235,139,139,233,137,171,233,137,141,233,15,182,78,252,253,252,233,244,2,255, - 15,182,252,236,15,182,192,72,252,247,208,139,4,135,129,124,253,252,234,4, - 239,15,133,244,37,139,44,252,234,248,158,139,141,233,35,136,233,105,201,239, - 198,133,233,0,3,141,233,248,1,129,185,233,239,15,133,244,251,57,129,233,15, - 133,244,251,129,121,253,4,239,15,132,244,250,248,2,255,252,246,133,233,235, - 15,133,244,253,248,3,15,182,70,252,253,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,37, - 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,37,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,32,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,38,139,44,252,234,59,133,233,15,131,244,38,193,224,3,3,133, - 233,129,120,253,4,239,15,132,244,249,248,1,252,246,133,233,235,15,133,244, - 253,248,2,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,38,15,182,78,252,253,252,233,244,1,248,7,128, - 165,233,235,139,139,233,137,171,233,137,141,233,15,182,78,252,253,252,233, - 244,2,255,137,124,36,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,33,139,149,233,15,182,78,252,253,252,233,244,1,248,7,255,128, - 165,233,235,139,131,233,137,171,233,137,133,233,252,233,244,2,255,3,68,36, - 84,255,129,124,253,202,4,239,139,44,202,15,133,244,51,141,84,202,8,137,114, - 252,252,139,181,233,139,14,15,182,252,233,15,182,205,131,198,4,252,255,36, - 252,235,255,141,76,202,8,137,215,139,105,252,248,129,121,253,252,252,239, - 15,133,244,28,248,52,139,114,252,252,252,247,198,237,15,133,244,253,248,1, - 137,106,252,248,137,68,36,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,28,137,202,137,114,252,252,139,181,233,139, - 14,15,182,252,233,15,182,205,131,198,4,252,255,36,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,252,242,15,42,192,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,140, - 255,141,12,202,255,129,121,253,4,239,15,135,244,53,129,121,253,12,239,15, - 135,244,53,255,139,105,20,255,129,252,253,239,15,135,244,53,255,252,242,15, - 16,1,252,242,15,16,73,8,255,252,242,15,88,65,16,252,242,15,17,1,133,252,237, - 15,136,244,249,255,15,140,244,249,255,102,15,46,200,248,1,252,242,15,17,65, - 24,255,221,65,8,221,1,255,220,65,16,221,17,221,81,24,133,252,237,15,136,244, - 247,255,221,81,24,15,140,244,247,255,217,201,248,1,255,15,183,70,252,254, - 255,15,131,244,248,141,180,253,134,233,255,141,180,253,134,233,15,183,70, - 252,254,15,131,245,255,15,130,244,248,141,180,253,134,233,255,248,3,102,15, - 46,193,252,233,244,1,255,141,12,202,139,105,4,129,252,253,239,15,132,244, - 247,255,137,105,252,252,139,41,137,105,252,248,252,233,245,255,141,180,253, - 134,233,139,1,137,105,252,252,137,65,252,248,255,139,139,233,139,4,129,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,142,255,139,190,233,139,108,36,96,141,12,202,59,141,233, - 15,135,244,23,15,182,142,233,57,200,15,134,244,249,248,2,255,15,183,70,252, - 254,252,233,245,255,248,3,199,68,194,252,252,237,131,192,1,57,200,15,134, - 244,3,252,233,244,2,255,141,44,197,237,141,4,194,139,122,252,248,137,104, - 252,252,137,120,252,248,139,108,36,96,141,12,200,59,141,233,15,135,244,22, - 137,209,137,194,15,182,174,233,133,252,237,15,132,244,248,248,1,131,193,8, - 57,209,15,131,244,249,139,121,252,248,137,56,139,121,252,252,137,120,4,131, - 192,8,199,65,252,252,237,131,252,237,1,15,133,244,1,248,2,255,139,190,233, - 139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,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,137,252,233,255,72,137,252,250,137,252, - 233,255,15,135,244,21,199,131,233,237,255,252,255,215,255,252,255,147,233, - 255,199,131,233,237,139,149,233,141,12,194,252,247,217,3,141,233,139,114, - 252,252,252,233,244,12,255,254,0 + 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,30,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,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,137,252,233,232,251,1,30,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,158,255,72,252,247,208,139,106,252,248,139,173,233,139,4,135,252,233, + 244,159,255,15,182,252,236,15,182,192,129,124,253,252,234,4,239,15,133,244, + 36,139,44,252,234,129,124,253,194,4,239,15,135,244,251,255,252,242,15,16, + 4,194,252,242,15,45,192,252,242,15,42,200,102,15,46,193,255,15,133,244,36, + 59,133,233,15,131,244,36,193,224,3,3,133,233,129,120,253,4,239,15,132,244, + 248,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,36,15,182,78,252,253,248,3,255,199,68,202, + 4,237,252,233,244,1,248,5,129,124,253,194,4,239,15,133,244,36,139,4,194,252, + 233,244,158,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,34,139,44,252,234,248,158,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,34,255,15,182,252,236, + 15,182,192,129,124,253,252,234,4,239,15,133,244,35,139,44,252,234,59,133, + 233,15,131,244,35,193,224,3,3,133,233,129,120,253,4,239,15,132,244,248,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,35,255,15,182,78,252,253,248,3,199,68,202,4,237, + 252,233,244,1,255,15,182,252,236,15,182,192,129,124,253,252,234,4,239,15, + 133,244,39,139,44,252,234,129,124,253,194,4,239,15,135,244,251,255,15,133, + 244,39,59,133,233,15,131,244,39,193,224,3,3,133,233,129,120,253,4,239,15, + 132,244,249,248,1,252,246,133,233,235,15,133,244,253,248,2,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,255,252,246,129,233,235, + 15,132,244,39,15,182,78,252,253,252,233,244,1,248,5,129,124,253,194,4,239, + 15,133,244,39,139,4,194,252,233,244,159,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, + 37,139,44,252,234,248,159,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,37,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,37,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,32,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,38,139,44,252,234,59,133,233,15,131,244,38,193,224,3,3,133,233,129,120, + 253,4,239,15,132,244,249,248,1,252,246,133,233,235,15,133,244,253,248,2,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,38,15,182,78,252,253,252,233,244,1,248,7,128,165,233,235, + 139,139,233,137,171,233,137,141,233,15,182,78,252,253,252,233,244,2,255,137, + 124,36,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,33, + 139,149,233,15,182,78,252,253,252,233,244,1,248,7,255,128,165,233,235,139, + 131,233,137,171,233,137,133,233,252,233,244,2,255,3,68,36,84,255,129,124, + 253,202,4,239,139,44,202,15,133,244,51,141,84,202,8,137,114,252,252,139,181, + 233,139,14,15,182,252,233,15,182,205,131,198,4,252,255,36,252,235,255,141, + 76,202,8,137,215,139,105,252,248,129,121,253,252,252,239,15,133,244,28,248, + 52,139,114,252,252,252,247,198,237,15,133,244,253,248,1,137,106,252,248,137, + 68,36,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,28,137,202,137,114,252,252,139,181,233,139,14,15,182,252,233,15,182, + 205,131,198,4,252,255,36,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,252,242,15,42,192, + 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,140,255,141,12,202, + 255,129,121,253,4,239,15,135,244,53,129,121,253,12,239,15,135,244,53,255, + 139,105,20,255,129,252,253,239,15,135,244,53,255,252,242,15,16,1,252,242, + 15,16,73,8,255,252,242,15,88,65,16,252,242,15,17,1,133,252,237,15,136,244, + 249,255,15,140,244,249,255,102,15,46,200,248,1,252,242,15,17,65,24,255,221, + 65,8,221,1,255,220,65,16,221,17,221,81,24,133,252,237,15,136,244,247,255, + 221,81,24,15,140,244,247,255,217,201,248,1,255,15,183,70,252,254,255,15,131, + 244,248,141,180,253,134,233,255,141,180,253,134,233,15,183,70,252,254,15, + 131,245,255,15,130,244,248,141,180,253,134,233,255,248,3,102,15,46,193,252, + 233,244,1,255,141,12,202,139,105,4,129,252,253,239,15,132,244,247,255,137, + 105,252,252,139,41,137,105,252,248,252,233,245,255,141,180,253,134,233,139, + 1,137,105,252,252,137,65,252,248,255,139,139,233,139,4,129,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, + 142,255,139,190,233,139,108,36,96,141,12,202,59,141,233,15,135,244,23,15, + 182,142,233,57,200,15,134,244,249,248,2,255,15,183,70,252,254,252,233,245, + 255,248,3,199,68,194,252,252,237,131,192,1,57,200,15,134,244,3,252,233,244, + 2,255,141,44,197,237,141,4,194,139,122,252,248,137,104,252,252,137,120,252, + 248,139,108,36,96,141,12,200,59,141,233,15,135,244,22,137,209,137,194,15, + 182,174,233,133,252,237,15,132,244,248,248,1,131,193,8,57,209,15,131,244, + 249,139,121,252,248,137,56,139,121,252,252,137,120,4,131,192,8,199,65,252, + 252,237,131,252,237,1,15,133,244,1,248,2,255,139,190,233,139,6,15,182,204, + 15,182,232,131,198,4,193,232,16,252,255,36,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,137,252,233,255,72,137,252,250,137,252,233,255,15,135, + 244,21,199,131,233,237,255,252,255,215,255,252,255,147,233,255,199,131,233, + 237,139,149,233,141,12,194,252,247,217,3,141,233,139,114,252,252,252,233, + 244,12,255,254,0 }; enum { @@ -853,6 +859,7 @@ enum { GLOB_vm_foldfpm, GLOB_vm_foldarith, GLOB_vm_cpuid, + GLOB_vm_ffi_call, GLOB_BC_MODVN_Z, GLOB_BC_TGETS_Z, GLOB_BC_TSETS_Z, @@ -1005,6 +1012,7 @@ static const char *const globnames[] = { "vm_foldfpm", "vm_foldarith", "vm_cpuid", + "vm_ffi_call@4", "BC_MODVN_Z", "BC_TGETS_Z", "BC_TSETS_Z", @@ -1445,6 +1453,11 @@ static void build_subroutines(BuildCtx *ctx, int cmov, int sse) dasm_put(Dst, 8995); } dasm_put(Dst, 9413); +#if LJ_HASFFI +#define DtE(_V) (int)(ptrdiff_t)&(((CCallState *)0)_V) + dasm_put(Dst, 9441, DtE(->spadj), 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])); + dasm_put(Dst, 9530, DtE(->fpr[3]), DtE(->func), DtE(->gpr[0]), DtE(->fpr[0])); +#endif } /* Generate the code for a single instruction. */ @@ -1460,20 +1473,20 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) /* Remember: all ops branch for a true comparison, fall through otherwise. */ case BC_ISLT: case BC_ISGE: case BC_ISLE: case BC_ISGT: - dasm_put(Dst, 9439, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 9556, LJ_TISNUM, LJ_TISNUM); if (sse) { - dasm_put(Dst, 9460); + dasm_put(Dst, 9577); } else { - dasm_put(Dst, 9475); + dasm_put(Dst, 9592); if (cmov) { - dasm_put(Dst, 9485); + dasm_put(Dst, 9602); } else { - dasm_put(Dst, 9491); + dasm_put(Dst, 9608); } } switch (op) { case BC_ISLT: - dasm_put(Dst, 9498); + dasm_put(Dst, 9615); break; case BC_ISGE: dasm_put(Dst, 9293); @@ -1482,599 +1495,599 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) dasm_put(Dst, 5854); break; case BC_ISGT: - dasm_put(Dst, 9503); + dasm_put(Dst, 9620); break; default: break; /* Shut up GCC. */ } - dasm_put(Dst, 9508, -BCBIAS_J*4); + dasm_put(Dst, 9625, -BCBIAS_J*4); break; case BC_ISEQV: case BC_ISNEV: vk = op == BC_ISEQV; - dasm_put(Dst, 9542, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 9659, LJ_TISNUM, LJ_TISNUM); if (sse) { - dasm_put(Dst, 9568); + dasm_put(Dst, 9685); } else { - dasm_put(Dst, 9580); + dasm_put(Dst, 9697); if (cmov) { - dasm_put(Dst, 9485); + dasm_put(Dst, 9602); } else { - dasm_put(Dst, 9491); + dasm_put(Dst, 9608); } } iseqne_fp: if (vk) { - dasm_put(Dst, 9587); + dasm_put(Dst, 9704); } else { - dasm_put(Dst, 9596); + dasm_put(Dst, 9713); } iseqne_end: if (vk) { - dasm_put(Dst, 9605, -BCBIAS_J*4); + dasm_put(Dst, 9722, -BCBIAS_J*4); } else { - dasm_put(Dst, 9620, -BCBIAS_J*4); + dasm_put(Dst, 9737, -BCBIAS_J*4); } - dasm_put(Dst, 9522); + dasm_put(Dst, 9639); if (op == BC_ISEQV || op == BC_ISNEV) { - dasm_put(Dst, 9635, LJ_TISPRI, LJ_TISTABUD, Dt6(->metatable), Dt6(->nomm), 1<metatable), Dt6(->nomm), 1<>32)); + dasm_put(Dst, 10034, (unsigned int)(U64x(80000000,00000000)), (unsigned int)((U64x(80000000,00000000))>>32)); } else { - dasm_put(Dst, 9942); + dasm_put(Dst, 10059); } - dasm_put(Dst, 9522); + dasm_put(Dst, 9639); break; case BC_LEN: - dasm_put(Dst, 9951, LJ_TSTR); + dasm_put(Dst, 10068, LJ_TSTR); if (sse) { - dasm_put(Dst, 9965, Dt5(->len)); + dasm_put(Dst, 10082, Dt5(->len)); } else { - dasm_put(Dst, 9983, Dt5(->len)); + dasm_put(Dst, 10100, Dt5(->len)); } - dasm_put(Dst, 9992, LJ_TTAB); + dasm_put(Dst, 10109, LJ_TTAB); if (sse) { - dasm_put(Dst, 10033); + dasm_put(Dst, 10150); } else { } - dasm_put(Dst, 10042); + dasm_put(Dst, 10159); break; /* -- Binary ops -------------------------------------------------------- */ case BC_ADDVN: case BC_ADDNV: case BC_ADDVV: - dasm_put(Dst, 10052); + dasm_put(Dst, 10169); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 10060, LJ_TISNUM); + dasm_put(Dst, 10177, LJ_TISNUM); if (sse) { - dasm_put(Dst, 10072); + dasm_put(Dst, 10189); } else { - dasm_put(Dst, 10086); + dasm_put(Dst, 10203); } break; case 1: - dasm_put(Dst, 10094, LJ_TISNUM); + dasm_put(Dst, 10211, LJ_TISNUM); if (sse) { - dasm_put(Dst, 10106); + dasm_put(Dst, 10223); } else { - dasm_put(Dst, 10120); + dasm_put(Dst, 10237); } break; default: - dasm_put(Dst, 10128, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 10245, LJ_TISNUM, LJ_TISNUM); if (sse) { - dasm_put(Dst, 10150); + dasm_put(Dst, 10267); } else { - dasm_put(Dst, 10164); + dasm_put(Dst, 10281); } break; } if (sse) { - dasm_put(Dst, 9935); + dasm_put(Dst, 10052); } else { - dasm_put(Dst, 9947); + dasm_put(Dst, 10064); } - dasm_put(Dst, 9522); + dasm_put(Dst, 9639); break; case BC_SUBVN: case BC_SUBNV: case BC_SUBVV: - dasm_put(Dst, 10052); + dasm_put(Dst, 10169); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 10060, LJ_TISNUM); + dasm_put(Dst, 10177, LJ_TISNUM); if (sse) { - dasm_put(Dst, 10172); + dasm_put(Dst, 10289); } else { - dasm_put(Dst, 10186); + dasm_put(Dst, 10303); } break; case 1: - dasm_put(Dst, 10094, LJ_TISNUM); + dasm_put(Dst, 10211, LJ_TISNUM); if (sse) { - dasm_put(Dst, 10194); + dasm_put(Dst, 10311); } else { - dasm_put(Dst, 10208); + dasm_put(Dst, 10325); } break; default: - dasm_put(Dst, 10128, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 10245, LJ_TISNUM, LJ_TISNUM); if (sse) { - dasm_put(Dst, 10216); + dasm_put(Dst, 10333); } else { - dasm_put(Dst, 10230); + dasm_put(Dst, 10347); } break; } if (sse) { - dasm_put(Dst, 9935); + dasm_put(Dst, 10052); } else { - dasm_put(Dst, 9947); + dasm_put(Dst, 10064); } - dasm_put(Dst, 9522); + dasm_put(Dst, 9639); break; case BC_MULVN: case BC_MULNV: case BC_MULVV: - dasm_put(Dst, 10052); + dasm_put(Dst, 10169); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 10060, LJ_TISNUM); + dasm_put(Dst, 10177, LJ_TISNUM); if (sse) { - dasm_put(Dst, 10238); + dasm_put(Dst, 10355); } else { - dasm_put(Dst, 10252); + dasm_put(Dst, 10369); } break; case 1: - dasm_put(Dst, 10094, LJ_TISNUM); + dasm_put(Dst, 10211, LJ_TISNUM); if (sse) { - dasm_put(Dst, 10260); + dasm_put(Dst, 10377); } else { - dasm_put(Dst, 10274); + dasm_put(Dst, 10391); } break; default: - dasm_put(Dst, 10128, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 10245, LJ_TISNUM, LJ_TISNUM); if (sse) { - dasm_put(Dst, 10282); + dasm_put(Dst, 10399); } else { - dasm_put(Dst, 10296); + dasm_put(Dst, 10413); } break; } if (sse) { - dasm_put(Dst, 9935); + dasm_put(Dst, 10052); } else { - dasm_put(Dst, 9947); + dasm_put(Dst, 10064); } - dasm_put(Dst, 9522); + dasm_put(Dst, 9639); break; case BC_DIVVN: case BC_DIVNV: case BC_DIVVV: - dasm_put(Dst, 10052); + dasm_put(Dst, 10169); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 10060, LJ_TISNUM); + dasm_put(Dst, 10177, LJ_TISNUM); if (sse) { - dasm_put(Dst, 10304); + dasm_put(Dst, 10421); } else { - dasm_put(Dst, 10318); + dasm_put(Dst, 10435); } break; case 1: - dasm_put(Dst, 10094, LJ_TISNUM); + dasm_put(Dst, 10211, LJ_TISNUM); if (sse) { - dasm_put(Dst, 10326); + dasm_put(Dst, 10443); } else { - dasm_put(Dst, 10340); + dasm_put(Dst, 10457); } break; default: - dasm_put(Dst, 10128, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 10245, LJ_TISNUM, LJ_TISNUM); if (sse) { - dasm_put(Dst, 10348); + dasm_put(Dst, 10465); } else { - dasm_put(Dst, 10362); + dasm_put(Dst, 10479); } break; } if (sse) { - dasm_put(Dst, 9935); + dasm_put(Dst, 10052); } else { - dasm_put(Dst, 9947); + dasm_put(Dst, 10064); } - dasm_put(Dst, 9522); + dasm_put(Dst, 9639); break; case BC_MODVN: - dasm_put(Dst, 10052); + dasm_put(Dst, 10169); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 10060, LJ_TISNUM); + dasm_put(Dst, 10177, LJ_TISNUM); if (sse) { - dasm_put(Dst, 10370); + dasm_put(Dst, 10487); } else { - dasm_put(Dst, 10384); + dasm_put(Dst, 10501); } break; case 1: - dasm_put(Dst, 10094, LJ_TISNUM); + dasm_put(Dst, 10211, LJ_TISNUM); if (sse) { - dasm_put(Dst, 10392); + dasm_put(Dst, 10509); } else { - dasm_put(Dst, 10406); + dasm_put(Dst, 10523); } break; default: - dasm_put(Dst, 10128, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 10245, LJ_TISNUM, LJ_TISNUM); if (sse) { - dasm_put(Dst, 10414); + dasm_put(Dst, 10531); } else { - dasm_put(Dst, 10428); + dasm_put(Dst, 10545); } break; } - dasm_put(Dst, 10436); + dasm_put(Dst, 10553); if (sse) { - dasm_put(Dst, 9935); + dasm_put(Dst, 10052); } else { - dasm_put(Dst, 9947); + dasm_put(Dst, 10064); } - dasm_put(Dst, 9522); + dasm_put(Dst, 9639); break; case BC_MODNV: case BC_MODVV: - dasm_put(Dst, 10052); + dasm_put(Dst, 10169); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 10060, LJ_TISNUM); + dasm_put(Dst, 10177, LJ_TISNUM); if (sse) { - dasm_put(Dst, 10370); + dasm_put(Dst, 10487); } else { - dasm_put(Dst, 10384); + dasm_put(Dst, 10501); } break; case 1: - dasm_put(Dst, 10094, LJ_TISNUM); + dasm_put(Dst, 10211, LJ_TISNUM); if (sse) { - dasm_put(Dst, 10392); + dasm_put(Dst, 10509); } else { - dasm_put(Dst, 10406); + dasm_put(Dst, 10523); } break; default: - dasm_put(Dst, 10128, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 10245, LJ_TISNUM, LJ_TISNUM); if (sse) { - dasm_put(Dst, 10414); + dasm_put(Dst, 10531); } else { - dasm_put(Dst, 10428); + dasm_put(Dst, 10545); } break; } - dasm_put(Dst, 10442); + dasm_put(Dst, 10559); break; case BC_POW: - dasm_put(Dst, 10052); + dasm_put(Dst, 10169); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 10060, LJ_TISNUM); + dasm_put(Dst, 10177, LJ_TISNUM); if (sse) { - dasm_put(Dst, 10370); + dasm_put(Dst, 10487); } else { - dasm_put(Dst, 10384); + dasm_put(Dst, 10501); } break; case 1: - dasm_put(Dst, 10094, LJ_TISNUM); + dasm_put(Dst, 10211, LJ_TISNUM); if (sse) { - dasm_put(Dst, 10392); + dasm_put(Dst, 10509); } else { - dasm_put(Dst, 10406); + dasm_put(Dst, 10523); } break; default: - dasm_put(Dst, 10128, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 10245, LJ_TISNUM, LJ_TISNUM); if (sse) { - dasm_put(Dst, 10414); + dasm_put(Dst, 10531); } else { - dasm_put(Dst, 10428); + dasm_put(Dst, 10545); } break; } - dasm_put(Dst, 10447); + dasm_put(Dst, 10564); if (sse) { - dasm_put(Dst, 9935); + dasm_put(Dst, 10052); } else { - dasm_put(Dst, 9947); + dasm_put(Dst, 10064); } - dasm_put(Dst, 9522); + dasm_put(Dst, 9639); break; case BC_CAT: - dasm_put(Dst, 10451, Dt1(->base), Dt1(->base)); + dasm_put(Dst, 10568, Dt1(->base), Dt1(->base)); break; /* -- Constant ops ------------------------------------------------------ */ case BC_KSTR: - dasm_put(Dst, 10534, LJ_TSTR); + dasm_put(Dst, 10651, LJ_TSTR); break; case BC_KCDATA: #if LJ_HASFFI - dasm_put(Dst, 10534, LJ_TCDATA); + dasm_put(Dst, 10651, LJ_TCDATA); #endif break; case BC_KSHORT: if (sse) { - dasm_put(Dst, 10569); + dasm_put(Dst, 10686); } else { - dasm_put(Dst, 10584); + dasm_put(Dst, 10701); } - dasm_put(Dst, 9522); + dasm_put(Dst, 9639); break; case BC_KNUM: if (sse) { - dasm_put(Dst, 10592); + dasm_put(Dst, 10709); } else { - dasm_put(Dst, 10605); + dasm_put(Dst, 10722); } - dasm_put(Dst, 9522); + dasm_put(Dst, 9639); break; case BC_KPRI: - dasm_put(Dst, 10612); + dasm_put(Dst, 10729); break; case BC_KNIL: - dasm_put(Dst, 10640, LJ_TNIL); + dasm_put(Dst, 10757, LJ_TNIL); break; /* -- Upvalue and function ops ------------------------------------------ */ case BC_UGET: - dasm_put(Dst, 10687, offsetof(GCfuncL, uvptr), DtA(->v)); + dasm_put(Dst, 10804, offsetof(GCfuncL, uvptr), DtA(->v)); break; case BC_USETV: #define TV2MARKOFS \ ((int32_t)offsetof(GCupval, marked)-(int32_t)offsetof(GCupval, tv)) - dasm_put(Dst, 10727, 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, 10818); + dasm_put(Dst, 10844, 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, 10935); break; #undef TV2MARKOFS case BC_USETS: - dasm_put(Dst, 10830, 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, 10947, 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, 10923); + dasm_put(Dst, 11040); if (sse) { - dasm_put(Dst, 10928); + dasm_put(Dst, 11045); } else { - dasm_put(Dst, 9761); + dasm_put(Dst, 9878); } - dasm_put(Dst, 10935, offsetof(GCfuncL, uvptr), DtA(->v)); + dasm_put(Dst, 11052, offsetof(GCfuncL, uvptr), DtA(->v)); if (sse) { - dasm_put(Dst, 10944); + dasm_put(Dst, 11061); } else { - dasm_put(Dst, 10950); + dasm_put(Dst, 11067); } - dasm_put(Dst, 9522); + dasm_put(Dst, 9639); break; case BC_USETP: - dasm_put(Dst, 10953, offsetof(GCfuncL, uvptr), DtA(->v)); + dasm_put(Dst, 11070, offsetof(GCfuncL, uvptr), DtA(->v)); break; case BC_UCLO: - dasm_put(Dst, 10992, -BCBIAS_J*4, Dt1(->openupval), Dt1(->base), Dt1(->base)); + dasm_put(Dst, 11109, -BCBIAS_J*4, Dt1(->openupval), Dt1(->base), Dt1(->base)); break; case BC_FNEW: - dasm_put(Dst, 11047, Dt1(->base), Dt1(->base), LJ_TFUNC); + dasm_put(Dst, 11164, Dt1(->base), Dt1(->base), LJ_TFUNC); break; /* -- Table ops --------------------------------------------------------- */ case BC_TNEW: - dasm_put(Dst, 11113, Dt1(->base), DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), LJ_TTAB); + dasm_put(Dst, 11230, Dt1(->base), DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), LJ_TTAB); break; case BC_TDUP: - dasm_put(Dst, 11235, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), Dt1(->base), LJ_TTAB); + dasm_put(Dst, 11352, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), Dt1(->base), LJ_TTAB); break; case BC_GGET: - dasm_put(Dst, 11330, Dt7(->env)); + dasm_put(Dst, 11447, Dt7(->env)); break; case BC_GSET: - dasm_put(Dst, 11349, Dt7(->env)); + dasm_put(Dst, 11466, Dt7(->env)); break; case BC_TGETV: - dasm_put(Dst, 11368, LJ_TTAB, LJ_TISNUM); + dasm_put(Dst, 11485, LJ_TTAB, LJ_TISNUM); if (sse) { - dasm_put(Dst, 11401); + dasm_put(Dst, 11518); } else { } - dasm_put(Dst, 11422, 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, 11619, 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, 11736, 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)); - dasm_put(Dst, 11914, Dt6(->nomm), 1<marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); + dasm_put(Dst, 11952, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->metatable)); + dasm_put(Dst, 12031, Dt6(->nomm), 1<marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); break; case BC_TSETS: - dasm_put(Dst, 11976, 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, 12052, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<next)); - dasm_put(Dst, 12140, Dt6(->metatable), Dt6(->nomm), 1<base), Dt1(->base), Dt6(->marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); + dasm_put(Dst, 12093, 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, 12169, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<next)); + dasm_put(Dst, 12257, Dt6(->metatable), Dt6(->nomm), 1<base), Dt1(->base), Dt6(->marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); break; case BC_TSETB: - dasm_put(Dst, 12231, LJ_TTAB, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable)); - dasm_put(Dst, 12325, Dt6(->metatable), Dt6(->nomm), 1<marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); + dasm_put(Dst, 12348, LJ_TTAB, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable)); + dasm_put(Dst, 12442, Dt6(->metatable), Dt6(->nomm), 1<marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); break; case BC_TSETM: - dasm_put(Dst, 12371, Dt6(->marked), LJ_GC_BLACK, Dt6(->asize), Dt6(->array), Dt1(->base), Dt1(->base)); - dasm_put(Dst, 12514, Dt6(->marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); + dasm_put(Dst, 12488, Dt6(->marked), LJ_GC_BLACK, Dt6(->asize), Dt6(->array), Dt1(->base), Dt1(->base)); + dasm_put(Dst, 12631, Dt6(->marked), cast_byte(~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, 10056); + dasm_put(Dst, 10173); if (op == BC_CALLM) { - dasm_put(Dst, 12532); + dasm_put(Dst, 12649); } - dasm_put(Dst, 12537, LJ_TFUNC, Dt7(->pc)); + dasm_put(Dst, 12654, LJ_TFUNC, Dt7(->pc)); break; case BC_CALLMT: - dasm_put(Dst, 12532); + dasm_put(Dst, 12649); break; case BC_CALLT: - dasm_put(Dst, 12579, LJ_TFUNC, FRAME_TYPE, Dt7(->ffid), Dt7(->pc)); - dasm_put(Dst, 12694, FRAME_TYPE, Dt7(->pc), PC2PROTO(k), FRAME_VARG, FRAME_TYPEP, FRAME_VARG); + dasm_put(Dst, 12696, LJ_TFUNC, FRAME_TYPE, Dt7(->ffid), Dt7(->pc)); + dasm_put(Dst, 12811, FRAME_TYPE, Dt7(->pc), PC2PROTO(k), FRAME_VARG, FRAME_TYPEP, FRAME_VARG); break; case BC_ITERC: - dasm_put(Dst, 12765, LJ_TFUNC, 2+1, Dt7(->pc)); + dasm_put(Dst, 12882, LJ_TFUNC, 2+1, Dt7(->pc)); break; case BC_ITERN: #if LJ_HASJIT #endif - dasm_put(Dst, 12836, Dt6(->asize), Dt6(->array), LJ_TNIL); + dasm_put(Dst, 12953, Dt6(->asize), Dt6(->array), LJ_TNIL); if (sse) { - dasm_put(Dst, 12882); + dasm_put(Dst, 12999); } else { - dasm_put(Dst, 12888); + dasm_put(Dst, 13005); } - dasm_put(Dst, 12894); + dasm_put(Dst, 13011); if (sse) { - dasm_put(Dst, 9935); + dasm_put(Dst, 10052); } else { - dasm_put(Dst, 9947); + dasm_put(Dst, 10064); } - dasm_put(Dst, 12907, -BCBIAS_J*4); + dasm_put(Dst, 13024, -BCBIAS_J*4); if (!sse) { - dasm_put(Dst, 12959); + dasm_put(Dst, 13076); } - dasm_put(Dst, 12965, Dt6(->hmask), sizeof(Node), Dt6(->node), DtB(->val.it), LJ_TNIL, DtB(->key), DtB(->val)); + dasm_put(Dst, 13082, Dt6(->hmask), sizeof(Node), Dt6(->node), DtB(->val.it), LJ_TNIL, DtB(->key), DtB(->val)); break; case BC_ISNEXT: - dasm_put(Dst, 13037, LJ_TFUNC, LJ_TTAB, LJ_TNIL, Dt8(->ffid), FF_next_N, -BCBIAS_J*4, BC_JMP, -BCBIAS_J*4, BC_ITERC); + dasm_put(Dst, 13154, 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, 13137, (8+FRAME_VARG), LJ_TNIL, Dt1(->maxstack)); - dasm_put(Dst, 13297, Dt1(->base), Dt1(->top), Dt1(->base), Dt1(->top)); + dasm_put(Dst, 13254, (8+FRAME_VARG), LJ_TNIL, Dt1(->maxstack)); + dasm_put(Dst, 13414, Dt1(->base), Dt1(->top), Dt1(->base), Dt1(->top)); break; /* -- Returns ----------------------------------------------------------- */ case BC_RETM: - dasm_put(Dst, 12532); + dasm_put(Dst, 12649); break; case BC_RET: case BC_RET0: case BC_RET1: if (op != BC_RET0) { - dasm_put(Dst, 13363); + dasm_put(Dst, 13480); } - dasm_put(Dst, 13367, FRAME_TYPE); + dasm_put(Dst, 13484, FRAME_TYPE); switch (op) { case BC_RET: - dasm_put(Dst, 13386); + dasm_put(Dst, 13503); break; case BC_RET1: - dasm_put(Dst, 13438); + dasm_put(Dst, 13555); /* fallthrough */ case BC_RET0: - dasm_put(Dst, 13448); + dasm_put(Dst, 13565); default: break; } - dasm_put(Dst, 13459, Dt7(->pc), PC2PROTO(k)); + dasm_put(Dst, 13576, Dt7(->pc), PC2PROTO(k)); if (op == BC_RET) { - dasm_put(Dst, 13503, LJ_TNIL); + dasm_put(Dst, 13620, LJ_TNIL); } else { - dasm_put(Dst, 13512, LJ_TNIL); + dasm_put(Dst, 13629, LJ_TNIL); } - dasm_put(Dst, 13519, -FRAME_VARG, FRAME_TYPEP); + dasm_put(Dst, 13636, -FRAME_VARG, FRAME_TYPEP); if (op != BC_RET0) { - dasm_put(Dst, 13543); + dasm_put(Dst, 13660); } dasm_put(Dst, 4522); break; @@ -2084,7 +2097,7 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) case BC_FORL: #if LJ_HASJIT - dasm_put(Dst, 13547, HOTCOUNT_PCMASK, GG_DISP2HOT); + dasm_put(Dst, 13664, HOTCOUNT_PCMASK, GG_DISP2HOT); #endif break; @@ -2096,57 +2109,57 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) case BC_FORI: case BC_IFORL: vk = (op == BC_IFORL || op == BC_JFORL); - dasm_put(Dst, 13568); + dasm_put(Dst, 13685); if (!vk) { - dasm_put(Dst, 13572, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 13689, LJ_TISNUM, LJ_TISNUM); } - dasm_put(Dst, 13591); + dasm_put(Dst, 13708); if (!vk) { - dasm_put(Dst, 13595, LJ_TISNUM); + dasm_put(Dst, 13712, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 13604); + dasm_put(Dst, 13721); if (vk) { - dasm_put(Dst, 13616); + dasm_put(Dst, 13733); } else { - dasm_put(Dst, 13635); + dasm_put(Dst, 13752); } - dasm_put(Dst, 13640); + dasm_put(Dst, 13757); } else { - dasm_put(Dst, 13653); + dasm_put(Dst, 13770); if (vk) { - dasm_put(Dst, 13659); + dasm_put(Dst, 13776); } else { - dasm_put(Dst, 13675); + dasm_put(Dst, 13792); } - dasm_put(Dst, 13683); + dasm_put(Dst, 13800); if (cmov) { - dasm_put(Dst, 9485); + dasm_put(Dst, 9602); } else { - dasm_put(Dst, 9491); + dasm_put(Dst, 9608); } if (!cmov) { - dasm_put(Dst, 13688); + dasm_put(Dst, 13805); } } if (op == BC_FORI) { - dasm_put(Dst, 13694, -BCBIAS_J*4); + dasm_put(Dst, 13811, -BCBIAS_J*4); } else if (op == BC_JFORI) { - dasm_put(Dst, 13704, -BCBIAS_J*4, BC_JLOOP); + dasm_put(Dst, 13821, -BCBIAS_J*4, BC_JLOOP); } else if (op == BC_IFORL) { - dasm_put(Dst, 13718, -BCBIAS_J*4); + dasm_put(Dst, 13835, -BCBIAS_J*4); } else { - dasm_put(Dst, 13714, BC_JLOOP); + dasm_put(Dst, 13831, BC_JLOOP); } - dasm_put(Dst, 9520); + dasm_put(Dst, 9637); if (sse) { - dasm_put(Dst, 13728); + dasm_put(Dst, 13845); } break; case BC_ITERL: #if LJ_HASJIT - dasm_put(Dst, 13547, HOTCOUNT_PCMASK, GG_DISP2HOT); + dasm_put(Dst, 13664, HOTCOUNT_PCMASK, GG_DISP2HOT); #endif break; @@ -2155,33 +2168,33 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) break; #endif case BC_IITERL: - dasm_put(Dst, 13739, LJ_TNIL); + dasm_put(Dst, 13856, LJ_TNIL); if (op == BC_JITERL) { - dasm_put(Dst, 13754, BC_JLOOP); + dasm_put(Dst, 13871, BC_JLOOP); } else { - dasm_put(Dst, 13768, -BCBIAS_J*4); + dasm_put(Dst, 13885, -BCBIAS_J*4); } - dasm_put(Dst, 9820); + dasm_put(Dst, 9937); break; case BC_LOOP: #if LJ_HASJIT - dasm_put(Dst, 13547, HOTCOUNT_PCMASK, GG_DISP2HOT); + dasm_put(Dst, 13664, HOTCOUNT_PCMASK, GG_DISP2HOT); #endif break; case BC_ILOOP: - dasm_put(Dst, 9522); + dasm_put(Dst, 9639); break; case BC_JLOOP: #if LJ_HASJIT - dasm_put(Dst, 13784, 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, 13901, 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, 13893, -BCBIAS_J*4); + dasm_put(Dst, 14010, -BCBIAS_J*4); break; /* -- Function headers -------------------------------------------------- */ @@ -2195,7 +2208,7 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) case BC_FUNCF: #if LJ_HASJIT - dasm_put(Dst, 13918, HOTCOUNT_PCMASK, GG_DISP2HOT); + dasm_put(Dst, 14035, HOTCOUNT_PCMASK, GG_DISP2HOT); #endif case BC_FUNCV: /* NYI: compiled vararg functions. */ break; @@ -2205,13 +2218,13 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) break; #endif case BC_IFUNCF: - dasm_put(Dst, 13939, -4+PC2PROTO(k), Dt1(->maxstack), -4+PC2PROTO(numparams)); + dasm_put(Dst, 14056, -4+PC2PROTO(k), Dt1(->maxstack), -4+PC2PROTO(numparams)); if (op == BC_JFUNCF) { - dasm_put(Dst, 13969, BC_JLOOP); + dasm_put(Dst, 14086, BC_JLOOP); } else { - dasm_put(Dst, 9522); + dasm_put(Dst, 9639); } - dasm_put(Dst, 13978, LJ_TNIL); + dasm_put(Dst, 14095, LJ_TNIL); break; case BC_JFUNCV: @@ -2222,30 +2235,30 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) break; /* NYI: compiled vararg functions. */ case BC_IFUNCV: - dasm_put(Dst, 14000, FRAME_VARG, Dt1(->maxstack), -4+PC2PROTO(numparams), LJ_TNIL); + dasm_put(Dst, 14117, FRAME_VARG, Dt1(->maxstack), -4+PC2PROTO(numparams), LJ_TNIL); if (op == BC_JFUNCV) { - dasm_put(Dst, 13969, BC_JLOOP); + dasm_put(Dst, 14086, BC_JLOOP); } else { - dasm_put(Dst, 14091, -4+PC2PROTO(k)); + dasm_put(Dst, 14208, -4+PC2PROTO(k)); } - dasm_put(Dst, 14114, LJ_TNIL); + dasm_put(Dst, 14231, LJ_TNIL); break; case BC_FUNCC: case BC_FUNCCW: - dasm_put(Dst, 14136, Dt8(->f), Dt1(->base), 8*LUA_MINSTACK, Dt1(->maxstack), Dt1(->top)); + dasm_put(Dst, 14253, Dt8(->f), Dt1(->base), 8*LUA_MINSTACK, Dt1(->maxstack), Dt1(->top)); if (op == BC_FUNCC) { - dasm_put(Dst, 14166); + dasm_put(Dst, 14283); } else { - dasm_put(Dst, 14170); + dasm_put(Dst, 14287); } - dasm_put(Dst, 14178, DISPATCH_GL(vmstate), ~LJ_VMST_C); + dasm_put(Dst, 14295, DISPATCH_GL(vmstate), ~LJ_VMST_C); if (op == BC_FUNCC) { - dasm_put(Dst, 14187); + dasm_put(Dst, 14304); } else { - dasm_put(Dst, 14191, DISPATCH_GL(wrapf)); + dasm_put(Dst, 14308, DISPATCH_GL(wrapf)); } - dasm_put(Dst, 14196, DISPATCH_GL(vmstate), ~LJ_VMST_INTERP, Dt1(->base), Dt1(->top)); + dasm_put(Dst, 14313, DISPATCH_GL(vmstate), ~LJ_VMST_INTERP, Dt1(->base), Dt1(->top)); break; /* ---------------------------------------------------------------------- */ @@ -2273,7 +2286,7 @@ static int build_backend(BuildCtx *ctx) build_subroutines(ctx, cmov, sse); - dasm_put(Dst, 14221); + dasm_put(Dst, 14338); 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 31a09b7e..d8e6a88c 100644 --- a/src/buildvm_x86.dasc +++ b/src/buildvm_x86.dasc @@ -3412,7 +3412,7 @@ static void build_subroutines(BuildCtx *ctx, int cmov, int sse) |//-- FFI helper functions ----------------------------------------------- |//----------------------------------------------------------------------- | - |->vm_ffi_call: + |->vm_ffi_call@4: #if LJ_HASFFI |.if X64 | .type CCSTATE, CCallState, rbx diff --git a/src/buildvm_x86.h b/src/buildvm_x86.h index 555fe67a..a2691d37 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[15591] = { +static const unsigned char build_actionlist[15684] = { 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, @@ -532,146 +532,150 @@ static const unsigned char build_actionlist[15591] = { 248,217,201,248,2,221,216,195,248,1,221,225,223,224,252,246,196,1,15,133, 244,248,217,201,248,2,221,216,195,255,248,155,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,255,249, - 255,129,124,253,202,4,239,15,135,244,41,129,124,253,194,4,239,15,135,244, - 41,255,252,242,15,16,4,194,131,198,4,102,15,46,4,202,255,221,4,202,221,4, - 194,131,198,4,255,223,252,233,221,216,255,218,252,233,223,224,158,255,15, - 134,244,248,255,15,131,244,248,255,248,1,15,183,70,252,254,141,180,253,134, - 233,248,2,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,171, - 255,139,108,194,4,131,198,4,129,252,253,239,15,135,244,251,129,124,253,202, - 4,239,15,135,244,251,255,252,242,15,16,4,194,102,15,46,4,202,255,221,4,202, - 221,4,194,255,15,138,244,248,15,133,244,248,255,15,138,244,248,15,132,244, - 247,255,248,1,15,183,70,252,254,141,180,253,134,233,248,2,255,248,2,15,183, - 70,252,254,141,180,253,134,233,248,1,255,248,5,57,108,202,4,15,133,244,2, - 129,252,253,239,15,131,244,1,139,12,202,139,4,194,57,193,15,132,244,1,129, - 252,253,239,15,135,244,2,139,169,233,133,252,237,15,132,244,2,252,246,133, - 233,235,15,133,244,2,255,49,252,237,255,189,1,0,0,0,255,252,233,244,45,255, - 252,247,208,131,198,4,129,124,253,202,4,239,15,133,244,248,139,12,202,59, - 12,135,255,131,198,4,129,124,253,202,4,239,15,135,244,248,255,252,242,15, - 16,4,199,102,15,46,4,202,255,221,4,202,221,4,199,255,252,247,208,131,198, - 4,57,68,202,4,255,139,108,194,4,131,198,4,129,252,253,239,255,15,131,244, - 247,255,15,130,244,247,255,137,108,202,4,139,44,194,137,44,202,255,15,183, - 70,252,254,141,180,253,134,233,248,1,139,6,15,182,204,15,182,232,131,198, - 4,193,232,16,252,255,36,171,255,139,108,194,4,139,4,194,137,108,202,4,137, - 4,202,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,171,255, - 49,252,237,129,124,253,194,4,239,129,213,239,137,108,202,4,139,6,15,182,204, - 15,182,232,131,198,4,193,232,16,252,255,36,171,255,129,124,253,194,4,239, - 15,135,244,48,255,252,242,15,16,4,194,184,0,0,0,128,102,15,110,200,102,15, - 112,201,81,15,87,193,252,242,15,17,4,202,255,221,4,194,217,224,221,28,202, - 255,129,124,253,194,4,239,15,133,244,248,139,4,194,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,50,139,12,194,137,213,232,251,1,18,255,252, - 242,15,42,192,137,252,234,255,137,4,36,137,252,234,219,4,36,255,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,135,244,46,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,135,244,47,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,135,244,49,129,124,253,194,4,239,15,135,244,49,255,252, - 242,15,16,4,252,234,252,242,15,88,4,194,255,221,4,252,234,220,4,194,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,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,156,232,244,148,255,252,233,244, - 156,255,232,244,107,255,15,182,252,236,15,182,192,141,12,194,41,232,137,76, - 36,4,137,68,36,8,248,33,139,108,36,48,137,44,36,137,149,233,137,116,36,24, - 232,251,1,25,139,149,233,133,192,15,133,244,42,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,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,26,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,26,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,27,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,28,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,29,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,30,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,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,137,252,233,232,251,1,30,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,157, - 255,252,247,208,139,106,252,248,139,173,233,139,4,135,252,233,244,158,255, - 15,182,252,236,15,182,192,129,124,253,252,234,4,239,15,133,244,36,139,44, - 252,234,129,124,253,194,4,239,15,135,244,251,255,252,242,15,16,4,194,252, - 242,15,45,192,252,242,15,42,200,102,15,46,193,255,221,4,194,219,20,36,219, - 4,36,255,15,133,244,36,59,133,233,15,131,244,36,193,224,3,3,133,233,129,120, - 253,4,239,15,132,244,248,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,36,15,182, - 78,252,253,248,3,255,199,68,202,4,237,252,233,244,1,248,5,129,124,253,194, - 4,239,15,133,244,36,139,4,194,252,233,244,157,255,15,182,252,236,15,182,192, - 252,247,208,139,4,135,129,124,253,252,234,4,239,15,133,244,34,139,44,252, - 234,248,157,139,141,233,35,136,233,105,201,239,3,141,233,248,1,129,185,233, - 239,15,133,244,250,57,129,233,15,133,244,250,129,121,253,4,239,15,132,244, - 251,15,182,70,252,253,139,41,139,73,4,137,44,194,137,76,194,4,248,2,255,139, - 6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,171,248,3,15,182, - 70,252,253,199,68,194,4,237,252,233,244,2,248,4,139,137,233,133,201,15,133, - 244,1,248,5,139,141,233,133,201,15,132,244,3,252,246,129,233,235,15,133,244, - 3,252,233,244,34,255,15,182,252,236,15,182,192,129,124,253,252,234,4,239, - 15,133,244,35,139,44,252,234,59,133,233,15,131,244,35,193,224,3,3,133,233, - 129,120,253,4,239,15,132,244,248,139,40,139,64,4,137,44,202,137,68,202,4, - 248,1,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,171,248, - 2,131,189,233,0,15,132,244,249,139,141,233,252,246,129,233,235,15,132,244, - 35,255,15,182,78,252,253,248,3,199,68,202,4,237,252,233,244,1,255,15,182, - 252,236,15,182,192,129,124,253,252,234,4,239,15,133,244,39,139,44,252,234, - 129,124,253,194,4,239,15,135,244,251,255,15,133,244,39,59,133,233,15,131, - 244,39,193,224,3,3,133,233,129,120,253,4,239,15,132,244,249,248,1,252,246, - 133,233,235,15,133,244,253,248,2,139,108,202,4,139,12,202,137,104,4,137,8, - 139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,171,248,3,131, - 189,233,0,15,132,244,1,139,141,233,255,252,246,129,233,235,15,132,244,39, - 15,182,78,252,253,252,233,244,1,248,5,129,124,253,194,4,239,15,133,244,39, - 139,4,194,252,233,244,158,248,7,128,165,233,235,139,139,233,137,171,233,137, - 141,233,15,182,78,252,253,252,233,244,2,255,15,182,252,236,15,182,192,252, - 247,208,139,4,135,129,124,253,252,234,4,239,15,133,244,37,139,44,252,234, - 248,158,139,141,233,35,136,233,105,201,239,198,133,233,0,3,141,233,248,1, - 129,185,233,239,15,133,244,251,57,129,233,15,133,244,251,129,121,253,4,239, - 15,132,244,250,248,2,255,252,246,133,233,235,15,133,244,253,248,3,15,182, - 70,252,253,139,108,194,4,139,4,194,137,105,4,137,1,139,6,15,182,204,15,182, - 232,131,198,4,193,232,16,252,255,36,171,248,4,131,189,233,0,15,132,244,2, - 137,76,36,16,139,141,233,252,246,129,233,235,15,132,244,37,139,76,36,16,252, - 233,244,2,248,5,139,137,233,133,201,15,133,244,1,255,139,141,233,133,201, - 15,132,244,252,252,246,129,233,235,15,132,244,37,248,6,137,68,36,16,199,68, - 36,20,237,137,108,36,12,141,68,36,16,137,108,36,4,139,108,36,48,137,68,36, - 8,137,44,36,137,149,233,137,116,36,24,232,251,1,32,139,149,233,139,108,36, - 12,137,193,252,233,244,2,248,7,128,165,233,235,139,131,233,137,171,233,137, - 133,233,252,233,244,3,255,15,182,252,236,15,182,192,129,124,253,252,234,4, - 239,15,133,244,38,139,44,252,234,59,133,233,15,131,244,38,193,224,3,3,133, + 162,139,124,36,16,137,7,137,95,4,137,79,8,137,87,12,91,95,248,1,195,248,156, + 255,85,137,229,83,137,203,43,163,233,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,255,252,233,244,253,248,6, + 217,155,233,248,7,139,93,252,252,201,195,255,249,255,129,124,253,202,4,239, + 15,135,244,41,129,124,253,194,4,239,15,135,244,41,255,252,242,15,16,4,194, + 131,198,4,102,15,46,4,202,255,221,4,202,221,4,194,131,198,4,255,223,252,233, + 221,216,255,218,252,233,223,224,158,255,15,134,244,248,255,15,131,244,248, + 255,248,1,15,183,70,252,254,141,180,253,134,233,248,2,139,6,15,182,204,15, + 182,232,131,198,4,193,232,16,252,255,36,171,255,139,108,194,4,131,198,4,129, + 252,253,239,15,135,244,251,129,124,253,202,4,239,15,135,244,251,255,252,242, + 15,16,4,194,102,15,46,4,202,255,221,4,202,221,4,194,255,15,138,244,248,15, + 133,244,248,255,15,138,244,248,15,132,244,247,255,248,1,15,183,70,252,254, + 141,180,253,134,233,248,2,255,248,2,15,183,70,252,254,141,180,253,134,233, + 248,1,255,248,5,57,108,202,4,15,133,244,2,129,252,253,239,15,131,244,1,139, + 12,202,139,4,194,57,193,15,132,244,1,129,252,253,239,15,135,244,2,139,169, + 233,133,252,237,15,132,244,2,252,246,133,233,235,15,133,244,2,255,49,252, + 237,255,189,1,0,0,0,255,252,233,244,45,255,252,247,208,131,198,4,129,124, + 253,202,4,239,15,133,244,248,139,12,202,59,12,135,255,131,198,4,129,124,253, + 202,4,239,15,135,244,248,255,252,242,15,16,4,199,102,15,46,4,202,255,221, + 4,202,221,4,199,255,252,247,208,131,198,4,57,68,202,4,255,139,108,194,4,131, + 198,4,129,252,253,239,255,15,131,244,247,255,15,130,244,247,255,137,108,202, + 4,139,44,194,137,44,202,255,15,183,70,252,254,141,180,253,134,233,248,1,139, + 6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,171,255,139,108,194, + 4,139,4,194,137,108,202,4,137,4,202,139,6,15,182,204,15,182,232,131,198,4, + 193,232,16,252,255,36,171,255,49,252,237,129,124,253,194,4,239,129,213,239, + 137,108,202,4,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36, + 171,255,129,124,253,194,4,239,15,135,244,48,255,252,242,15,16,4,194,184,0, + 0,0,128,102,15,110,200,102,15,112,201,81,15,87,193,252,242,15,17,4,202,255, + 221,4,194,217,224,221,28,202,255,129,124,253,194,4,239,15,133,244,248,139, + 4,194,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,50,139,12,194,137, + 213,232,251,1,18,255,252,242,15,42,192,137,252,234,255,137,4,36,137,252,234, + 219,4,36,255,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,135,244,46,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,135,244,47,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,135,244,49,129,124,253,194, + 4,239,15,135,244,49,255,252,242,15,16,4,252,234,252,242,15,88,4,194,255,221, + 4,252,234,220,4,194,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,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,157, + 232,244,148,255,252,233,244,157,255,232,244,107,255,15,182,252,236,15,182, + 192,141,12,194,41,232,137,76,36,4,137,68,36,8,248,33,139,108,36,48,137,44, + 36,137,149,233,137,116,36,24,232,251,1,25,139,149,233,133,192,15,133,244, + 42,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,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, + 26,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,26,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,27,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,28,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,29, + 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,30,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,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,137,252,233,232,251,1,30,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,158,255,252,247,208,139,106,252,248,139,173,233,139, + 4,135,252,233,244,159,255,15,182,252,236,15,182,192,129,124,253,252,234,4, + 239,15,133,244,36,139,44,252,234,129,124,253,194,4,239,15,135,244,251,255, + 252,242,15,16,4,194,252,242,15,45,192,252,242,15,42,200,102,15,46,193,255, + 221,4,194,219,20,36,219,4,36,255,15,133,244,36,59,133,233,15,131,244,36,193, + 224,3,3,133,233,129,120,253,4,239,15,132,244,248,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,36,15,182,78,252,253,248,3,255,199,68,202,4,237,252,233,244,1, + 248,5,129,124,253,194,4,239,15,133,244,36,139,4,194,252,233,244,158,255,15, + 182,252,236,15,182,192,252,247,208,139,4,135,129,124,253,252,234,4,239,15, + 133,244,34,139,44,252,234,248,158,139,141,233,35,136,233,105,201,239,3,141, + 233,248,1,129,185,233,239,15,133,244,250,57,129,233,15,133,244,250,129,121, + 253,4,239,15,132,244,251,15,182,70,252,253,139,41,139,73,4,137,44,194,137, + 76,194,4,248,2,255,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255, + 36,171,248,3,15,182,70,252,253,199,68,194,4,237,252,233,244,2,248,4,139,137, + 233,133,201,15,133,244,1,248,5,139,141,233,133,201,15,132,244,3,252,246,129, + 233,235,15,133,244,3,252,233,244,34,255,15,182,252,236,15,182,192,129,124, + 253,252,234,4,239,15,133,244,35,139,44,252,234,59,133,233,15,131,244,35,193, + 224,3,3,133,233,129,120,253,4,239,15,132,244,248,139,40,139,64,4,137,44,202, + 137,68,202,4,248,1,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255, + 36,171,248,2,131,189,233,0,15,132,244,249,139,141,233,252,246,129,233,235, + 15,132,244,35,255,15,182,78,252,253,248,3,199,68,202,4,237,252,233,244,1, + 255,15,182,252,236,15,182,192,129,124,253,252,234,4,239,15,133,244,39,139, + 44,252,234,129,124,253,194,4,239,15,135,244,251,255,15,133,244,39,59,133, + 233,15,131,244,39,193,224,3,3,133,233,129,120,253,4,239,15,132,244,249,248, + 1,252,246,133,233,235,15,133,244,253,248,2,139,108,202,4,139,12,202,137,104, + 4,137,8,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,171,248, + 3,131,189,233,0,15,132,244,1,139,141,233,255,252,246,129,233,235,15,132,244, + 39,15,182,78,252,253,252,233,244,1,248,5,129,124,253,194,4,239,15,133,244, + 39,139,4,194,252,233,244,159,248,7,128,165,233,235,139,139,233,137,171,233, + 137,141,233,15,182,78,252,253,252,233,244,2,255,15,182,252,236,15,182,192, + 252,247,208,139,4,135,129,124,253,252,234,4,239,15,133,244,37,139,44,252, + 234,248,159,139,141,233,35,136,233,105,201,239,198,133,233,0,3,141,233,248, + 1,129,185,233,239,15,133,244,251,57,129,233,15,133,244,251,129,121,253,4, + 239,15,132,244,250,248,2,255,252,246,133,233,235,15,133,244,253,248,3,15, + 182,70,252,253,139,108,194,4,139,4,194,137,105,4,137,1,139,6,15,182,204,15, + 182,232,131,198,4,193,232,16,252,255,36,171,248,4,131,189,233,0,15,132,244, + 2,137,76,36,16,139,141,233,252,246,129,233,235,15,132,244,37,139,76,36,16, + 252,233,244,2,248,5,139,137,233,133,201,15,133,244,1,255,139,141,233,133, + 201,15,132,244,252,252,246,129,233,235,15,132,244,37,248,6,137,68,36,16,199, + 68,36,20,237,137,108,36,12,141,68,36,16,137,108,36,4,139,108,36,48,137,68, + 36,8,137,44,36,137,149,233,137,116,36,24,232,251,1,32,139,149,233,139,108, + 36,12,137,193,252,233,244,2,248,7,128,165,233,235,139,131,233,137,171,233, + 137,133,233,252,233,244,3,255,15,182,252,236,15,182,192,129,124,253,252,234, + 4,239,15,133,244,38,139,44,252,234,59,133,233,15,131,244,38,193,224,3,3,133, 233,129,120,253,4,239,15,132,244,249,248,1,252,246,133,233,235,15,133,244, 253,248,2,139,108,202,4,139,12,202,137,104,4,137,8,139,6,15,182,204,15,182, 232,131,198,4,193,232,16,252,255,36,171,248,3,131,189,233,0,15,132,244,1, @@ -915,6 +919,7 @@ enum { GLOB_vm_foldfpm, GLOB_vm_foldarith, GLOB_vm_cpuid, + GLOB_vm_ffi_call, GLOB_BC_MODVN_Z, GLOB_BC_TGETS_Z, GLOB_BC_TSETS_Z, @@ -1067,6 +1072,7 @@ static const char *const globnames[] = { "vm_foldfpm", "vm_foldarith", "vm_cpuid", + "vm_ffi_call@4", "BC_MODVN_Z", "BC_TGETS_Z", "BC_TSETS_Z", @@ -1563,13 +1569,18 @@ static void build_subroutines(BuildCtx *ctx, int cmov, int sse) dasm_put(Dst, 10266); } dasm_put(Dst, 10731); +#if LJ_HASFFI +#define DtE(_V) (int)(ptrdiff_t)&(((CCallState *)0)_V) + dasm_put(Dst, 10787, DtE(->spadj), 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, 10860, DtE(->fpr[0].f[0])); +#endif } /* 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, 10785, defop); + dasm_put(Dst, 10878, defop); switch (op) { @@ -1578,20 +1589,20 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) /* Remember: all ops branch for a true comparison, fall through otherwise. */ case BC_ISLT: case BC_ISGE: case BC_ISLE: case BC_ISGT: - dasm_put(Dst, 10787, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 10880, LJ_TISNUM, LJ_TISNUM); if (sse) { - dasm_put(Dst, 10808); + dasm_put(Dst, 10901); } else { - dasm_put(Dst, 10823); + dasm_put(Dst, 10916); if (cmov) { - dasm_put(Dst, 10833); + dasm_put(Dst, 10926); } else { - dasm_put(Dst, 10839); + dasm_put(Dst, 10932); } } switch (op) { case BC_ISLT: - dasm_put(Dst, 10846); + dasm_put(Dst, 10939); break; case BC_ISGE: dasm_put(Dst, 10081); @@ -1600,615 +1611,615 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) dasm_put(Dst, 6207); break; case BC_ISGT: - dasm_put(Dst, 10851); + dasm_put(Dst, 10944); break; default: break; /* Shut up GCC. */ } - dasm_put(Dst, 10856, -BCBIAS_J*4); + dasm_put(Dst, 10949, -BCBIAS_J*4); break; case BC_ISEQV: case BC_ISNEV: vk = op == BC_ISEQV; - dasm_put(Dst, 10889, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 10982, LJ_TISNUM, LJ_TISNUM); if (sse) { - dasm_put(Dst, 10915); + dasm_put(Dst, 11008); } else { - dasm_put(Dst, 10927); + dasm_put(Dst, 11020); if (cmov) { - dasm_put(Dst, 10833); + dasm_put(Dst, 10926); } else { - dasm_put(Dst, 10839); + dasm_put(Dst, 10932); } } iseqne_fp: if (vk) { - dasm_put(Dst, 10934); + dasm_put(Dst, 11027); } else { - dasm_put(Dst, 10943); + dasm_put(Dst, 11036); } iseqne_end: if (vk) { - dasm_put(Dst, 10952, -BCBIAS_J*4); + dasm_put(Dst, 11045, -BCBIAS_J*4); } else { - dasm_put(Dst, 10967, -BCBIAS_J*4); + dasm_put(Dst, 11060, -BCBIAS_J*4); } - dasm_put(Dst, 10870); + dasm_put(Dst, 10963); if (op == BC_ISEQV || op == BC_ISNEV) { - dasm_put(Dst, 10982, LJ_TISPRI, LJ_TISTABUD, Dt6(->metatable), Dt6(->nomm), 1<metatable), Dt6(->nomm), 1<len)); + dasm_put(Dst, 11411, Dt5(->len)); } else { - dasm_put(Dst, 11336, Dt5(->len)); + dasm_put(Dst, 11429, Dt5(->len)); } - dasm_put(Dst, 11345, LJ_TTAB); + dasm_put(Dst, 11438, LJ_TTAB); if (sse) { - dasm_put(Dst, 11385); + dasm_put(Dst, 11478); } else { - dasm_put(Dst, 11394); + dasm_put(Dst, 11487); } - dasm_put(Dst, 11404); + dasm_put(Dst, 11497); break; /* -- Binary ops -------------------------------------------------------- */ case BC_ADDVN: case BC_ADDNV: case BC_ADDVV: - dasm_put(Dst, 11414); + dasm_put(Dst, 11507); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 11422, LJ_TISNUM); + dasm_put(Dst, 11515, LJ_TISNUM); if (sse) { - dasm_put(Dst, 11434); + dasm_put(Dst, 11527); } else { - dasm_put(Dst, 11448); + dasm_put(Dst, 11541); } break; case 1: - dasm_put(Dst, 11456, LJ_TISNUM); + dasm_put(Dst, 11549, LJ_TISNUM); if (sse) { - dasm_put(Dst, 11468); + dasm_put(Dst, 11561); } else { - dasm_put(Dst, 11482); + dasm_put(Dst, 11575); } break; default: - dasm_put(Dst, 11490, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 11583, LJ_TISNUM, LJ_TISNUM); if (sse) { - dasm_put(Dst, 11512); + dasm_put(Dst, 11605); } else { - dasm_put(Dst, 11526); + dasm_put(Dst, 11619); } break; } if (sse) { - dasm_put(Dst, 11288); + dasm_put(Dst, 11381); } else { - dasm_put(Dst, 11300); + dasm_put(Dst, 11393); } - dasm_put(Dst, 10870); + dasm_put(Dst, 10963); break; case BC_SUBVN: case BC_SUBNV: case BC_SUBVV: - dasm_put(Dst, 11414); + dasm_put(Dst, 11507); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 11422, LJ_TISNUM); + dasm_put(Dst, 11515, LJ_TISNUM); if (sse) { - dasm_put(Dst, 11534); + dasm_put(Dst, 11627); } else { - dasm_put(Dst, 11548); + dasm_put(Dst, 11641); } break; case 1: - dasm_put(Dst, 11456, LJ_TISNUM); + dasm_put(Dst, 11549, LJ_TISNUM); if (sse) { - dasm_put(Dst, 11556); + dasm_put(Dst, 11649); } else { - dasm_put(Dst, 11570); + dasm_put(Dst, 11663); } break; default: - dasm_put(Dst, 11490, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 11583, LJ_TISNUM, LJ_TISNUM); if (sse) { - dasm_put(Dst, 11578); + dasm_put(Dst, 11671); } else { - dasm_put(Dst, 11592); + dasm_put(Dst, 11685); } break; } if (sse) { - dasm_put(Dst, 11288); + dasm_put(Dst, 11381); } else { - dasm_put(Dst, 11300); + dasm_put(Dst, 11393); } - dasm_put(Dst, 10870); + dasm_put(Dst, 10963); break; case BC_MULVN: case BC_MULNV: case BC_MULVV: - dasm_put(Dst, 11414); + dasm_put(Dst, 11507); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 11422, LJ_TISNUM); + dasm_put(Dst, 11515, LJ_TISNUM); if (sse) { - dasm_put(Dst, 11600); + dasm_put(Dst, 11693); } else { - dasm_put(Dst, 11614); + dasm_put(Dst, 11707); } break; case 1: - dasm_put(Dst, 11456, LJ_TISNUM); + dasm_put(Dst, 11549, LJ_TISNUM); if (sse) { - dasm_put(Dst, 11622); + dasm_put(Dst, 11715); } else { - dasm_put(Dst, 11636); + dasm_put(Dst, 11729); } break; default: - dasm_put(Dst, 11490, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 11583, LJ_TISNUM, LJ_TISNUM); if (sse) { - dasm_put(Dst, 11644); + dasm_put(Dst, 11737); } else { - dasm_put(Dst, 11658); + dasm_put(Dst, 11751); } break; } if (sse) { - dasm_put(Dst, 11288); + dasm_put(Dst, 11381); } else { - dasm_put(Dst, 11300); + dasm_put(Dst, 11393); } - dasm_put(Dst, 10870); + dasm_put(Dst, 10963); break; case BC_DIVVN: case BC_DIVNV: case BC_DIVVV: - dasm_put(Dst, 11414); + dasm_put(Dst, 11507); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 11422, LJ_TISNUM); + dasm_put(Dst, 11515, LJ_TISNUM); if (sse) { - dasm_put(Dst, 11666); + dasm_put(Dst, 11759); } else { - dasm_put(Dst, 11680); + dasm_put(Dst, 11773); } break; case 1: - dasm_put(Dst, 11456, LJ_TISNUM); + dasm_put(Dst, 11549, LJ_TISNUM); if (sse) { - dasm_put(Dst, 11688); + dasm_put(Dst, 11781); } else { - dasm_put(Dst, 11702); + dasm_put(Dst, 11795); } break; default: - dasm_put(Dst, 11490, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 11583, LJ_TISNUM, LJ_TISNUM); if (sse) { - dasm_put(Dst, 11710); + dasm_put(Dst, 11803); } else { - dasm_put(Dst, 11724); + dasm_put(Dst, 11817); } break; } if (sse) { - dasm_put(Dst, 11288); + dasm_put(Dst, 11381); } else { - dasm_put(Dst, 11300); + dasm_put(Dst, 11393); } - dasm_put(Dst, 10870); + dasm_put(Dst, 10963); break; case BC_MODVN: - dasm_put(Dst, 11414); + dasm_put(Dst, 11507); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 11422, LJ_TISNUM); + dasm_put(Dst, 11515, LJ_TISNUM); if (sse) { - dasm_put(Dst, 11732); + dasm_put(Dst, 11825); } else { - dasm_put(Dst, 11746); + dasm_put(Dst, 11839); } break; case 1: - dasm_put(Dst, 11456, LJ_TISNUM); + dasm_put(Dst, 11549, LJ_TISNUM); if (sse) { - dasm_put(Dst, 11754); + dasm_put(Dst, 11847); } else { - dasm_put(Dst, 11768); + dasm_put(Dst, 11861); } break; default: - dasm_put(Dst, 11490, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 11583, LJ_TISNUM, LJ_TISNUM); if (sse) { - dasm_put(Dst, 11776); + dasm_put(Dst, 11869); } else { - dasm_put(Dst, 11790); + dasm_put(Dst, 11883); } break; } - dasm_put(Dst, 11798); + dasm_put(Dst, 11891); if (sse) { - dasm_put(Dst, 11288); + dasm_put(Dst, 11381); } else { - dasm_put(Dst, 11300); + dasm_put(Dst, 11393); } - dasm_put(Dst, 10870); + dasm_put(Dst, 10963); break; case BC_MODNV: case BC_MODVV: - dasm_put(Dst, 11414); + dasm_put(Dst, 11507); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 11422, LJ_TISNUM); + dasm_put(Dst, 11515, LJ_TISNUM); if (sse) { - dasm_put(Dst, 11732); + dasm_put(Dst, 11825); } else { - dasm_put(Dst, 11746); + dasm_put(Dst, 11839); } break; case 1: - dasm_put(Dst, 11456, LJ_TISNUM); + dasm_put(Dst, 11549, LJ_TISNUM); if (sse) { - dasm_put(Dst, 11754); + dasm_put(Dst, 11847); } else { - dasm_put(Dst, 11768); + dasm_put(Dst, 11861); } break; default: - dasm_put(Dst, 11490, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 11583, LJ_TISNUM, LJ_TISNUM); if (sse) { - dasm_put(Dst, 11776); + dasm_put(Dst, 11869); } else { - dasm_put(Dst, 11790); + dasm_put(Dst, 11883); } break; } - dasm_put(Dst, 11804); + dasm_put(Dst, 11897); break; case BC_POW: - dasm_put(Dst, 11414); + dasm_put(Dst, 11507); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 11422, LJ_TISNUM); + dasm_put(Dst, 11515, LJ_TISNUM); if (sse) { - dasm_put(Dst, 11732); + dasm_put(Dst, 11825); } else { - dasm_put(Dst, 11746); + dasm_put(Dst, 11839); } break; case 1: - dasm_put(Dst, 11456, LJ_TISNUM); + dasm_put(Dst, 11549, LJ_TISNUM); if (sse) { - dasm_put(Dst, 11754); + dasm_put(Dst, 11847); } else { - dasm_put(Dst, 11768); + dasm_put(Dst, 11861); } break; default: - dasm_put(Dst, 11490, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 11583, LJ_TISNUM, LJ_TISNUM); if (sse) { - dasm_put(Dst, 11776); + dasm_put(Dst, 11869); } else { - dasm_put(Dst, 11790); + dasm_put(Dst, 11883); } break; } - dasm_put(Dst, 11809); + dasm_put(Dst, 11902); if (sse) { - dasm_put(Dst, 11288); + dasm_put(Dst, 11381); } else { - dasm_put(Dst, 11300); + dasm_put(Dst, 11393); } - dasm_put(Dst, 10870); + dasm_put(Dst, 10963); break; case BC_CAT: - dasm_put(Dst, 11813, Dt1(->base), Dt1(->base)); + dasm_put(Dst, 11906, Dt1(->base), Dt1(->base)); break; /* -- Constant ops ------------------------------------------------------ */ case BC_KSTR: - dasm_put(Dst, 11907, LJ_TSTR); + dasm_put(Dst, 12000, LJ_TSTR); break; case BC_KCDATA: #if LJ_HASFFI - dasm_put(Dst, 11907, LJ_TCDATA); + dasm_put(Dst, 12000, LJ_TCDATA); #endif break; case BC_KSHORT: if (sse) { - dasm_put(Dst, 11940); + dasm_put(Dst, 12033); } else { - dasm_put(Dst, 11955); + dasm_put(Dst, 12048); } - dasm_put(Dst, 10870); + dasm_put(Dst, 10963); break; case BC_KNUM: if (sse) { - dasm_put(Dst, 11963); + dasm_put(Dst, 12056); } else { - dasm_put(Dst, 11976); + dasm_put(Dst, 12069); } - dasm_put(Dst, 10870); + dasm_put(Dst, 10963); break; case BC_KPRI: - dasm_put(Dst, 11983); + dasm_put(Dst, 12076); break; case BC_KNIL: - dasm_put(Dst, 12009, LJ_TNIL); + dasm_put(Dst, 12102, LJ_TNIL); break; /* -- Upvalue and function ops ------------------------------------------ */ case BC_UGET: - dasm_put(Dst, 12055, offsetof(GCfuncL, uvptr), DtA(->v)); + dasm_put(Dst, 12148, offsetof(GCfuncL, uvptr), DtA(->v)); break; case BC_USETV: #define TV2MARKOFS \ ((int32_t)offsetof(GCupval, marked)-(int32_t)offsetof(GCupval, tv)) - dasm_put(Dst, 12099, 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, 12189); + dasm_put(Dst, 12192, 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, 12282); break; #undef TV2MARKOFS case BC_USETS: - dasm_put(Dst, 12201, 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, 12294, 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, 12292); + dasm_put(Dst, 12385); if (sse) { - dasm_put(Dst, 12297); + dasm_put(Dst, 12390); } else { - dasm_put(Dst, 11107); + dasm_put(Dst, 11200); } - dasm_put(Dst, 12304, offsetof(GCfuncL, uvptr), DtA(->v)); + dasm_put(Dst, 12397, offsetof(GCfuncL, uvptr), DtA(->v)); if (sse) { - dasm_put(Dst, 12313); + dasm_put(Dst, 12406); } else { - dasm_put(Dst, 12319); + dasm_put(Dst, 12412); } - dasm_put(Dst, 10870); + dasm_put(Dst, 10963); break; case BC_USETP: - dasm_put(Dst, 12322, offsetof(GCfuncL, uvptr), DtA(->v)); + dasm_put(Dst, 12415, offsetof(GCfuncL, uvptr), DtA(->v)); break; case BC_UCLO: - dasm_put(Dst, 12359, -BCBIAS_J*4, Dt1(->openupval), Dt1(->base), Dt1(->base)); + dasm_put(Dst, 12452, -BCBIAS_J*4, Dt1(->openupval), Dt1(->base), Dt1(->base)); break; case BC_FNEW: - dasm_put(Dst, 12413, Dt1(->base), Dt1(->base), LJ_TFUNC); + dasm_put(Dst, 12506, Dt1(->base), Dt1(->base), LJ_TFUNC); break; /* -- Table ops --------------------------------------------------------- */ case BC_TNEW: - dasm_put(Dst, 12484, Dt1(->base), DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), LJ_TTAB); + dasm_put(Dst, 12577, Dt1(->base), DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), LJ_TTAB); break; case BC_TDUP: - dasm_put(Dst, 12610, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), Dt1(->base), LJ_TTAB); + dasm_put(Dst, 12703, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), Dt1(->base), LJ_TTAB); break; case BC_GGET: - dasm_put(Dst, 12702, Dt7(->env)); + dasm_put(Dst, 12795, Dt7(->env)); break; case BC_GSET: - dasm_put(Dst, 12720, Dt7(->env)); + dasm_put(Dst, 12813, Dt7(->env)); break; case BC_TGETV: - dasm_put(Dst, 12738, LJ_TTAB, LJ_TISNUM); + dasm_put(Dst, 12831, LJ_TTAB, LJ_TISNUM); if (sse) { - dasm_put(Dst, 12771); + dasm_put(Dst, 12864); } else { - dasm_put(Dst, 12792); + dasm_put(Dst, 12885); if (cmov) { - dasm_put(Dst, 10833); + dasm_put(Dst, 10926); } else { - dasm_put(Dst, 10839); + dasm_put(Dst, 10932); } dasm_put(Dst, 2539); } - dasm_put(Dst, 12802, 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, 13007, 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, 13100, 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)); - dasm_put(Dst, 13309, Dt6(->nomm), 1<marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); + dasm_put(Dst, 13319, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->metatable)); + dasm_put(Dst, 13402, Dt6(->nomm), 1<marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); break; case BC_TSETS: - dasm_put(Dst, 13371, 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, 13446, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<next)); - dasm_put(Dst, 13538, Dt6(->metatable), Dt6(->nomm), 1<base), Dt1(->base), Dt6(->marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); + dasm_put(Dst, 13464, 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, 13539, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<next)); + dasm_put(Dst, 13631, Dt6(->metatable), Dt6(->nomm), 1<base), Dt1(->base), Dt6(->marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); break; case BC_TSETB: - dasm_put(Dst, 13634, LJ_TTAB, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable)); - dasm_put(Dst, 13732, Dt6(->metatable), Dt6(->nomm), 1<marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); + dasm_put(Dst, 13727, LJ_TTAB, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable)); + dasm_put(Dst, 13825, Dt6(->metatable), Dt6(->nomm), 1<marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); break; case BC_TSETM: - dasm_put(Dst, 13778, Dt6(->marked), LJ_GC_BLACK, Dt6(->asize), Dt6(->array), Dt1(->base), Dt1(->base)); - dasm_put(Dst, 13927, Dt6(->marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); + dasm_put(Dst, 13871, Dt6(->marked), LJ_GC_BLACK, Dt6(->asize), Dt6(->array), Dt1(->base), Dt1(->base)); + dasm_put(Dst, 14020, Dt6(->marked), cast_byte(~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, 11418); + dasm_put(Dst, 11511); if (op == BC_CALLM) { - dasm_put(Dst, 13945); + dasm_put(Dst, 14038); } - dasm_put(Dst, 13950, LJ_TFUNC, Dt7(->pc)); + dasm_put(Dst, 14043, LJ_TFUNC, Dt7(->pc)); break; case BC_CALLMT: - dasm_put(Dst, 13945); + dasm_put(Dst, 14038); break; case BC_CALLT: - dasm_put(Dst, 13991, LJ_TFUNC, FRAME_TYPE, Dt7(->ffid), Dt7(->pc)); - dasm_put(Dst, 14109, FRAME_TYPE, Dt7(->pc), PC2PROTO(k), FRAME_VARG, FRAME_TYPEP, FRAME_VARG); + dasm_put(Dst, 14084, LJ_TFUNC, FRAME_TYPE, Dt7(->ffid), Dt7(->pc)); + dasm_put(Dst, 14202, FRAME_TYPE, Dt7(->pc), PC2PROTO(k), FRAME_VARG, FRAME_TYPEP, FRAME_VARG); break; case BC_ITERC: - dasm_put(Dst, 14179, LJ_TFUNC, 2+1, Dt7(->pc)); + dasm_put(Dst, 14272, LJ_TFUNC, 2+1, Dt7(->pc)); break; case BC_ITERN: #if LJ_HASJIT #endif - dasm_put(Dst, 14259, Dt6(->asize), Dt6(->array), LJ_TNIL); + dasm_put(Dst, 14352, Dt6(->asize), Dt6(->array), LJ_TNIL); if (sse) { - dasm_put(Dst, 14305); + dasm_put(Dst, 14398); } else { - dasm_put(Dst, 14311); + dasm_put(Dst, 14404); } - dasm_put(Dst, 14317); + dasm_put(Dst, 14410); if (sse) { - dasm_put(Dst, 11288); + dasm_put(Dst, 11381); } else { - dasm_put(Dst, 11300); + dasm_put(Dst, 11393); } - dasm_put(Dst, 14336, -BCBIAS_J*4); + dasm_put(Dst, 14429, -BCBIAS_J*4); if (!sse) { - dasm_put(Dst, 14387); + dasm_put(Dst, 14480); } - dasm_put(Dst, 14393, 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, 14468); + dasm_put(Dst, 14486, 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, 14561); break; case BC_ISNEXT: - dasm_put(Dst, 14476, LJ_TFUNC, LJ_TTAB, LJ_TNIL, Dt8(->ffid), FF_next_N, -BCBIAS_J*4, BC_JMP, -BCBIAS_J*4, BC_ITERC); + dasm_put(Dst, 14569, 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, 14575, (8+FRAME_VARG), LJ_TNIL, Dt1(->maxstack)); - dasm_put(Dst, 14739, Dt1(->base), Dt1(->top), Dt1(->base), Dt1(->top)); + dasm_put(Dst, 14668, (8+FRAME_VARG), LJ_TNIL, Dt1(->maxstack)); + dasm_put(Dst, 14832, Dt1(->base), Dt1(->top), Dt1(->base), Dt1(->top)); break; /* -- Returns ----------------------------------------------------------- */ case BC_RETM: - dasm_put(Dst, 13945); + dasm_put(Dst, 14038); break; case BC_RET: case BC_RET0: case BC_RET1: if (op != BC_RET0) { - dasm_put(Dst, 14810); + dasm_put(Dst, 14903); } - dasm_put(Dst, 14814, FRAME_TYPE); + dasm_put(Dst, 14907, FRAME_TYPE); switch (op) { case BC_RET: - dasm_put(Dst, 14833); + dasm_put(Dst, 14926); break; case BC_RET1: - dasm_put(Dst, 14891); + dasm_put(Dst, 14984); /* fallthrough */ case BC_RET0: - dasm_put(Dst, 14907); + dasm_put(Dst, 15000); default: break; } - dasm_put(Dst, 14918, Dt7(->pc), PC2PROTO(k)); + dasm_put(Dst, 15011, Dt7(->pc), PC2PROTO(k)); if (op == BC_RET) { - dasm_put(Dst, 14960, LJ_TNIL); + dasm_put(Dst, 15053, LJ_TNIL); } else { - dasm_put(Dst, 14969, LJ_TNIL); + dasm_put(Dst, 15062, LJ_TNIL); } - dasm_put(Dst, 14976, -FRAME_VARG, FRAME_TYPEP); + dasm_put(Dst, 15069, -FRAME_VARG, FRAME_TYPEP); if (op != BC_RET0) { - dasm_put(Dst, 15000); + dasm_put(Dst, 15093); } dasm_put(Dst, 4704); break; @@ -2218,7 +2229,7 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) case BC_FORL: #if LJ_HASJIT - dasm_put(Dst, 15004, HOTCOUNT_PCMASK, GG_DISP2HOT); + dasm_put(Dst, 15097, HOTCOUNT_PCMASK, GG_DISP2HOT); #endif break; @@ -2230,57 +2241,57 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) case BC_FORI: case BC_IFORL: vk = (op == BC_IFORL || op == BC_JFORL); - dasm_put(Dst, 15025); + dasm_put(Dst, 15118); if (!vk) { - dasm_put(Dst, 15029, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 15122, LJ_TISNUM, LJ_TISNUM); } - dasm_put(Dst, 15048); + dasm_put(Dst, 15141); if (!vk) { - dasm_put(Dst, 15052, LJ_TISNUM); + dasm_put(Dst, 15145, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 15061); + dasm_put(Dst, 15154); if (vk) { - dasm_put(Dst, 15073); + dasm_put(Dst, 15166); } else { - dasm_put(Dst, 15092); + dasm_put(Dst, 15185); } - dasm_put(Dst, 15097); + dasm_put(Dst, 15190); } else { - dasm_put(Dst, 15110); + dasm_put(Dst, 15203); if (vk) { - dasm_put(Dst, 15116); + dasm_put(Dst, 15209); } else { - dasm_put(Dst, 15132); + dasm_put(Dst, 15225); } - dasm_put(Dst, 15140); + dasm_put(Dst, 15233); if (cmov) { - dasm_put(Dst, 10833); + dasm_put(Dst, 10926); } else { - dasm_put(Dst, 10839); + dasm_put(Dst, 10932); } if (!cmov) { - dasm_put(Dst, 15145); + dasm_put(Dst, 15238); } } if (op == BC_FORI) { - dasm_put(Dst, 15151, -BCBIAS_J*4); + dasm_put(Dst, 15244, -BCBIAS_J*4); } else if (op == BC_JFORI) { - dasm_put(Dst, 15161, -BCBIAS_J*4, BC_JLOOP); + dasm_put(Dst, 15254, -BCBIAS_J*4, BC_JLOOP); } else if (op == BC_IFORL) { - dasm_put(Dst, 15175, -BCBIAS_J*4); + dasm_put(Dst, 15268, -BCBIAS_J*4); } else { - dasm_put(Dst, 15171, BC_JLOOP); + dasm_put(Dst, 15264, BC_JLOOP); } - dasm_put(Dst, 10868); + dasm_put(Dst, 10961); if (sse) { - dasm_put(Dst, 15185); + dasm_put(Dst, 15278); } break; case BC_ITERL: #if LJ_HASJIT - dasm_put(Dst, 15004, HOTCOUNT_PCMASK, GG_DISP2HOT); + dasm_put(Dst, 15097, HOTCOUNT_PCMASK, GG_DISP2HOT); #endif break; @@ -2289,33 +2300,33 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) break; #endif case BC_IITERL: - dasm_put(Dst, 15196, LJ_TNIL); + dasm_put(Dst, 15289, LJ_TNIL); if (op == BC_JITERL) { - dasm_put(Dst, 15211, BC_JLOOP); + dasm_put(Dst, 15304, BC_JLOOP); } else { - dasm_put(Dst, 15225, -BCBIAS_J*4); + dasm_put(Dst, 15318, -BCBIAS_J*4); } - dasm_put(Dst, 11165); + dasm_put(Dst, 11258); break; case BC_LOOP: #if LJ_HASJIT - dasm_put(Dst, 15004, HOTCOUNT_PCMASK, GG_DISP2HOT); + dasm_put(Dst, 15097, HOTCOUNT_PCMASK, GG_DISP2HOT); #endif break; case BC_ILOOP: - dasm_put(Dst, 10870); + dasm_put(Dst, 10963); break; case BC_JLOOP: #if LJ_HASJIT - dasm_put(Dst, 15241, DISPATCH_J(trace), DtD(->mcode), DISPATCH_GL(jit_base), DISPATCH_GL(jit_L)); + dasm_put(Dst, 15334, DISPATCH_J(trace), DtD(->mcode), DISPATCH_GL(jit_base), DISPATCH_GL(jit_L)); #endif break; case BC_JMP: - dasm_put(Dst, 15264, -BCBIAS_J*4); + dasm_put(Dst, 15357, -BCBIAS_J*4); break; /* -- Function headers -------------------------------------------------- */ @@ -2329,7 +2340,7 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) case BC_FUNCF: #if LJ_HASJIT - dasm_put(Dst, 15288, HOTCOUNT_PCMASK, GG_DISP2HOT); + dasm_put(Dst, 15381, HOTCOUNT_PCMASK, GG_DISP2HOT); #endif case BC_FUNCV: /* NYI: compiled vararg functions. */ break; @@ -2339,13 +2350,13 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) break; #endif case BC_IFUNCF: - dasm_put(Dst, 15309, -4+PC2PROTO(k), Dt1(->maxstack), -4+PC2PROTO(numparams)); + dasm_put(Dst, 15402, -4+PC2PROTO(k), Dt1(->maxstack), -4+PC2PROTO(numparams)); if (op == BC_JFUNCF) { - dasm_put(Dst, 15339, BC_JLOOP); + dasm_put(Dst, 15432, BC_JLOOP); } else { - dasm_put(Dst, 10870); + dasm_put(Dst, 10963); } - dasm_put(Dst, 15348, LJ_TNIL); + dasm_put(Dst, 15441, LJ_TNIL); break; case BC_JFUNCV: @@ -2356,30 +2367,30 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) break; /* NYI: compiled vararg functions. */ case BC_IFUNCV: - dasm_put(Dst, 15370, FRAME_VARG, Dt1(->maxstack), -4+PC2PROTO(numparams), LJ_TNIL); + dasm_put(Dst, 15463, FRAME_VARG, Dt1(->maxstack), -4+PC2PROTO(numparams), LJ_TNIL); if (op == BC_JFUNCV) { - dasm_put(Dst, 15339, BC_JLOOP); + dasm_put(Dst, 15432, BC_JLOOP); } else { - dasm_put(Dst, 15461, -4+PC2PROTO(k)); + dasm_put(Dst, 15554, -4+PC2PROTO(k)); } - dasm_put(Dst, 15483, LJ_TNIL); + dasm_put(Dst, 15576, LJ_TNIL); break; case BC_FUNCC: case BC_FUNCCW: - dasm_put(Dst, 15505, Dt8(->f), Dt1(->base), 8*LUA_MINSTACK, Dt1(->maxstack), Dt1(->top)); + dasm_put(Dst, 15598, Dt8(->f), Dt1(->base), 8*LUA_MINSTACK, Dt1(->maxstack), Dt1(->top)); if (op == BC_FUNCC) { - dasm_put(Dst, 15534); + dasm_put(Dst, 15627); } else { - dasm_put(Dst, 15538); + dasm_put(Dst, 15631); } - dasm_put(Dst, 15546, DISPATCH_GL(vmstate), ~LJ_VMST_C); + dasm_put(Dst, 15639, DISPATCH_GL(vmstate), ~LJ_VMST_C); if (op == BC_FUNCC) { - dasm_put(Dst, 15555); + dasm_put(Dst, 15648); } else { - dasm_put(Dst, 15559, DISPATCH_GL(wrapf)); + dasm_put(Dst, 15652, DISPATCH_GL(wrapf)); } - dasm_put(Dst, 15564, DISPATCH_GL(vmstate), ~LJ_VMST_INTERP, Dt1(->base), Dt1(->top)); + dasm_put(Dst, 15657, DISPATCH_GL(vmstate), ~LJ_VMST_INTERP, Dt1(->base), Dt1(->top)); break; /* ---------------------------------------------------------------------- */ @@ -2407,7 +2418,7 @@ static int build_backend(BuildCtx *ctx) build_subroutines(ctx, cmov, sse); - dasm_put(Dst, 15589); + dasm_put(Dst, 15682); for (op = 0; op < BC__MAX; op++) build_ins(ctx, (BCOp)op, op, cmov, sse);