gh-mirror/mikepaul-LuaJIT
1
0
Fork 0
mirror of https://github.com/LuaJIT/LuaJIT.git synced 2025-02-07 23:24:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix TNEW in x64 interpreter. Do not force a full GC (ouch).

Browse Source
This commit is contained in:
Mike Pall 2010-04-25 19:33:39 +02:00
parent ef0904e80b
commit 2ccb24f894
4 changed files with 346 additions and 359 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/buildvm_x64.h
View File

@ -555,12 +555,12 @@ static const unsigned char build_actionlist[14075] = {
139,108,36,24,137,149,233,139,82,252,248,65,139,52,135,137,252,239,137,92, 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, 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,3,15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36,252,238,255,
139,124,36,24,137,151,233,248,1,137,194,37,252,255,7,0,0,193,252,234,11,61, 139,108,36,24,137,149,233,65,139,142,233,65,59,142,233,137,92,36,28,15,131,
252,255,7,0,0,15,132,244,249,248,2,137,198,65,139,134,233,137,252,253,65, 244,251,248,1,137,194,37,252,255,7,0,0,193,252,234,11,61,252,255,7,0,0,15,
59,134,233,137,92,36,28,15,131,244,251,232,251,1,29,139,149,233,15,182,75, 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, 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,232, 193,232,16,65,252,255,36,252,238,248,3,184,1,8,0,0,252,233,244,2,248,5,137,
251,1,30,15,183,67,252,254,137,252,239,252,233,244,1,255,72,252,247,208,139, 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, 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, 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, 253,137,4,202,199,68,202,4,237,139,3,15,182,204,15,182,232,131,195,4,193,

200
src/buildvm_x64win.h
View File

@ -12,7 +12,7 @@
#define DASM_SECTION_CODE_OP 0 #define DASM_SECTION_CODE_OP 0
#define DASM_SECTION_CODE_SUB 1 #define DASM_SECTION_CODE_SUB 1
#define DASM_MAXSECTION 2 #define DASM_MAXSECTION 2
static const unsigned char build_actionlist[14023] = { static const unsigned char build_actionlist[14024] = {
254,1,248,10,252,247,198,237,15,132,244,11,131,230,252,248,41,252,242,72, 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, 141,76,49,252,248,139,114,252,252,199,68,10,4,237,248,12,131,192,1,137,68,
36,84,252,247,198,237,15,132,244,13,248,14,252,247,198,237,15,132,244,10, 36,84,252,247,198,237,15,132,244,13,248,14,252,247,198,237,15,132,244,10,
@ -554,21 +554,21 @@ static const unsigned char build_actionlist[14023] = {
131,198,4,193,232,16,252,255,36,252,235,255,72,252,247,208,139,108,36,96, 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, 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, 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,76,36,96,137, 204,15,182,232,131,198,4,193,232,16,252,255,36,252,235,255,139,108,36,96,
145,233,248,1,65,137,192,37,252,255,7,0,0,65,193,232,11,61,252,255,7,0,0, 137,149,233,139,139,233,59,139,233,137,116,36,100,15,131,244,251,248,1,65,
15,132,244,249,248,2,137,194,139,131,233,137,205,59,131,233,137,116,36,100, 137,192,37,252,255,7,0,0,65,193,232,11,61,252,255,7,0,0,15,132,244,249,248,
15,131,244,251,232,251,1,29,139,149,233,15,182,78,252,253,137,4,202,199,68, 2,137,252,233,137,194,232,251,1,29,139,149,233,15,182,78,252,253,137,4,202,
202,4,237,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,252, 199,68,202,4,237,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,
235,248,3,184,1,8,0,0,252,233,244,2,248,5,232,251,1,30,15,183,70,252,254, 36,252,235,248,3,184,1,8,0,0,252,233,244,2,248,5,137,252,233,232,251,1,30,
137,252,233,252,233,244,1,255,72,252,247,208,139,108,36,96,139,139,233,137, 15,183,70,252,254,252,233,244,1,255,72,252,247,208,139,108,36,96,139,139,
116,36,100,59,139,233,137,149,233,15,131,244,249,248,2,139,20,135,137,252, 233,137,116,36,100,59,139,233,137,149,233,15,131,244,249,248,2,139,20,135,
233,232,251,1,31,139,149,233,15,182,78,252,253,137,4,202,199,68,202,4,237, 137,252,233,232,251,1,31,139,149,233,15,182,78,252,253,137,4,202,199,68,202,
139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,252,235,248,3, 4,237,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,252,235,
137,252,233,232,251,1,30,15,183,70,252,254,72,252,247,208,252,233,244,2,255, 248,3,137,252,233,232,251,1,30,15,183,70,252,254,72,252,247,208,252,233,244,
72,252,247,208,139,106,252,248,139,173,233,139,4,135,252,233,244,157,255, 2,255,72,252,247,208,139,106,252,248,139,173,233,139,4,135,252,233,244,157,
72,252,247,208,139,106,252,248,139,173,233,139,4,135,252,233,244,158,255, 255,72,252,247,208,139,106,252,248,139,173,233,139,4,135,252,233,244,158,
15,182,252,236,15,182,192,129,124,253,252,234,4,239,15,133,244,36,139,44, 255,15,182,252,236,15,182,192,129,124,253,252,234,4,239,15,133,244,36,139,
252,234,129,124,253,194,4,239,15,135,244,251,255,252,242,15,16,4,194,252, 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, 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,248,1, 15,131,244,36,193,224,3,3,133,233,129,120,253,4,239,15,132,244,248,248,1,
139,40,139,64,4,137,44,202,137,68,202,4,139,6,15,182,204,15,182,232,131,198, 139,40,139,64,4,137,44,202,137,68,202,4,139,6,15,182,204,15,182,232,131,198,
@ -1912,61 +1912,61 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse)
dasm_put(Dst, 11175, Dt1(->base), DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), LJ_TTAB); dasm_put(Dst, 11175, Dt1(->base), DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), LJ_TTAB);
break; break;
case BC_TDUP: case BC_TDUP:
dasm_put(Dst, 11296, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), Dt1(->base), LJ_TTAB); dasm_put(Dst, 11297, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), Dt1(->base), LJ_TTAB);
break; break;
case BC_GGET: case BC_GGET:
dasm_put(Dst, 11391, Dt7(->env)); dasm_put(Dst, 11392, Dt7(->env));
break; break;
case BC_GSET: case BC_GSET:
dasm_put(Dst, 11410, Dt7(->env)); dasm_put(Dst, 11411, Dt7(->env));
break; break;
case BC_TGETV: case BC_TGETV:
dasm_put(Dst, 11429, LJ_TTAB, LJ_TISNUM); dasm_put(Dst, 11430, LJ_TTAB, LJ_TISNUM);
if (sse) { if (sse) {
dasm_put(Dst, 11462); dasm_put(Dst, 11463);
} else { } else {
} }
dasm_put(Dst, 11483, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<<MM_index); dasm_put(Dst, 11484, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<<MM_index);
dasm_put(Dst, 11576, LJ_TSTR); dasm_put(Dst, 11577, LJ_TSTR);
break; break;
case BC_TGETS: case BC_TGETS:
dasm_put(Dst, 11594, LJ_TTAB, Dt6(->hmask), Dt5(->hash), sizeof(Node), Dt6(->node), DtB(->key.it), LJ_TSTR, DtB(->key.gcr), LJ_TNIL); dasm_put(Dst, 11595, LJ_TTAB, Dt6(->hmask), Dt5(->hash), sizeof(Node), Dt6(->node), DtB(->key.it), LJ_TSTR, DtB(->key.gcr), LJ_TNIL);
dasm_put(Dst, 11679, LJ_TNIL, DtB(->next), Dt6(->metatable), Dt6(->nomm), 1<<MM_index); dasm_put(Dst, 11680, LJ_TNIL, DtB(->next), Dt6(->metatable), Dt6(->nomm), 1<<MM_index);
break; break;
case BC_TGETB: case BC_TGETB:
dasm_put(Dst, 11751, LJ_TTAB, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<<MM_index); dasm_put(Dst, 11752, LJ_TTAB, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<<MM_index);
dasm_put(Dst, 10092); dasm_put(Dst, 10092);
break; break;
case BC_TSETV: case BC_TSETV:
dasm_put(Dst, 11851, LJ_TTAB, LJ_TISNUM); dasm_put(Dst, 11852, LJ_TTAB, LJ_TISNUM);
if (sse) { if (sse) {
dasm_put(Dst, 11462); dasm_put(Dst, 11463);
} else { } else {
} }
dasm_put(Dst, 11884, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->metatable)); dasm_put(Dst, 11885, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->metatable));
dasm_put(Dst, 11968, Dt6(->nomm), 1<<MM_newindex, LJ_TSTR, Dt6(->marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); dasm_put(Dst, 11969, Dt6(->nomm), 1<<MM_newindex, LJ_TSTR, Dt6(->marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist));
break; break;
case BC_TSETS: case BC_TSETS:
dasm_put(Dst, 12030, 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, 12031, 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<<MM_newindex, DtB(->next)); dasm_put(Dst, 12107, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<<MM_newindex, DtB(->next));
dasm_put(Dst, 12199, Dt6(->metatable), Dt6(->nomm), 1<<MM_newindex, LJ_TSTR, Dt1(->base), Dt1(->base), Dt6(->marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); dasm_put(Dst, 12200, Dt6(->metatable), Dt6(->nomm), 1<<MM_newindex, LJ_TSTR, Dt1(->base), Dt1(->base), Dt6(->marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist));
break; break;
case BC_TSETB: case BC_TSETB:
dasm_put(Dst, 12290, LJ_TTAB, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable)); dasm_put(Dst, 12291, LJ_TTAB, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable));
dasm_put(Dst, 12389, Dt6(->metatable), Dt6(->nomm), 1<<MM_newindex, Dt6(->marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); dasm_put(Dst, 12390, Dt6(->metatable), Dt6(->nomm), 1<<MM_newindex, Dt6(->marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist));
break; break;
case BC_TSETM: case BC_TSETM:
dasm_put(Dst, 12435); dasm_put(Dst, 12436);
if (sse) { if (sse) {
dasm_put(Dst, 12440); dasm_put(Dst, 12441);
} else { } else {
} }
dasm_put(Dst, 12447, Dt6(->marked), LJ_GC_BLACK, Dt6(->asize), Dt6(->array), Dt1(->base), Dt1(->base)); dasm_put(Dst, 12448, Dt6(->marked), LJ_GC_BLACK, Dt6(->asize), Dt6(->array), Dt1(->base), Dt1(->base));
dasm_put(Dst, 12587, Dt6(->marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); dasm_put(Dst, 12588, Dt6(->marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist));
break; break;
/* -- Calls and vararg handling ----------------------------------------- */ /* -- Calls and vararg handling ----------------------------------------- */
@ -1974,60 +1974,60 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse)
case BC_CALL: case BC_CALLM: case BC_CALL: case BC_CALLM:
dasm_put(Dst, 10106); dasm_put(Dst, 10106);
if (op == BC_CALLM) { if (op == BC_CALLM) {
dasm_put(Dst, 12605); dasm_put(Dst, 12606);
} }
dasm_put(Dst, 12610, LJ_TFUNC, Dt7(->pc)); dasm_put(Dst, 12611, LJ_TFUNC, Dt7(->pc));
break; break;
case BC_CALLMT: case BC_CALLMT:
dasm_put(Dst, 12605); dasm_put(Dst, 12606);
break; break;
case BC_CALLT: case BC_CALLT:
dasm_put(Dst, 12652, LJ_TFUNC, FRAME_TYPE, Dt7(->ffid), Dt7(->pc)); dasm_put(Dst, 12653, LJ_TFUNC, FRAME_TYPE, Dt7(->ffid), Dt7(->pc));
dasm_put(Dst, 12771, FRAME_TYPE, Dt7(->pc), PC2PROTO(k)); dasm_put(Dst, 12772, FRAME_TYPE, Dt7(->pc), PC2PROTO(k));
break; break;
case BC_ITERC: case BC_ITERC:
dasm_put(Dst, 12829, LJ_TFUNC, 2+1, Dt7(->pc)); dasm_put(Dst, 12830, LJ_TFUNC, 2+1, Dt7(->pc));
break; break;
case BC_VARG: case BC_VARG:
dasm_put(Dst, 12910, Dt7(->pc), PC2PROTO(numparams), (8+FRAME_VARG), LJ_TNIL); dasm_put(Dst, 12911, Dt7(->pc), PC2PROTO(numparams), (8+FRAME_VARG), LJ_TNIL);
dasm_put(Dst, 13055, Dt1(->maxstack), Dt1(->base), Dt1(->top), Dt1(->base), Dt1(->top)); dasm_put(Dst, 13056, Dt1(->maxstack), Dt1(->base), Dt1(->top), Dt1(->base), Dt1(->top));
break; break;
/* -- Returns ----------------------------------------------------------- */ /* -- Returns ----------------------------------------------------------- */
case BC_RETM: case BC_RETM:
dasm_put(Dst, 12605); dasm_put(Dst, 12606);
break; break;
case BC_RET: case BC_RET0: case BC_RET1: case BC_RET: case BC_RET0: case BC_RET1:
if (op != BC_RET0) { if (op != BC_RET0) {
dasm_put(Dst, 13154); dasm_put(Dst, 13155);
} }
dasm_put(Dst, 13158, FRAME_TYPE); dasm_put(Dst, 13159, FRAME_TYPE);
switch (op) { switch (op) {
case BC_RET: case BC_RET:
dasm_put(Dst, 13177); dasm_put(Dst, 13178);
break; break;
case BC_RET1: case BC_RET1:
dasm_put(Dst, 13235); dasm_put(Dst, 13236);
/* fallthrough */ /* fallthrough */
case BC_RET0: case BC_RET0:
dasm_put(Dst, 13251); dasm_put(Dst, 13252);
default: default:
break; break;
} }
dasm_put(Dst, 13262, Dt7(->pc), PC2PROTO(k)); dasm_put(Dst, 13263, Dt7(->pc), PC2PROTO(k));
if (op == BC_RET) { if (op == BC_RET) {
dasm_put(Dst, 13306, LJ_TNIL); dasm_put(Dst, 13307, LJ_TNIL);
} else { } else {
dasm_put(Dst, 13315, LJ_TNIL); dasm_put(Dst, 13316, LJ_TNIL);
} }
dasm_put(Dst, 13322); dasm_put(Dst, 13323);
if (op != BC_RET0) { if (op != BC_RET0) {
dasm_put(Dst, 13343); dasm_put(Dst, 13344);
} }
dasm_put(Dst, 4570); dasm_put(Dst, 4570);
break; break;
@ -2037,7 +2037,7 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse)
case BC_FORL: case BC_FORL:
#if LJ_HASJIT #if LJ_HASJIT
dasm_put(Dst, 13347, HOTCOUNT_PCMASK, GG_DISP2HOT); dasm_put(Dst, 13348, HOTCOUNT_PCMASK, GG_DISP2HOT);
#endif #endif
break; break;
@ -2049,57 +2049,57 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse)
case BC_FORI: case BC_FORI:
case BC_IFORL: case BC_IFORL:
vk = (op == BC_IFORL || op == BC_JFORL); vk = (op == BC_IFORL || op == BC_JFORL);
dasm_put(Dst, 13368); dasm_put(Dst, 13369);
if (!vk) { if (!vk) {
dasm_put(Dst, 13372, LJ_TISNUM, LJ_TISNUM); dasm_put(Dst, 13373, LJ_TISNUM, LJ_TISNUM);
} }
dasm_put(Dst, 13391); dasm_put(Dst, 13392);
if (!vk) { if (!vk) {
dasm_put(Dst, 13395, LJ_TISNUM); dasm_put(Dst, 13396, LJ_TISNUM);
} }
if (sse) { if (sse) {
dasm_put(Dst, 13404); dasm_put(Dst, 13405);
if (vk) { if (vk) {
dasm_put(Dst, 13416); dasm_put(Dst, 13417);
} else { } else {
dasm_put(Dst, 13435); dasm_put(Dst, 13436);
} }
dasm_put(Dst, 13440); dasm_put(Dst, 13441);
} else { } else {
dasm_put(Dst, 13453); dasm_put(Dst, 13454);
if (vk) { if (vk) {
dasm_put(Dst, 13459); dasm_put(Dst, 13460);
} else { } else {
dasm_put(Dst, 13475); dasm_put(Dst, 13476);
} }
dasm_put(Dst, 13483); dasm_put(Dst, 13484);
if (cmov) { if (cmov) {
dasm_put(Dst, 9529); dasm_put(Dst, 9529);
} else { } else {
dasm_put(Dst, 9535); dasm_put(Dst, 9535);
} }
if (!cmov) { if (!cmov) {
dasm_put(Dst, 13488); dasm_put(Dst, 13489);
} }
} }
if (op == BC_FORI) { if (op == BC_FORI) {
dasm_put(Dst, 13494, -BCBIAS_J*4); dasm_put(Dst, 13495, -BCBIAS_J*4);
} else if (op == BC_JFORI) { } else if (op == BC_JFORI) {
dasm_put(Dst, 13504, -BCBIAS_J*4, BC_JLOOP); dasm_put(Dst, 13505, -BCBIAS_J*4, BC_JLOOP);
} else if (op == BC_IFORL) { } else if (op == BC_IFORL) {
dasm_put(Dst, 13518, -BCBIAS_J*4); dasm_put(Dst, 13519, -BCBIAS_J*4);
} else { } else {
dasm_put(Dst, 13514, BC_JLOOP); dasm_put(Dst, 13515, BC_JLOOP);
} }
dasm_put(Dst, 9564); dasm_put(Dst, 9564);
if (sse) { if (sse) {
dasm_put(Dst, 13528); dasm_put(Dst, 13529);
} }
break; break;
case BC_ITERL: case BC_ITERL:
#if LJ_HASJIT #if LJ_HASJIT
dasm_put(Dst, 13347, HOTCOUNT_PCMASK, GG_DISP2HOT); dasm_put(Dst, 13348, HOTCOUNT_PCMASK, GG_DISP2HOT);
#endif #endif
break; break;
@ -2108,18 +2108,18 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse)
break; break;
#endif #endif
case BC_IITERL: case BC_IITERL:
dasm_put(Dst, 13539, LJ_TNIL); dasm_put(Dst, 13540, LJ_TNIL);
if (op == BC_JITERL) { if (op == BC_JITERL) {
dasm_put(Dst, 13554, BC_JLOOP); dasm_put(Dst, 13555, BC_JLOOP);
} else { } else {
dasm_put(Dst, 13568, -BCBIAS_J*4); dasm_put(Dst, 13569, -BCBIAS_J*4);
} }
dasm_put(Dst, 9864); dasm_put(Dst, 9864);
break; break;
case BC_LOOP: case BC_LOOP:
#if LJ_HASJIT #if LJ_HASJIT
dasm_put(Dst, 13347, HOTCOUNT_PCMASK, GG_DISP2HOT); dasm_put(Dst, 13348, HOTCOUNT_PCMASK, GG_DISP2HOT);
#endif #endif
break; break;
@ -2129,12 +2129,12 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse)
case BC_JLOOP: case BC_JLOOP:
#if LJ_HASJIT #if LJ_HASJIT
dasm_put(Dst, 13584, 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, 13585, 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 #endif
break; break;
case BC_JMP: case BC_JMP:
dasm_put(Dst, 13693, -BCBIAS_J*4); dasm_put(Dst, 13694, -BCBIAS_J*4);
break; break;
/* -- Function headers -------------------------------------------------- */ /* -- Function headers -------------------------------------------------- */
@ -2148,7 +2148,7 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse)
case BC_FUNCF: case BC_FUNCF:
#if LJ_HASJIT #if LJ_HASJIT
dasm_put(Dst, 13718, HOTCOUNT_PCMASK, GG_DISP2HOT); dasm_put(Dst, 13719, HOTCOUNT_PCMASK, GG_DISP2HOT);
#endif #endif
case BC_FUNCV: /* NYI: compiled vararg functions. */ case BC_FUNCV: /* NYI: compiled vararg functions. */
break; break;
@ -2158,13 +2158,13 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse)
break; break;
#endif #endif
case BC_IFUNCF: case BC_IFUNCF:
dasm_put(Dst, 13739, -4+PC2PROTO(k), Dt1(->maxstack), -4+PC2PROTO(numparams)); dasm_put(Dst, 13740, -4+PC2PROTO(k), Dt1(->maxstack), -4+PC2PROTO(numparams));
if (op == BC_JFUNCF) { if (op == BC_JFUNCF) {
dasm_put(Dst, 13769, BC_JLOOP); dasm_put(Dst, 13770, BC_JLOOP);
} else { } else {
dasm_put(Dst, 9566); dasm_put(Dst, 9566);
} }
dasm_put(Dst, 13778, LJ_TNIL); dasm_put(Dst, 13779, LJ_TNIL);
break; break;
case BC_JFUNCV: case BC_JFUNCV:
@ -2175,30 +2175,30 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse)
break; /* NYI: compiled vararg functions. */ break; /* NYI: compiled vararg functions. */
case BC_IFUNCV: case BC_IFUNCV:
dasm_put(Dst, 13800, FRAME_VARG, Dt1(->maxstack), -4+PC2PROTO(numparams), LJ_TNIL); dasm_put(Dst, 13801, FRAME_VARG, Dt1(->maxstack), -4+PC2PROTO(numparams), LJ_TNIL);
if (op == BC_JFUNCV) { if (op == BC_JFUNCV) {
dasm_put(Dst, 13769, BC_JLOOP); dasm_put(Dst, 13770, BC_JLOOP);
} else { } else {
dasm_put(Dst, 13891, -4+PC2PROTO(k)); dasm_put(Dst, 13892, -4+PC2PROTO(k));
} }
dasm_put(Dst, 13914, LJ_TNIL); dasm_put(Dst, 13915, LJ_TNIL);
break; break;
case BC_FUNCC: case BC_FUNCC:
case BC_FUNCCW: case BC_FUNCCW:
dasm_put(Dst, 13936, Dt8(->f), Dt1(->base), 8*LUA_MINSTACK, Dt1(->maxstack), Dt1(->top)); dasm_put(Dst, 13937, Dt8(->f), Dt1(->base), 8*LUA_MINSTACK, Dt1(->maxstack), Dt1(->top));
if (op == BC_FUNCC) { if (op == BC_FUNCC) {
dasm_put(Dst, 13966); dasm_put(Dst, 13967);
} else { } else {
dasm_put(Dst, 13970); dasm_put(Dst, 13971);
} }
dasm_put(Dst, 13978, DISPATCH_GL(vmstate), ~LJ_VMST_C); dasm_put(Dst, 13979, DISPATCH_GL(vmstate), ~LJ_VMST_C);
if (op == BC_FUNCC) { if (op == BC_FUNCC) {
dasm_put(Dst, 13987); dasm_put(Dst, 13988);
} else { } else {
dasm_put(Dst, 13991, DISPATCH_GL(wrapf)); dasm_put(Dst, 13992, DISPATCH_GL(wrapf));
} }
dasm_put(Dst, 13996, DISPATCH_GL(vmstate), ~LJ_VMST_INTERP, Dt1(->base), Dt1(->top)); dasm_put(Dst, 13997, DISPATCH_GL(vmstate), ~LJ_VMST_INTERP, Dt1(->base), Dt1(->top));
break; break;
/* ---------------------------------------------------------------------- */ /* ---------------------------------------------------------------------- */
@ -2226,7 +2226,7 @@ static int build_backend(BuildCtx *ctx)
build_subroutines(ctx, cmov, sse); build_subroutines(ctx, cmov, sse);
dasm_put(Dst, 14021); dasm_put(Dst, 14022);
for (op = 0; op < BC__MAX; op++) for (op = 0; op < BC__MAX; op++)
build_ins(ctx, (BCOp)op, op, cmov, sse); build_ins(ctx, (BCOp)op, op, cmov, sse);

47
src/buildvm_x86.dasc
View File

@ -3901,39 +3901,32 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse)
case BC_TNEW: case BC_TNEW:
| ins_AD // RA = dst, RD = hbits|asize | ins_AD // RA = dst, RD = hbits|asize
|.if X64 | mov L:RB, SAVE_L
| mov L:CARG1d, SAVE_L | mov L:RB->base, BASE
| mov L:CARG1d->base, BASE // Caveat: CARG2d/CARG3d may be BASE. | mov RA, [DISPATCH+DISPATCH_GL(gc.total)]
| cmp RA, [DISPATCH+DISPATCH_GL(gc.threshold)]
| mov SAVE_PC, PC
| jae >5
|1: |1:
|.if X64
| mov CARG3d, RD | mov CARG3d, RD
| and RD, 0x7ff | and RD, 0x7ff
| shr CARG3d, 11 | shr CARG3d, 11
| cmp RD, 0x7ff
| je >3
|2:
| mov CARG2d, RD
| mov RD, [DISPATCH+DISPATCH_GL(gc.total)]
| mov L:RB, L:CARG1d
| cmp RD, [DISPATCH+DISPATCH_GL(gc.threshold)]
| mov SAVE_PC, PC
| jae >5
|.else |.else
| mov RB, RD | mov RA, RD
| and RD, 0x7ff | and RD, 0x7ff
| shr RB, 11 | shr RA, 11
| mov ARG3, RA
|.endif
| cmp RD, 0x7ff | cmp RD, 0x7ff
| je >3 | je >3
|2: |2:
| mov ARG3, RB |.if X64
| mov L:RB, SAVE_L | mov L:CARG1d, L:RB
| mov ARG2, RD | mov CARG2d, RD
| mov SAVE_PC, PC |.else
| mov RD, [DISPATCH+DISPATCH_GL(gc.total)]
| mov ARG1, L:RB | mov ARG1, L:RB
| cmp RD, [DISPATCH+DISPATCH_GL(gc.threshold)] | mov ARG2, RD
| mov L:RB->base, BASE
| jae >5
|1:
|.endif |.endif
| call extern lj_tab_new // (lua_State *L, int32_t asize, uint32_t hbits) | call extern lj_tab_new // (lua_State *L, int32_t asize, uint32_t hbits)
| // Table * returned in eax (RC). | // Table * returned in eax (RC).
@ -3946,16 +3939,10 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse)
| mov RD, 0x801 | mov RD, 0x801
| jmp <2 | jmp <2
|5: |5:
|.if X64
| call extern lj_gc_step_fixtop@4 // (lua_State *L)
| movzx RD, PC_RD
| mov L:CARG1d, L:RB
| jmp <1
|.else
| mov L:FCARG1, L:RB | mov L:FCARG1, L:RB
| call extern lj_gc_step_fixtop@4 // (lua_State *L) | call extern lj_gc_step_fixtop@4 // (lua_State *L)
| movzx RD, PC_RD
| jmp <1 | jmp <1
|.endif
break; break;
case BC_TDUP: case BC_TDUP:
| ins_AND // RA = dst, RD = table const (~) (holding template table) | ins_AND // RA = dst, RD = table const (~) (holding template table)

448
src/buildvm_x86.h
View File

@ -12,7 +12,7 @@
#define DASM_SECTION_CODE_OP 0 #define DASM_SECTION_CODE_OP 0
#define DASM_SECTION_CODE_SUB 1 #define DASM_SECTION_CODE_SUB 1
#define DASM_MAXSECTION 2 #define DASM_MAXSECTION 2
static const unsigned char build_actionlist[15224] = { static const unsigned char build_actionlist[15229] = {
254,1,248,10,252,247,198,237,15,132,244,11,131,230,252,248,41,252,242,141, 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, 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,252,247,198,237,15,132,244,10,199, 20,252,247,198,237,15,132,244,13,248,14,252,247,198,237,15,132,244,10,199,
@ -612,141 +612,141 @@ static const unsigned char build_actionlist[15224] = {
255,36,171,255,252,247,208,139,74,252,248,139,4,135,139,108,36,48,137,76, 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, 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, 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,137,197,37,252,255,7,0,0,193, 232,131,198,4,193,232,16,252,255,36,171,255,139,108,36,48,137,149,233,139,
252,237,11,61,252,255,7,0,0,15,132,244,249,248,2,137,108,36,8,139,108,36, 139,233,59,139,233,137,116,36,24,15,131,244,251,248,1,137,193,37,252,255,
48,137,68,36,4,137,116,36,24,139,131,233,137,44,36,59,131,233,137,149,233, 7,0,0,193,252,233,11,137,76,36,8,61,252,255,7,0,0,15,132,244,249,248,2,137,
15,131,244,251,248,1,232,251,1,29,139,149,233,15,182,78,252,253,137,4,202, 44,36,137,68,36,4,232,251,1,29,139,149,233,15,182,78,252,253,137,4,202,199,
199,68,202,4,237,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255, 68,202,4,237,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,
36,171,248,3,184,1,8,0,0,252,233,244,2,248,5,137,252,233,232,251,1,30,252, 171,248,3,184,1,8,0,0,252,233,244,2,248,5,137,252,233,232,251,1,30,15,183,
233,244,1,255,252,247,208,139,108,36,48,139,139,233,137,116,36,24,59,139, 70,252,254,252,233,244,1,255,252,247,208,139,108,36,48,139,139,233,137,116,
233,137,149,233,15,131,244,249,248,2,139,20,135,137,252,233,232,251,1,31, 36,24,59,139,233,137,149,233,15,131,244,249,248,2,139,20,135,137,252,233,
139,149,233,15,182,78,252,253,137,4,202,199,68,202,4,237,139,6,15,182,204, 232,251,1,31,139,149,233,15,182,78,252,253,137,4,202,199,68,202,4,237,139,
15,182,232,131,198,4,193,232,16,252,255,36,171,248,3,137,252,233,232,251, 6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,171,248,3,137,252,
1,30,15,183,70,252,254,252,247,208,252,233,244,2,255,252,247,208,139,106, 233,232,251,1,30,15,183,70,252,254,252,247,208,252,233,244,2,255,252,247,
252,248,139,173,233,139,4,135,252,233,244,157,255,252,247,208,139,106,252, 208,139,106,252,248,139,173,233,139,4,135,252,233,244,157,255,252,247,208,
248,139,173,233,139,4,135,252,233,244,158,255,15,182,252,236,15,182,192,129, 139,106,252,248,139,173,233,139,4,135,252,233,244,158,255,15,182,252,236,
124,253,252,234,4,239,15,133,244,36,139,44,252,234,129,124,253,194,4,239, 15,182,192,129,124,253,252,234,4,239,15,133,244,36,139,44,252,234,129,124,
15,135,244,251,255,252,242,15,16,4,194,252,242,15,45,192,252,242,15,42,200, 253,194,4,239,15,135,244,251,255,252,242,15,16,4,194,252,242,15,45,192,252,
102,15,46,193,255,221,4,194,219,20,36,219,4,36,255,15,133,244,36,59,133,233, 242,15,42,200,102,15,46,193,255,221,4,194,219,20,36,219,4,36,255,15,133,244,
15,131,244,36,193,224,3,3,133,233,129,120,253,4,239,15,132,244,248,248,1, 36,59,133,233,15,131,244,36,193,224,3,3,133,233,129,120,253,4,239,15,132,
139,40,139,64,4,137,44,202,137,68,202,4,139,6,15,182,204,15,182,232,131,198, 244,248,248,1,139,40,139,64,4,137,44,202,137,68,202,4,139,6,15,182,204,15,
4,193,232,16,252,255,36,171,248,2,131,189,233,0,15,132,244,1,139,141,233, 182,232,131,198,4,193,232,16,252,255,36,171,248,2,131,189,233,0,15,132,244,
252,246,129,233,235,15,132,244,36,15,182,78,252,253,252,233,244,1,248,5,255, 1,139,141,233,252,246,129,233,235,15,132,244,36,15,182,78,252,253,252,233,
129,124,253,194,4,239,15,133,244,36,139,4,194,252,233,244,157,255,15,182, 244,1,248,5,255,129,124,253,194,4,239,15,133,244,36,139,4,194,252,233,244,
252,236,15,182,192,252,247,208,139,4,135,129,124,253,252,234,4,239,15,133, 157,255,15,182,252,236,15,182,192,252,247,208,139,4,135,129,124,253,252,234,
244,34,139,44,252,234,248,157,139,141,233,35,136,233,105,201,239,3,141,233, 4,239,15,133,244,34,139,44,252,234,248,157,139,141,233,35,136,233,105,201,
248,1,129,185,233,239,15,133,244,250,57,129,233,15,133,244,250,129,121,253, 239,3,141,233,248,1,129,185,233,239,15,133,244,250,57,129,233,15,133,244,
4,239,15,132,244,251,15,182,70,252,253,139,41,139,73,4,137,44,194,248,2,255, 250,129,121,253,4,239,15,132,244,251,15,182,70,252,253,139,41,139,73,4,137,
137,76,194,4,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36, 44,194,248,2,255,137,76,194,4,139,6,15,182,204,15,182,232,131,198,4,193,232,
171,248,3,15,182,70,252,253,185,237,252,233,244,2,248,4,139,137,233,133,201, 16,252,255,36,171,248,3,15,182,70,252,253,185,237,252,233,244,2,248,4,139,
15,133,244,1,248,5,139,141,233,133,201,15,132,244,3,252,246,129,233,235,15, 137,233,133,201,15,133,244,1,248,5,139,141,233,133,201,15,132,244,3,252,246,
133,244,3,252,233,244,34,255,15,182,252,236,15,182,192,129,124,253,252,234, 129,233,235,15,133,244,3,252,233,244,34,255,15,182,252,236,15,182,192,129,
4,239,15,133,244,35,139,44,252,234,59,133,233,15,131,244,35,193,224,3,3,133, 124,253,252,234,4,239,15,133,244,35,139,44,252,234,59,133,233,15,131,244,
233,129,120,253,4,239,15,132,244,248,248,1,139,40,139,64,4,137,44,202,137, 35,193,224,3,3,133,233,129,120,253,4,239,15,132,244,248,248,1,139,40,139,
68,202,4,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,171, 64,4,137,44,202,137,68,202,4,139,6,15,182,204,15,182,232,131,198,4,193,232,
248,2,131,189,233,0,15,132,244,1,139,141,233,252,246,129,233,235,15,132,244, 16,252,255,36,171,248,2,131,189,233,0,15,132,244,1,139,141,233,252,246,129,
35,255,15,182,252,236,15,182,192,129,124,253,252,234,4,239,15,133,244,39, 233,235,15,132,244,35,255,15,182,252,236,15,182,192,129,124,253,252,234,4,
139,44,252,234,129,124,253,194,4,239,15,135,244,251,255,15,133,244,39,59, 239,15,133,244,39,139,44,252,234,129,124,253,194,4,239,15,135,244,251,255,
133,233,15,131,244,39,193,224,3,3,133,233,129,120,253,4,239,15,132,244,249, 15,133,244,39,59,133,233,15,131,244,39,193,224,3,3,133,233,129,120,253,4,
248,1,252,246,133,233,235,15,133,244,253,248,2,139,108,202,4,139,12,202,137, 239,15,132,244,249,248,1,252,246,133,233,235,15,133,244,253,248,2,139,108,
104,4,137,8,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,171, 202,4,139,12,202,137,104,4,137,8,139,6,15,182,204,15,182,232,131,198,4,193,
248,3,131,189,233,0,15,132,244,1,139,141,233,255,252,246,129,233,235,15,132, 232,16,252,255,36,171,248,3,131,189,233,0,15,132,244,1,139,141,233,255,252,
244,39,15,182,78,252,253,252,233,244,1,248,5,129,124,253,194,4,239,15,133, 246,129,233,235,15,132,244,39,15,182,78,252,253,252,233,244,1,248,5,129,124,
244,39,139,4,194,252,233,244,158,248,7,128,165,233,235,139,139,233,137,171, 253,194,4,239,15,133,244,39,139,4,194,252,233,244,158,248,7,128,165,233,235,
233,137,141,233,15,182,78,252,253,252,233,244,2,255,15,182,252,236,15,182, 139,139,233,137,171,233,137,141,233,15,182,78,252,253,252,233,244,2,255,15,
192,252,247,208,139,4,135,129,124,253,252,234,4,239,15,133,244,37,139,44, 182,252,236,15,182,192,252,247,208,139,4,135,129,124,253,252,234,4,239,15,
252,234,248,158,139,141,233,35,136,233,105,201,239,198,133,233,0,3,141,233, 133,244,37,139,44,252,234,248,158,139,141,233,35,136,233,105,201,239,198,
248,1,129,185,233,239,15,133,244,251,57,129,233,15,133,244,251,129,121,253, 133,233,0,3,141,233,248,1,129,185,233,239,15,133,244,251,57,129,233,15,133,
4,239,15,132,244,250,248,2,255,252,246,133,233,235,15,133,244,253,248,3,15, 244,251,129,121,253,4,239,15,132,244,250,248,2,255,252,246,133,233,235,15,
182,70,252,253,139,108,194,4,139,4,194,137,105,4,137,1,139,6,15,182,204,15, 133,244,253,248,3,15,182,70,252,253,139,108,194,4,139,4,194,137,105,4,137,
182,232,131,198,4,193,232,16,252,255,36,171,248,4,131,189,233,0,15,132,244, 1,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,171,248,4,131,
2,137,76,36,16,139,141,233,252,246,129,233,235,15,132,244,37,139,76,36,16, 189,233,0,15,132,244,2,137,76,36,16,139,141,233,252,246,129,233,235,15,132,
252,233,244,2,248,5,139,137,233,133,201,15,133,244,1,255,139,141,233,133, 244,37,139,76,36,16,252,233,244,2,248,5,139,137,233,133,201,15,133,244,1,
201,15,132,244,252,252,246,129,233,235,15,132,244,37,248,6,137,68,36,16,199, 255,139,141,233,133,201,15,132,244,252,252,246,129,233,235,15,132,244,37,
68,36,20,237,137,108,36,12,141,68,36,16,137,108,36,4,139,108,36,48,137,68, 248,6,137,68,36,16,199,68,36,20,237,137,108,36,12,141,68,36,16,137,108,36,
36,8,137,44,36,137,149,233,137,116,36,24,232,251,1,32,139,149,233,139,108, 4,139,108,36,48,137,68,36,8,137,44,36,137,149,233,137,116,36,24,232,251,1,
36,12,137,193,252,233,244,2,248,7,128,165,233,235,139,131,233,137,171,233, 32,139,149,233,139,108,36,12,137,193,252,233,244,2,248,7,128,165,233,235,
137,133,233,252,233,244,3,255,15,182,252,236,15,182,192,129,124,253,252,234, 139,131,233,137,171,233,137,133,233,252,233,244,3,255,15,182,252,236,15,182,
4,239,15,133,244,38,139,44,252,234,59,133,233,15,131,244,38,193,224,3,3,133, 192,129,124,253,252,234,4,239,15,133,244,38,139,44,252,234,59,133,233,15,
233,129,120,253,4,239,15,132,244,249,248,1,252,246,133,233,235,15,133,244, 131,244,38,193,224,3,3,133,233,129,120,253,4,239,15,132,244,249,248,1,252,
253,248,2,139,108,202,4,139,12,202,137,104,4,137,8,139,6,15,182,204,15,182, 246,133,233,235,15,133,244,253,248,2,139,108,202,4,139,12,202,137,104,4,137,
232,131,198,4,193,232,16,252,255,36,171,248,3,131,189,233,0,15,132,244,1, 8,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,171,248,3,131,
255,139,141,233,252,246,129,233,235,15,132,244,38,15,182,78,252,253,252,233, 189,233,0,15,132,244,1,255,139,141,233,252,246,129,233,235,15,132,244,38,
244,1,248,7,128,165,233,235,139,139,233,137,171,233,137,141,233,15,182,78, 15,182,78,252,253,252,233,244,1,248,7,128,165,233,235,139,139,233,137,171,
252,253,252,233,244,2,255,137,124,36,16,255,252,242,15,45,60,199,255,221, 233,137,141,233,15,182,78,252,253,252,233,244,2,255,137,124,36,16,255,252,
4,199,219,92,36,12,139,124,36,12,255,248,1,141,12,202,139,105,252,248,252, 242,15,45,60,199,255,221,4,199,219,92,36,12,139,124,36,12,255,248,1,141,12,
246,133,233,235,15,133,244,253,248,2,139,68,36,20,131,232,1,15,132,244,250, 202,139,105,252,248,252,246,133,233,235,15,133,244,253,248,2,139,68,36,20,
1,252,248,59,133,233,15,131,244,251,41,252,248,193,231,3,3,189,233,248,3, 131,232,1,15,132,244,250,1,252,248,59,133,233,15,131,244,251,41,252,248,193,
139,41,137,47,139,105,4,131,193,8,137,111,4,131,199,8,131,232,1,15,133,244, 231,3,3,189,233,248,3,139,41,137,47,139,105,4,131,193,8,137,111,4,131,199,
3,248,4,139,124,36,16,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252, 8,131,232,1,15,133,244,3,248,4,139,124,36,16,139,6,15,182,204,15,182,232,
255,36,171,248,5,137,108,36,4,139,108,36,48,137,149,233,137,68,36,8,137,44, 131,198,4,193,232,16,252,255,36,171,248,5,137,108,36,4,139,108,36,48,137,
36,137,116,36,24,232,251,1,33,139,149,233,15,182,78,252,253,252,233,244,1, 149,233,137,68,36,8,137,44,36,137,116,36,24,232,251,1,33,139,149,233,15,182,
248,7,255,128,165,233,235,139,131,233,137,171,233,137,133,233,252,233,244, 78,252,253,252,233,244,1,248,7,255,128,165,233,235,139,131,233,137,171,233,
2,255,3,68,36,20,255,129,124,253,202,4,239,139,44,202,15,133,244,51,141,84, 137,133,233,252,233,244,2,255,3,68,36,20,255,129,124,253,202,4,239,139,44,
202,8,137,114,252,252,139,181,233,139,14,15,182,252,233,15,182,205,131,198, 202,15,133,244,51,141,84,202,8,137,114,252,252,139,181,233,139,14,15,182,
4,252,255,36,171,255,141,76,202,8,137,215,139,105,252,248,129,121,253,252, 252,233,15,182,205,131,198,4,252,255,36,171,255,141,76,202,8,137,215,139,
252,239,15,133,244,28,248,52,139,114,252,252,252,247,198,237,15,133,244,253, 105,252,248,129,121,253,252,252,239,15,133,244,28,248,52,139,114,252,252,
248,1,137,106,252,248,137,68,36,20,131,232,1,15,132,244,249,248,2,139,41, 252,247,198,237,15,133,244,253,248,1,137,106,252,248,137,68,36,20,131,232,
137,47,139,105,4,137,111,4,131,199,8,131,193,8,131,232,1,15,133,244,2,139, 1,15,132,244,249,248,2,139,41,137,47,139,105,4,137,111,4,131,199,8,131,193,
106,252,248,248,3,139,68,36,20,128,189,233,1,15,135,244,251,248,4,139,181, 8,131,232,1,15,133,244,2,139,106,252,248,248,3,139,68,36,20,128,189,233,1,
233,139,14,15,182,252,233,15,182,205,131,198,4,252,255,36,171,248,5,255,252, 15,135,244,251,248,4,139,181,233,139,14,15,182,252,233,15,182,205,131,198,
247,198,237,15,133,244,4,15,182,78,252,253,252,247,209,141,12,202,139,121, 4,252,255,36,171,248,5,255,252,247,198,237,15,133,244,4,15,182,78,252,253,
252,248,139,191,233,139,191,233,252,233,244,4,248,7,15,139,244,1,131,230, 252,247,209,141,12,202,139,121,252,248,139,191,233,139,191,233,252,233,244,
252,248,41,252,242,137,215,139,114,252,252,252,233,244,1,255,141,76,202,8, 4,248,7,15,139,244,1,131,230,252,248,41,252,242,137,215,139,114,252,252,252,
139,105,232,139,65,252,236,137,41,137,65,4,139,105,252,240,139,65,252,244, 233,244,1,255,141,76,202,8,139,105,232,139,65,252,236,137,41,137,65,4,139,
137,105,8,137,65,12,139,105,224,139,65,228,137,105,252,248,137,65,252,252, 105,252,240,139,65,252,244,137,105,8,137,65,12,139,105,224,139,65,228,137,
129,252,248,239,184,237,15,133,244,28,137,202,137,114,252,252,139,181,233, 105,252,248,137,65,252,252,129,252,248,239,184,237,15,133,244,28,137,202,
139,14,15,182,252,233,15,182,205,131,198,4,252,255,36,171,255,15,182,252, 137,114,252,252,139,181,233,139,14,15,182,252,233,15,182,205,131,198,4,252,
236,139,66,252,248,141,12,202,139,128,233,15,182,128,233,137,124,36,16,141, 255,36,171,255,15,182,252,236,139,66,252,248,141,12,202,139,128,233,15,182,
188,253,194,233,43,122,252,252,133,252,237,15,132,244,251,141,108,252,233, 128,233,137,124,36,16,141,188,253,194,233,43,122,252,252,133,252,237,15,132,
252,248,57,215,15,131,244,248,248,1,139,71,252,248,137,1,139,71,252,252,131, 244,251,141,108,252,233,252,248,57,215,15,131,244,248,248,1,139,71,252,248,
199,8,137,65,4,131,193,8,57,252,233,15,131,244,249,57,215,15,130,244,1,248, 137,1,139,71,252,252,131,199,8,137,65,4,131,193,8,57,252,233,15,131,244,249,
2,199,65,4,237,131,193,8,57,252,233,15,130,244,2,248,3,139,124,36,16,139, 57,215,15,130,244,1,248,2,199,65,4,237,131,193,8,57,252,233,15,130,244,2,
6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,171,248,5,199,68, 248,3,139,124,36,16,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,
36,20,1,0,0,0,137,208,41,252,248,15,134,244,3,255,137,197,193,252,237,3,131, 255,36,171,248,5,199,68,36,20,1,0,0,0,137,208,41,252,248,15,134,244,3,255,
197,1,137,108,36,20,139,108,36,48,1,200,59,133,233,15,135,244,253,248,6,139, 137,197,193,252,237,3,131,197,1,137,108,36,20,139,108,36,48,1,200,59,133,
71,252,248,137,1,139,71,252,252,131,199,8,137,65,4,131,193,8,57,215,15,130, 233,15,135,244,253,248,6,139,71,252,248,137,1,139,71,252,252,131,199,8,137,
244,6,252,233,244,3,248,7,137,149,233,137,141,233,137,116,36,24,41,215,139, 65,4,131,193,8,57,215,15,130,244,6,252,233,244,3,248,7,137,149,233,137,141,
84,36,20,131,252,234,1,137,252,233,232,251,1,0,139,149,233,139,141,233,1, 233,137,116,36,24,41,215,139,84,36,20,131,252,234,1,137,252,233,232,251,1,
215,252,233,244,6,255,193,225,3,255,248,1,139,114,252,252,137,68,36,20,252, 0,139,149,233,139,141,233,1,215,252,233,244,6,255,193,225,3,255,248,1,139,
247,198,237,15,133,244,253,255,248,13,137,215,131,232,1,15,132,244,249,248, 114,252,252,137,68,36,20,252,247,198,237,15,133,244,253,255,248,13,137,215,
2,139,44,15,137,111,252,248,139,108,15,4,137,111,252,252,131,199,8,131,232, 131,232,1,15,132,244,249,248,2,139,44,15,137,111,252,248,139,108,15,4,137,
1,15,133,244,2,248,3,139,68,36,20,15,182,110,252,255,248,5,57,197,15,135, 111,252,252,131,199,8,131,232,1,15,133,244,2,248,3,139,68,36,20,15,182,110,
244,252,255,139,108,10,4,137,106,252,252,139,44,10,137,106,252,248,255,248, 252,255,248,5,57,197,15,135,244,252,255,139,108,10,4,137,106,252,252,139,
5,56,70,252,255,15,135,244,252,255,15,182,78,252,253,252,247,209,141,20,202, 44,10,137,106,252,248,255,248,5,56,70,252,255,15,135,244,252,255,15,182,78,
139,122,252,248,139,191,233,139,191,233,139,6,15,182,204,15,182,232,131,198, 252,253,252,247,209,141,20,202,139,122,252,248,139,191,233,139,191,233,139,
4,193,232,16,252,255,36,171,248,6,255,199,71,252,252,237,131,199,8,255,199, 6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,171,248,6,255,199,
68,194,252,244,237,255,131,192,1,252,233,244,5,248,7,15,139,244,14,131,230, 71,252,252,237,131,199,8,255,199,68,194,252,244,237,255,131,192,1,252,233,
252,248,41,252,242,255,1,252,241,255,137,252,245,209,252,237,129,229,239, 244,5,248,7,15,139,244,14,131,230,252,248,41,252,242,255,1,252,241,255,137,
102,131,172,253,43,233,1,15,132,244,140,255,141,12,202,255,129,121,253,4, 252,245,209,252,237,129,229,239,102,131,172,253,43,233,1,15,132,244,140,255,
239,15,135,244,53,129,121,253,12,239,15,135,244,53,255,139,105,20,255,129, 141,12,202,255,129,121,253,4,239,15,135,244,53,129,121,253,12,239,15,135,
252,253,239,15,135,244,53,255,252,242,15,16,1,252,242,15,16,73,8,255,252, 244,53,255,139,105,20,255,129,252,253,239,15,135,244,53,255,252,242,15,16,
242,15,88,65,16,252,242,15,17,1,133,252,237,15,136,244,249,255,15,140,244, 1,252,242,15,16,73,8,255,252,242,15,88,65,16,252,242,15,17,1,133,252,237,
249,255,102,15,46,200,248,1,252,242,15,17,65,24,255,221,65,8,221,1,255,220, 15,136,244,249,255,15,140,244,249,255,102,15,46,200,248,1,252,242,15,17,65,
65,16,221,17,221,81,24,133,252,237,15,136,244,247,255,221,81,24,15,140,244, 24,255,221,65,8,221,1,255,220,65,16,221,17,221,81,24,133,252,237,15,136,244,
247,255,217,201,248,1,255,15,183,70,252,254,255,15,131,244,248,141,180,253, 247,255,221,81,24,15,140,244,247,255,217,201,248,1,255,15,183,70,252,254,
134,233,255,141,180,253,134,233,15,183,70,252,254,15,131,245,255,15,130,244, 255,15,131,244,248,141,180,253,134,233,255,141,180,253,134,233,15,183,70,
248,141,180,253,134,233,255,248,3,102,15,46,193,252,233,244,1,255,141,12, 252,254,15,131,245,255,15,130,244,248,141,180,253,134,233,255,248,3,102,15,
202,139,105,4,129,252,253,239,15,132,244,247,255,137,105,252,252,139,41,137, 46,193,252,233,244,1,255,141,12,202,139,105,4,129,252,253,239,15,132,244,
105,252,248,252,233,245,255,141,180,253,134,233,139,1,137,105,252,252,137, 247,255,137,105,252,252,139,41,137,105,252,248,252,233,245,255,141,180,253,
65,252,248,255,139,139,233,139,4,129,139,128,233,139,108,36,48,137,147,233, 134,233,139,1,137,105,252,252,137,65,252,248,255,139,139,233,139,4,129,139,
137,171,233,252,255,224,255,141,180,253,134,233,139,6,15,182,204,15,182,232, 128,233,139,108,36,48,137,147,233,137,171,233,252,255,224,255,141,180,253,
131,198,4,193,232,16,252,255,36,171,255,137,252,245,209,252,237,129,229,239, 134,233,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,171,255,
102,131,172,253,43,233,1,15,132,244,142,255,139,190,233,139,108,36,48,141, 137,252,245,209,252,237,129,229,239,102,131,172,253,43,233,1,15,132,244,142,
12,202,59,141,233,15,135,244,23,15,182,142,233,57,200,15,134,244,249,248, 255,139,190,233,139,108,36,48,141,12,202,59,141,233,15,135,244,23,15,182,
2,255,15,183,70,252,254,252,233,245,255,248,3,199,68,194,252,252,237,131, 142,233,57,200,15,134,244,249,248,2,255,15,183,70,252,254,252,233,245,255,
192,1,57,200,15,134,244,3,252,233,244,2,255,141,44,197,237,141,4,194,139, 248,3,199,68,194,252,252,237,131,192,1,57,200,15,134,244,3,252,233,244,2,
122,252,248,137,104,252,252,137,120,252,248,139,108,36,48,141,12,200,59,141, 255,141,44,197,237,141,4,194,139,122,252,248,137,104,252,252,137,120,252,
233,15,135,244,22,137,209,137,194,15,182,174,233,133,252,237,15,132,244,248, 248,139,108,36,48,141,12,200,59,141,233,15,135,244,22,137,209,137,194,15,
248,1,131,193,8,57,209,15,131,244,249,139,121,252,248,137,56,139,121,252, 182,174,233,133,252,237,15,132,244,248,248,1,131,193,8,57,209,15,131,244,
252,137,120,4,131,192,8,199,65,252,252,237,131,252,237,1,15,133,244,1,248, 249,139,121,252,248,137,56,139,121,252,252,137,120,4,131,192,8,199,65,252,
2,255,139,190,233,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255, 252,237,131,252,237,1,15,133,244,1,248,2,255,139,190,233,139,6,15,182,204,
36,171,255,248,3,199,64,4,237,131,192,8,131,252,237,1,15,133,244,3,252,233, 15,182,232,131,198,4,193,232,16,252,255,36,171,255,248,3,199,64,4,237,131,
244,2,255,139,106,252,248,139,189,233,139,108,36,48,141,68,194,252,248,137, 192,8,131,252,237,1,15,133,244,3,252,233,244,2,255,139,106,252,248,139,189,
149,233,141,136,233,59,141,233,137,133,233,255,137,44,36,255,137,124,36,4, 233,139,108,36,48,141,68,194,252,248,137,149,233,141,136,233,59,141,233,137,
137,44,36,255,15,135,244,21,199,131,233,237,255,252,255,215,255,252,255,147, 133,233,255,137,44,36,255,137,124,36,4,137,44,36,255,15,135,244,21,199,131,
233,255,199,131,233,237,139,149,233,141,12,194,252,247,217,3,141,233,139, 233,237,255,252,255,215,255,252,255,147,233,255,199,131,233,237,139,149,233,
114,252,252,252,233,244,12,255,254,0 141,12,194,252,247,217,3,141,233,139,114,252,252,252,233,244,12,255,254,0
}; };
enum { enum {
@ -2020,25 +2020,25 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse)
/* -- Table ops --------------------------------------------------------- */ /* -- Table ops --------------------------------------------------------- */
case BC_TNEW: case BC_TNEW:
dasm_put(Dst, 12456, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), Dt1(->base), LJ_TTAB); dasm_put(Dst, 12456, Dt1(->base), DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), LJ_TTAB);
break; break;
case BC_TDUP: case BC_TDUP:
dasm_put(Dst, 12577, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), Dt1(->base), LJ_TTAB); dasm_put(Dst, 12582, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), Dt1(->base), LJ_TTAB);
break; break;
case BC_GGET: case BC_GGET:
dasm_put(Dst, 12669, Dt7(->env)); dasm_put(Dst, 12674, Dt7(->env));
break; break;
case BC_GSET: case BC_GSET:
dasm_put(Dst, 12687, Dt7(->env)); dasm_put(Dst, 12692, Dt7(->env));
break; break;
case BC_TGETV: case BC_TGETV:
dasm_put(Dst, 12705, LJ_TTAB, LJ_TISNUM); dasm_put(Dst, 12710, LJ_TTAB, LJ_TISNUM);
if (sse) { if (sse) {
dasm_put(Dst, 12738); dasm_put(Dst, 12743);
} else { } else {
dasm_put(Dst, 12759); dasm_put(Dst, 12764);
if (cmov) { if (cmov) {
dasm_put(Dst, 10805); dasm_put(Dst, 10805);
} else { } else {
@ -2046,24 +2046,24 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse)
} }
dasm_put(Dst, 2524); dasm_put(Dst, 2524);
} }
dasm_put(Dst, 12769, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<<MM_index); dasm_put(Dst, 12774, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<<MM_index);
dasm_put(Dst, 12861, LJ_TSTR); dasm_put(Dst, 12866, LJ_TSTR);
break; break;
case BC_TGETS: case BC_TGETS:
dasm_put(Dst, 12879, LJ_TTAB, Dt6(->hmask), Dt5(->hash), sizeof(Node), Dt6(->node), DtB(->key.it), LJ_TSTR, DtB(->key.gcr), LJ_TNIL); dasm_put(Dst, 12884, LJ_TTAB, Dt6(->hmask), Dt5(->hash), sizeof(Node), Dt6(->node), DtB(->key.it), LJ_TSTR, DtB(->key.gcr), LJ_TNIL);
dasm_put(Dst, 12963, LJ_TNIL, DtB(->next), Dt6(->metatable), Dt6(->nomm), 1<<MM_index); dasm_put(Dst, 12968, LJ_TNIL, DtB(->next), Dt6(->metatable), Dt6(->nomm), 1<<MM_index);
break; break;
case BC_TGETB: case BC_TGETB:
dasm_put(Dst, 13034, LJ_TTAB, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<<MM_index); dasm_put(Dst, 13039, LJ_TTAB, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<<MM_index);
dasm_put(Dst, 11376); dasm_put(Dst, 11376);
break; break;
case BC_TSETV: case BC_TSETV:
dasm_put(Dst, 13133, LJ_TTAB, LJ_TISNUM); dasm_put(Dst, 13138, LJ_TTAB, LJ_TISNUM);
if (sse) { if (sse) {
dasm_put(Dst, 12738); dasm_put(Dst, 12743);
} else { } else {
dasm_put(Dst, 12759); dasm_put(Dst, 12764);
if (cmov) { if (cmov) {
dasm_put(Dst, 10805); dasm_put(Dst, 10805);
} else { } else {
@ -2071,28 +2071,28 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse)
} }
dasm_put(Dst, 2524); dasm_put(Dst, 2524);
} }
dasm_put(Dst, 13166, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->metatable)); dasm_put(Dst, 13171, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->metatable));
dasm_put(Dst, 13249, Dt6(->nomm), 1<<MM_newindex, LJ_TSTR, Dt6(->marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); dasm_put(Dst, 13254, Dt6(->nomm), 1<<MM_newindex, LJ_TSTR, Dt6(->marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist));
break; break;
case BC_TSETS: case BC_TSETS:
dasm_put(Dst, 13311, 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, 13316, 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, 13386, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<<MM_newindex, DtB(->next)); dasm_put(Dst, 13391, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<<MM_newindex, DtB(->next));
dasm_put(Dst, 13478, Dt6(->metatable), Dt6(->nomm), 1<<MM_newindex, LJ_TSTR, Dt1(->base), Dt1(->base), Dt6(->marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); dasm_put(Dst, 13483, Dt6(->metatable), Dt6(->nomm), 1<<MM_newindex, LJ_TSTR, Dt1(->base), Dt1(->base), Dt6(->marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist));
break; break;
case BC_TSETB: case BC_TSETB:
dasm_put(Dst, 13574, LJ_TTAB, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable)); dasm_put(Dst, 13579, LJ_TTAB, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable));
dasm_put(Dst, 13672, Dt6(->metatable), Dt6(->nomm), 1<<MM_newindex, Dt6(->marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); dasm_put(Dst, 13677, Dt6(->metatable), Dt6(->nomm), 1<<MM_newindex, Dt6(->marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist));
break; break;
case BC_TSETM: case BC_TSETM:
dasm_put(Dst, 13718); dasm_put(Dst, 13723);
if (sse) { if (sse) {
dasm_put(Dst, 13723); dasm_put(Dst, 13728);
} else { } else {
dasm_put(Dst, 13730); dasm_put(Dst, 13735);
} }
dasm_put(Dst, 13742, Dt6(->marked), LJ_GC_BLACK, Dt6(->asize), Dt6(->array), Dt1(->base), Dt1(->base)); dasm_put(Dst, 13747, Dt6(->marked), LJ_GC_BLACK, Dt6(->asize), Dt6(->array), Dt1(->base), Dt1(->base));
dasm_put(Dst, 13884, Dt6(->marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); dasm_put(Dst, 13889, Dt6(->marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist));
break; break;
/* -- Calls and vararg handling ----------------------------------------- */ /* -- Calls and vararg handling ----------------------------------------- */
@ -2100,60 +2100,60 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse)
case BC_CALL: case BC_CALLM: case BC_CALL: case BC_CALLM:
dasm_put(Dst, 11390); dasm_put(Dst, 11390);
if (op == BC_CALLM) { if (op == BC_CALLM) {
dasm_put(Dst, 13902); dasm_put(Dst, 13907);
} }
dasm_put(Dst, 13907, LJ_TFUNC, Dt7(->pc)); dasm_put(Dst, 13912, LJ_TFUNC, Dt7(->pc));
break; break;
case BC_CALLMT: case BC_CALLMT:
dasm_put(Dst, 13902); dasm_put(Dst, 13907);
break; break;
case BC_CALLT: case BC_CALLT:
dasm_put(Dst, 13948, LJ_TFUNC, FRAME_TYPE, Dt7(->ffid), Dt7(->pc)); dasm_put(Dst, 13953, LJ_TFUNC, FRAME_TYPE, Dt7(->ffid), Dt7(->pc));
dasm_put(Dst, 14066, FRAME_TYPE, Dt7(->pc), PC2PROTO(k)); dasm_put(Dst, 14071, FRAME_TYPE, Dt7(->pc), PC2PROTO(k));
break; break;
case BC_ITERC: case BC_ITERC:
dasm_put(Dst, 14123, LJ_TFUNC, 2+1, Dt7(->pc)); dasm_put(Dst, 14128, LJ_TFUNC, 2+1, Dt7(->pc));
break; break;
case BC_VARG: case BC_VARG:
dasm_put(Dst, 14203, Dt7(->pc), PC2PROTO(numparams), (8+FRAME_VARG), LJ_TNIL); dasm_put(Dst, 14208, Dt7(->pc), PC2PROTO(numparams), (8+FRAME_VARG), LJ_TNIL);
dasm_put(Dst, 14347, Dt1(->maxstack), Dt1(->base), Dt1(->top), Dt1(->base), Dt1(->top)); dasm_put(Dst, 14352, Dt1(->maxstack), Dt1(->base), Dt1(->top), Dt1(->base), Dt1(->top));
break; break;
/* -- Returns ----------------------------------------------------------- */ /* -- Returns ----------------------------------------------------------- */
case BC_RETM: case BC_RETM:
dasm_put(Dst, 13902); dasm_put(Dst, 13907);
break; break;
case BC_RET: case BC_RET0: case BC_RET1: case BC_RET: case BC_RET0: case BC_RET1:
if (op != BC_RET0) { if (op != BC_RET0) {
dasm_put(Dst, 14446); dasm_put(Dst, 14451);
} }
dasm_put(Dst, 14450, FRAME_TYPE); dasm_put(Dst, 14455, FRAME_TYPE);
switch (op) { switch (op) {
case BC_RET: case BC_RET:
dasm_put(Dst, 14469); dasm_put(Dst, 14474);
break; break;
case BC_RET1: case BC_RET1:
dasm_put(Dst, 14527); dasm_put(Dst, 14532);
/* fallthrough */ /* fallthrough */
case BC_RET0: case BC_RET0:
dasm_put(Dst, 14543); dasm_put(Dst, 14548);
default: default:
break; break;
} }
dasm_put(Dst, 14554, Dt7(->pc), PC2PROTO(k)); dasm_put(Dst, 14559, Dt7(->pc), PC2PROTO(k));
if (op == BC_RET) { if (op == BC_RET) {
dasm_put(Dst, 14596, LJ_TNIL); dasm_put(Dst, 14601, LJ_TNIL);
} else { } else {
dasm_put(Dst, 14605, LJ_TNIL); dasm_put(Dst, 14610, LJ_TNIL);
} }
dasm_put(Dst, 14612); dasm_put(Dst, 14617);
if (op != BC_RET0) { if (op != BC_RET0) {
dasm_put(Dst, 14633); dasm_put(Dst, 14638);
} }
dasm_put(Dst, 4680); dasm_put(Dst, 4680);
break; break;
@ -2163,7 +2163,7 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse)
case BC_FORL: case BC_FORL:
#if LJ_HASJIT #if LJ_HASJIT
dasm_put(Dst, 14637, HOTCOUNT_PCMASK, GG_DISP2HOT); dasm_put(Dst, 14642, HOTCOUNT_PCMASK, GG_DISP2HOT);
#endif #endif
break; break;
@ -2175,57 +2175,57 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse)
case BC_FORI: case BC_FORI:
case BC_IFORL: case BC_IFORL:
vk = (op == BC_IFORL || op == BC_JFORL); vk = (op == BC_IFORL || op == BC_JFORL);
dasm_put(Dst, 14658); dasm_put(Dst, 14663);
if (!vk) { if (!vk) {
dasm_put(Dst, 14662, LJ_TISNUM, LJ_TISNUM); dasm_put(Dst, 14667, LJ_TISNUM, LJ_TISNUM);
} }
dasm_put(Dst, 14681); dasm_put(Dst, 14686);
if (!vk) { if (!vk) {
dasm_put(Dst, 14685, LJ_TISNUM); dasm_put(Dst, 14690, LJ_TISNUM);
} }
if (sse) { if (sse) {
dasm_put(Dst, 14694); dasm_put(Dst, 14699);
if (vk) { if (vk) {
dasm_put(Dst, 14706); dasm_put(Dst, 14711);
} else { } else {
dasm_put(Dst, 14725); dasm_put(Dst, 14730);
} }
dasm_put(Dst, 14730); dasm_put(Dst, 14735);
} else { } else {
dasm_put(Dst, 14743); dasm_put(Dst, 14748);
if (vk) { if (vk) {
dasm_put(Dst, 14749); dasm_put(Dst, 14754);
} else { } else {
dasm_put(Dst, 14765); dasm_put(Dst, 14770);
} }
dasm_put(Dst, 14773); dasm_put(Dst, 14778);
if (cmov) { if (cmov) {
dasm_put(Dst, 10805); dasm_put(Dst, 10805);
} else { } else {
dasm_put(Dst, 10811); dasm_put(Dst, 10811);
} }
if (!cmov) { if (!cmov) {
dasm_put(Dst, 14778); dasm_put(Dst, 14783);
} }
} }
if (op == BC_FORI) { if (op == BC_FORI) {
dasm_put(Dst, 14784, -BCBIAS_J*4); dasm_put(Dst, 14789, -BCBIAS_J*4);
} else if (op == BC_JFORI) { } else if (op == BC_JFORI) {
dasm_put(Dst, 14794, -BCBIAS_J*4, BC_JLOOP); dasm_put(Dst, 14799, -BCBIAS_J*4, BC_JLOOP);
} else if (op == BC_IFORL) { } else if (op == BC_IFORL) {
dasm_put(Dst, 14808, -BCBIAS_J*4); dasm_put(Dst, 14813, -BCBIAS_J*4);
} else { } else {
dasm_put(Dst, 14804, BC_JLOOP); dasm_put(Dst, 14809, BC_JLOOP);
} }
dasm_put(Dst, 10840); dasm_put(Dst, 10840);
if (sse) { if (sse) {
dasm_put(Dst, 14818); dasm_put(Dst, 14823);
} }
break; break;
case BC_ITERL: case BC_ITERL:
#if LJ_HASJIT #if LJ_HASJIT
dasm_put(Dst, 14637, HOTCOUNT_PCMASK, GG_DISP2HOT); dasm_put(Dst, 14642, HOTCOUNT_PCMASK, GG_DISP2HOT);
#endif #endif
break; break;
@ -2234,18 +2234,18 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse)
break; break;
#endif #endif
case BC_IITERL: case BC_IITERL:
dasm_put(Dst, 14829, LJ_TNIL); dasm_put(Dst, 14834, LJ_TNIL);
if (op == BC_JITERL) { if (op == BC_JITERL) {
dasm_put(Dst, 14844, BC_JLOOP); dasm_put(Dst, 14849, BC_JLOOP);
} else { } else {
dasm_put(Dst, 14858, -BCBIAS_J*4); dasm_put(Dst, 14863, -BCBIAS_J*4);
} }
dasm_put(Dst, 11137); dasm_put(Dst, 11137);
break; break;
case BC_LOOP: case BC_LOOP:
#if LJ_HASJIT #if LJ_HASJIT
dasm_put(Dst, 14637, HOTCOUNT_PCMASK, GG_DISP2HOT); dasm_put(Dst, 14642, HOTCOUNT_PCMASK, GG_DISP2HOT);
#endif #endif
break; break;
@ -2255,12 +2255,12 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse)
case BC_JLOOP: case BC_JLOOP:
#if LJ_HASJIT #if LJ_HASJIT
dasm_put(Dst, 14874, DISPATCH_J(trace), DtD(->mcode), DISPATCH_GL(jit_base), DISPATCH_GL(jit_L)); dasm_put(Dst, 14879, DISPATCH_J(trace), DtD(->mcode), DISPATCH_GL(jit_base), DISPATCH_GL(jit_L));
#endif #endif
break; break;
case BC_JMP: case BC_JMP:
dasm_put(Dst, 14897, -BCBIAS_J*4); dasm_put(Dst, 14902, -BCBIAS_J*4);
break; break;
/* -- Function headers -------------------------------------------------- */ /* -- Function headers -------------------------------------------------- */
@ -2274,7 +2274,7 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse)
case BC_FUNCF: case BC_FUNCF:
#if LJ_HASJIT #if LJ_HASJIT
dasm_put(Dst, 14921, HOTCOUNT_PCMASK, GG_DISP2HOT); dasm_put(Dst, 14926, HOTCOUNT_PCMASK, GG_DISP2HOT);
#endif #endif
case BC_FUNCV: /* NYI: compiled vararg functions. */ case BC_FUNCV: /* NYI: compiled vararg functions. */
break; break;
@ -2284,13 +2284,13 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse)
break; break;
#endif #endif
case BC_IFUNCF: case BC_IFUNCF:
dasm_put(Dst, 14942, -4+PC2PROTO(k), Dt1(->maxstack), -4+PC2PROTO(numparams)); dasm_put(Dst, 14947, -4+PC2PROTO(k), Dt1(->maxstack), -4+PC2PROTO(numparams));
if (op == BC_JFUNCF) { if (op == BC_JFUNCF) {
dasm_put(Dst, 14972, BC_JLOOP); dasm_put(Dst, 14977, BC_JLOOP);
} else { } else {
dasm_put(Dst, 10842); dasm_put(Dst, 10842);
} }
dasm_put(Dst, 14981, LJ_TNIL); dasm_put(Dst, 14986, LJ_TNIL);
break; break;
case BC_JFUNCV: case BC_JFUNCV:
@ -2301,30 +2301,30 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse)
break; /* NYI: compiled vararg functions. */ break; /* NYI: compiled vararg functions. */
case BC_IFUNCV: case BC_IFUNCV:
dasm_put(Dst, 15003, FRAME_VARG, Dt1(->maxstack), -4+PC2PROTO(numparams), LJ_TNIL); dasm_put(Dst, 15008, FRAME_VARG, Dt1(->maxstack), -4+PC2PROTO(numparams), LJ_TNIL);
if (op == BC_JFUNCV) { if (op == BC_JFUNCV) {
dasm_put(Dst, 14972, BC_JLOOP); dasm_put(Dst, 14977, BC_JLOOP);
} else { } else {
dasm_put(Dst, 15094, -4+PC2PROTO(k)); dasm_put(Dst, 15099, -4+PC2PROTO(k));
} }
dasm_put(Dst, 15116, LJ_TNIL); dasm_put(Dst, 15121, LJ_TNIL);
break; break;
case BC_FUNCC: case BC_FUNCC:
case BC_FUNCCW: case BC_FUNCCW:
dasm_put(Dst, 15138, Dt8(->f), Dt1(->base), 8*LUA_MINSTACK, Dt1(->maxstack), Dt1(->top)); dasm_put(Dst, 15143, Dt8(->f), Dt1(->base), 8*LUA_MINSTACK, Dt1(->maxstack), Dt1(->top));
if (op == BC_FUNCC) { if (op == BC_FUNCC) {
dasm_put(Dst, 15167); dasm_put(Dst, 15172);
} else { } else {
dasm_put(Dst, 15171); dasm_put(Dst, 15176);
} }
dasm_put(Dst, 15179, DISPATCH_GL(vmstate), ~LJ_VMST_C); dasm_put(Dst, 15184, DISPATCH_GL(vmstate), ~LJ_VMST_C);
if (op == BC_FUNCC) { if (op == BC_FUNCC) {
dasm_put(Dst, 15188); dasm_put(Dst, 15193);
} else { } else {
dasm_put(Dst, 15192, DISPATCH_GL(wrapf)); dasm_put(Dst, 15197, DISPATCH_GL(wrapf));
} }
dasm_put(Dst, 15197, DISPATCH_GL(vmstate), ~LJ_VMST_INTERP, Dt1(->base), Dt1(->top)); dasm_put(Dst, 15202, DISPATCH_GL(vmstate), ~LJ_VMST_INTERP, Dt1(->base), Dt1(->top));
break; break;
/* ---------------------------------------------------------------------- */ /* ---------------------------------------------------------------------- */
@ -2352,7 +2352,7 @@ static int build_backend(BuildCtx *ctx)
build_subroutines(ctx, cmov, sse); build_subroutines(ctx, cmov, sse);
dasm_put(Dst, 15222); dasm_put(Dst, 15227);
for (op = 0; op < BC__MAX; op++) for (op = 0; op < BC__MAX; op++)
build_ins(ctx, (BCOp)op, op, cmov, sse); build_ins(ctx, (BCOp)op, op, cmov, sse);