Specialize bytecode for pairs()/next() iterator. Speedup: 3.5x.
Parser predict pairs/next and emits specialized bytecode. Bytecode is descpecialized at runtime if the prediction was wrong. Store slot index in hidden control var to avoid key lookups.
This commit is contained in:
@@ -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[15260] = {
|
||||
static const unsigned char build_actionlist[15576] = {
|
||||
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,
|
||||
@@ -699,56 +699,72 @@ static const unsigned char build_actionlist[15260] = {
|
||||
139,65,252,236,137,41,137,65,4,139,105,252,240,139,65,252,244,137,105,8,137,
|
||||
65,12,139,105,224,139,65,228,137,105,252,248,137,65,252,252,129,252,248,239,
|
||||
184,237,15,133,244,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,171,255,15,182,252,236,15,182,192,137,
|
||||
124,36,16,141,188,253,194,233,141,12,202,43,122,252,252,133,252,237,15,132,
|
||||
244,251,141,108,252,233,252,248,57,215,15,131,244,248,248,1,139,71,252,248,
|
||||
137,1,139,71,252,252,131,199,8,137,65,4,131,193,8,57,252,233,15,131,244,249,
|
||||
57,215,15,130,244,1,248,2,199,65,4,237,131,193,8,57,252,233,15,130,244,2,
|
||||
248,3,139,124,36,16,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,
|
||||
255,36,171,248,5,199,68,36,20,1,0,0,0,137,208,41,252,248,15,134,244,3,137,
|
||||
197,193,252,237,3,131,197,1,137,108,36,20,139,108,36,48,1,200,59,133,233,
|
||||
15,135,244,253,248,6,255,139,71,252,248,137,1,139,71,252,252,131,199,8,137,
|
||||
65,4,131,193,8,57,215,15,130,244,6,252,233,244,3,248,7,137,149,233,137,141,
|
||||
233,137,116,36,24,41,215,139,84,36,20,131,252,234,1,137,252,233,232,251,1,
|
||||
0,139,149,233,139,141,233,1,215,252,233,244,6,255,193,225,3,255,248,1,139,
|
||||
114,252,252,137,68,36,20,252,247,198,237,15,133,244,253,255,248,13,137,215,
|
||||
131,232,1,15,132,244,249,248,2,139,44,15,137,111,252,248,139,108,15,4,137,
|
||||
111,252,252,131,199,8,131,232,1,15,133,244,2,248,3,139,68,36,20,15,182,110,
|
||||
252,255,248,5,57,197,15,135,244,252,255,139,108,10,4,137,106,252,252,139,
|
||||
44,10,137,106,252,248,255,248,5,56,70,252,255,15,135,244,252,255,15,182,78,
|
||||
252,253,252,247,209,141,20,202,139,122,252,248,139,191,233,139,191,233,139,
|
||||
6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,171,248,6,255,199,
|
||||
71,252,252,237,131,199,8,255,199,68,194,252,244,237,255,131,192,1,252,233,
|
||||
244,5,248,7,141,174,233,252,247,197,237,15,133,244,14,41,252,234,255,1,252,
|
||||
233,255,137,252,245,209,252,237,129,229,239,102,131,172,253,43,233,1,15,132,
|
||||
244,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,139,128,233,139,108,36,48,137,147,233,137,171,233,252,255,224,255,141,
|
||||
180,253,134,233,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,
|
||||
36,171,255,137,252,245,209,252,237,129,229,239,102,131,172,253,43,233,1,15,
|
||||
132,244,142,255,139,190,233,139,108,36,48,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,48,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,171,255,248,3,199,64,4,237,131,
|
||||
192,8,131,252,237,1,15,133,244,3,252,233,244,2,255,139,106,252,248,139,189,
|
||||
233,139,108,36,48,141,68,194,252,248,137,149,233,141,136,233,59,141,233,137,
|
||||
133,233,255,137,44,36,255,137,124,36,4,137,44,36,255,15,135,244,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
|
||||
233,15,182,205,131,198,4,252,255,36,171,255,137,124,36,16,137,92,36,20,139,
|
||||
108,202,252,240,139,68,202,252,248,139,157,233,131,198,4,139,189,233,248,
|
||||
1,57,216,15,131,244,251,129,124,253,199,4,239,15,132,244,250,255,252,242,
|
||||
15,42,192,255,219,68,202,252,248,255,139,108,199,4,137,108,202,12,139,44,
|
||||
199,137,108,202,8,131,192,1,255,137,68,202,252,248,248,2,15,183,70,252,254,
|
||||
141,180,253,134,233,248,3,139,92,36,20,139,124,36,16,139,6,15,182,204,15,
|
||||
182,232,131,198,4,193,232,16,252,255,36,171,248,4,131,192,1,255,137,68,202,
|
||||
252,248,255,252,233,244,1,248,5,41,216,248,6,59,133,233,15,135,244,3,105,
|
||||
252,248,239,3,189,233,129,191,233,239,15,132,244,253,141,92,24,1,139,175,
|
||||
233,139,135,233,137,44,202,137,68,202,4,139,175,233,139,135,233,137,108,202,
|
||||
8,137,68,202,12,137,92,202,252,248,252,233,244,2,248,7,255,131,192,1,252,
|
||||
233,244,6,255,129,124,253,202,252,236,239,15,133,244,251,139,108,202,232,
|
||||
129,124,253,202,252,244,239,15,133,244,251,129,124,253,202,252,252,239,15,
|
||||
133,244,251,128,189,233,235,15,133,244,251,141,180,253,134,233,199,68,202,
|
||||
252,248,0,0,0,0,248,1,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,
|
||||
255,36,171,248,5,198,70,252,252,235,141,180,253,134,233,198,6,235,252,233,
|
||||
244,1,255,15,182,252,236,15,182,192,137,124,36,16,141,188,253,194,233,141,
|
||||
12,202,43,122,252,252,133,252,237,15,132,244,251,141,108,252,233,252,248,
|
||||
57,215,15,131,244,248,248,1,139,71,252,248,137,1,139,71,252,252,131,199,8,
|
||||
137,65,4,131,193,8,57,252,233,15,131,244,249,57,215,15,130,244,1,248,2,199,
|
||||
65,4,237,131,193,8,57,252,233,15,130,244,2,248,3,139,124,36,16,139,6,15,182,
|
||||
204,15,182,232,131,198,4,193,232,16,252,255,36,171,248,5,199,68,36,20,1,0,
|
||||
0,0,137,208,41,252,248,15,134,244,3,137,197,193,252,237,3,131,197,1,137,108,
|
||||
36,20,139,108,36,48,1,200,59,133,233,15,135,244,253,248,6,255,139,71,252,
|
||||
248,137,1,139,71,252,252,131,199,8,137,65,4,131,193,8,57,215,15,130,244,6,
|
||||
252,233,244,3,248,7,137,149,233,137,141,233,137,116,36,24,41,215,139,84,36,
|
||||
20,131,252,234,1,137,252,233,232,251,1,0,139,149,233,139,141,233,1,215,252,
|
||||
233,244,6,255,193,225,3,255,248,1,139,114,252,252,137,68,36,20,252,247,198,
|
||||
237,15,133,244,253,255,248,13,137,215,131,232,1,15,132,244,249,248,2,139,
|
||||
44,15,137,111,252,248,139,108,15,4,137,111,252,252,131,199,8,131,232,1,15,
|
||||
133,244,2,248,3,139,68,36,20,15,182,110,252,255,248,5,57,197,15,135,244,252,
|
||||
255,139,108,10,4,137,106,252,252,139,44,10,137,106,252,248,255,248,5,56,70,
|
||||
252,255,15,135,244,252,255,15,182,78,252,253,252,247,209,141,20,202,139,122,
|
||||
252,248,139,191,233,139,191,233,139,6,15,182,204,15,182,232,131,198,4,193,
|
||||
232,16,252,255,36,171,248,6,255,199,71,252,252,237,131,199,8,255,199,68,194,
|
||||
252,244,237,255,131,192,1,252,233,244,5,248,7,141,174,233,252,247,197,237,
|
||||
15,133,244,14,41,252,234,255,1,252,233,255,137,252,245,209,252,237,129,229,
|
||||
239,102,131,172,253,43,233,1,15,132,244,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,139,128,233,139,108,36,48,137,147,233,
|
||||
137,171,233,252,255,224,255,141,180,253,134,233,139,6,15,182,204,15,182,232,
|
||||
131,198,4,193,232,16,252,255,36,171,255,137,252,245,209,252,237,129,229,239,
|
||||
102,131,172,253,43,233,1,15,132,244,142,255,139,190,233,139,108,36,48,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,48,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,171,255,248,3,199,64,4,237,131,192,8,131,252,237,1,15,133,244,3,252,233,
|
||||
244,2,255,139,106,252,248,139,189,233,139,108,36,48,141,68,194,252,248,137,
|
||||
149,233,141,136,233,59,141,233,137,133,233,255,137,44,36,255,137,124,36,4,
|
||||
137,44,36,255,15,135,244,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 {
|
||||
@@ -2115,9 +2131,36 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse)
|
||||
dasm_put(Dst, 14164, LJ_TFUNC, 2+1, Dt7(->pc));
|
||||
break;
|
||||
|
||||
case BC_ITERN:
|
||||
#if LJ_HASJIT
|
||||
#endif
|
||||
dasm_put(Dst, 14244, Dt6(->asize), Dt6(->array), LJ_TNIL);
|
||||
if (sse) {
|
||||
dasm_put(Dst, 14290);
|
||||
} else {
|
||||
dasm_put(Dst, 14296);
|
||||
}
|
||||
dasm_put(Dst, 14302);
|
||||
if (sse) {
|
||||
dasm_put(Dst, 11273);
|
||||
} else {
|
||||
dasm_put(Dst, 11285);
|
||||
}
|
||||
dasm_put(Dst, 14321, -BCBIAS_J*4);
|
||||
if (!sse) {
|
||||
dasm_put(Dst, 14372);
|
||||
}
|
||||
dasm_put(Dst, 14378, 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, 14453);
|
||||
break;
|
||||
|
||||
case BC_ISNEXT:
|
||||
dasm_put(Dst, 14461, 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, 14244, (8+FRAME_VARG), LJ_TNIL, Dt1(->maxstack));
|
||||
dasm_put(Dst, 14408, Dt1(->base), Dt1(->top), Dt1(->base), Dt1(->top));
|
||||
dasm_put(Dst, 14560, (8+FRAME_VARG), LJ_TNIL, Dt1(->maxstack));
|
||||
dasm_put(Dst, 14724, Dt1(->base), Dt1(->top), Dt1(->base), Dt1(->top));
|
||||
break;
|
||||
|
||||
/* -- Returns ----------------------------------------------------------- */
|
||||
@@ -2128,30 +2171,30 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse)
|
||||
|
||||
case BC_RET: case BC_RET0: case BC_RET1:
|
||||
if (op != BC_RET0) {
|
||||
dasm_put(Dst, 14479);
|
||||
dasm_put(Dst, 14795);
|
||||
}
|
||||
dasm_put(Dst, 14483, FRAME_TYPE);
|
||||
dasm_put(Dst, 14799, FRAME_TYPE);
|
||||
switch (op) {
|
||||
case BC_RET:
|
||||
dasm_put(Dst, 14502);
|
||||
dasm_put(Dst, 14818);
|
||||
break;
|
||||
case BC_RET1:
|
||||
dasm_put(Dst, 14560);
|
||||
dasm_put(Dst, 14876);
|
||||
/* fallthrough */
|
||||
case BC_RET0:
|
||||
dasm_put(Dst, 14576);
|
||||
dasm_put(Dst, 14892);
|
||||
default:
|
||||
break;
|
||||
}
|
||||
dasm_put(Dst, 14587, Dt7(->pc), PC2PROTO(k));
|
||||
dasm_put(Dst, 14903, Dt7(->pc), PC2PROTO(k));
|
||||
if (op == BC_RET) {
|
||||
dasm_put(Dst, 14629, LJ_TNIL);
|
||||
dasm_put(Dst, 14945, LJ_TNIL);
|
||||
} else {
|
||||
dasm_put(Dst, 14638, LJ_TNIL);
|
||||
dasm_put(Dst, 14954, LJ_TNIL);
|
||||
}
|
||||
dasm_put(Dst, 14645, -FRAME_VARG, FRAME_TYPEP);
|
||||
dasm_put(Dst, 14961, -FRAME_VARG, FRAME_TYPEP);
|
||||
if (op != BC_RET0) {
|
||||
dasm_put(Dst, 14669);
|
||||
dasm_put(Dst, 14985);
|
||||
}
|
||||
dasm_put(Dst, 4689);
|
||||
break;
|
||||
@@ -2161,7 +2204,7 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse)
|
||||
|
||||
case BC_FORL:
|
||||
#if LJ_HASJIT
|
||||
dasm_put(Dst, 14673, HOTCOUNT_PCMASK, GG_DISP2HOT);
|
||||
dasm_put(Dst, 14989, HOTCOUNT_PCMASK, GG_DISP2HOT);
|
||||
#endif
|
||||
break;
|
||||
|
||||
@@ -2173,57 +2216,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, 14694);
|
||||
dasm_put(Dst, 15010);
|
||||
if (!vk) {
|
||||
dasm_put(Dst, 14698, LJ_TISNUM, LJ_TISNUM);
|
||||
dasm_put(Dst, 15014, LJ_TISNUM, LJ_TISNUM);
|
||||
}
|
||||
dasm_put(Dst, 14717);
|
||||
dasm_put(Dst, 15033);
|
||||
if (!vk) {
|
||||
dasm_put(Dst, 14721, LJ_TISNUM);
|
||||
dasm_put(Dst, 15037, LJ_TISNUM);
|
||||
}
|
||||
if (sse) {
|
||||
dasm_put(Dst, 14730);
|
||||
dasm_put(Dst, 15046);
|
||||
if (vk) {
|
||||
dasm_put(Dst, 14742);
|
||||
dasm_put(Dst, 15058);
|
||||
} else {
|
||||
dasm_put(Dst, 14761);
|
||||
dasm_put(Dst, 15077);
|
||||
}
|
||||
dasm_put(Dst, 14766);
|
||||
dasm_put(Dst, 15082);
|
||||
} else {
|
||||
dasm_put(Dst, 14779);
|
||||
dasm_put(Dst, 15095);
|
||||
if (vk) {
|
||||
dasm_put(Dst, 14785);
|
||||
dasm_put(Dst, 15101);
|
||||
} else {
|
||||
dasm_put(Dst, 14801);
|
||||
dasm_put(Dst, 15117);
|
||||
}
|
||||
dasm_put(Dst, 14809);
|
||||
dasm_put(Dst, 15125);
|
||||
if (cmov) {
|
||||
dasm_put(Dst, 10818);
|
||||
} else {
|
||||
dasm_put(Dst, 10824);
|
||||
}
|
||||
if (!cmov) {
|
||||
dasm_put(Dst, 14814);
|
||||
dasm_put(Dst, 15130);
|
||||
}
|
||||
}
|
||||
if (op == BC_FORI) {
|
||||
dasm_put(Dst, 14820, -BCBIAS_J*4);
|
||||
dasm_put(Dst, 15136, -BCBIAS_J*4);
|
||||
} else if (op == BC_JFORI) {
|
||||
dasm_put(Dst, 14830, -BCBIAS_J*4, BC_JLOOP);
|
||||
dasm_put(Dst, 15146, -BCBIAS_J*4, BC_JLOOP);
|
||||
} else if (op == BC_IFORL) {
|
||||
dasm_put(Dst, 14844, -BCBIAS_J*4);
|
||||
dasm_put(Dst, 15160, -BCBIAS_J*4);
|
||||
} else {
|
||||
dasm_put(Dst, 14840, BC_JLOOP);
|
||||
dasm_put(Dst, 15156, BC_JLOOP);
|
||||
}
|
||||
dasm_put(Dst, 10853);
|
||||
if (sse) {
|
||||
dasm_put(Dst, 14854);
|
||||
dasm_put(Dst, 15170);
|
||||
}
|
||||
break;
|
||||
|
||||
case BC_ITERL:
|
||||
#if LJ_HASJIT
|
||||
dasm_put(Dst, 14673, HOTCOUNT_PCMASK, GG_DISP2HOT);
|
||||
dasm_put(Dst, 14989, HOTCOUNT_PCMASK, GG_DISP2HOT);
|
||||
#endif
|
||||
break;
|
||||
|
||||
@@ -2232,18 +2275,18 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse)
|
||||
break;
|
||||
#endif
|
||||
case BC_IITERL:
|
||||
dasm_put(Dst, 14865, LJ_TNIL);
|
||||
dasm_put(Dst, 15181, LJ_TNIL);
|
||||
if (op == BC_JITERL) {
|
||||
dasm_put(Dst, 14880, BC_JLOOP);
|
||||
dasm_put(Dst, 15196, BC_JLOOP);
|
||||
} else {
|
||||
dasm_put(Dst, 14894, -BCBIAS_J*4);
|
||||
dasm_put(Dst, 15210, -BCBIAS_J*4);
|
||||
}
|
||||
dasm_put(Dst, 11150);
|
||||
break;
|
||||
|
||||
case BC_LOOP:
|
||||
#if LJ_HASJIT
|
||||
dasm_put(Dst, 14673, HOTCOUNT_PCMASK, GG_DISP2HOT);
|
||||
dasm_put(Dst, 14989, HOTCOUNT_PCMASK, GG_DISP2HOT);
|
||||
#endif
|
||||
break;
|
||||
|
||||
@@ -2253,12 +2296,12 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse)
|
||||
|
||||
case BC_JLOOP:
|
||||
#if LJ_HASJIT
|
||||
dasm_put(Dst, 14910, DISPATCH_J(trace), DtD(->mcode), DISPATCH_GL(jit_base), DISPATCH_GL(jit_L));
|
||||
dasm_put(Dst, 15226, DISPATCH_J(trace), DtD(->mcode), DISPATCH_GL(jit_base), DISPATCH_GL(jit_L));
|
||||
#endif
|
||||
break;
|
||||
|
||||
case BC_JMP:
|
||||
dasm_put(Dst, 14933, -BCBIAS_J*4);
|
||||
dasm_put(Dst, 15249, -BCBIAS_J*4);
|
||||
break;
|
||||
|
||||
/* -- Function headers -------------------------------------------------- */
|
||||
@@ -2272,7 +2315,7 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse)
|
||||
|
||||
case BC_FUNCF:
|
||||
#if LJ_HASJIT
|
||||
dasm_put(Dst, 14957, HOTCOUNT_PCMASK, GG_DISP2HOT);
|
||||
dasm_put(Dst, 15273, HOTCOUNT_PCMASK, GG_DISP2HOT);
|
||||
#endif
|
||||
case BC_FUNCV: /* NYI: compiled vararg functions. */
|
||||
break;
|
||||
@@ -2282,13 +2325,13 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse)
|
||||
break;
|
||||
#endif
|
||||
case BC_IFUNCF:
|
||||
dasm_put(Dst, 14978, -4+PC2PROTO(k), Dt1(->maxstack), -4+PC2PROTO(numparams));
|
||||
dasm_put(Dst, 15294, -4+PC2PROTO(k), Dt1(->maxstack), -4+PC2PROTO(numparams));
|
||||
if (op == BC_JFUNCF) {
|
||||
dasm_put(Dst, 15008, BC_JLOOP);
|
||||
dasm_put(Dst, 15324, BC_JLOOP);
|
||||
} else {
|
||||
dasm_put(Dst, 10855);
|
||||
}
|
||||
dasm_put(Dst, 15017, LJ_TNIL);
|
||||
dasm_put(Dst, 15333, LJ_TNIL);
|
||||
break;
|
||||
|
||||
case BC_JFUNCV:
|
||||
@@ -2299,30 +2342,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, 15039, FRAME_VARG, Dt1(->maxstack), -4+PC2PROTO(numparams), LJ_TNIL);
|
||||
dasm_put(Dst, 15355, FRAME_VARG, Dt1(->maxstack), -4+PC2PROTO(numparams), LJ_TNIL);
|
||||
if (op == BC_JFUNCV) {
|
||||
dasm_put(Dst, 15008, BC_JLOOP);
|
||||
dasm_put(Dst, 15324, BC_JLOOP);
|
||||
} else {
|
||||
dasm_put(Dst, 15130, -4+PC2PROTO(k));
|
||||
dasm_put(Dst, 15446, -4+PC2PROTO(k));
|
||||
}
|
||||
dasm_put(Dst, 15152, LJ_TNIL);
|
||||
dasm_put(Dst, 15468, LJ_TNIL);
|
||||
break;
|
||||
|
||||
case BC_FUNCC:
|
||||
case BC_FUNCCW:
|
||||
dasm_put(Dst, 15174, Dt8(->f), Dt1(->base), 8*LUA_MINSTACK, Dt1(->maxstack), Dt1(->top));
|
||||
dasm_put(Dst, 15490, Dt8(->f), Dt1(->base), 8*LUA_MINSTACK, Dt1(->maxstack), Dt1(->top));
|
||||
if (op == BC_FUNCC) {
|
||||
dasm_put(Dst, 15203);
|
||||
dasm_put(Dst, 15519);
|
||||
} else {
|
||||
dasm_put(Dst, 15207);
|
||||
dasm_put(Dst, 15523);
|
||||
}
|
||||
dasm_put(Dst, 15215, DISPATCH_GL(vmstate), ~LJ_VMST_C);
|
||||
dasm_put(Dst, 15531, DISPATCH_GL(vmstate), ~LJ_VMST_C);
|
||||
if (op == BC_FUNCC) {
|
||||
dasm_put(Dst, 15224);
|
||||
dasm_put(Dst, 15540);
|
||||
} else {
|
||||
dasm_put(Dst, 15228, DISPATCH_GL(wrapf));
|
||||
dasm_put(Dst, 15544, DISPATCH_GL(wrapf));
|
||||
}
|
||||
dasm_put(Dst, 15233, DISPATCH_GL(vmstate), ~LJ_VMST_INTERP, Dt1(->base), Dt1(->top));
|
||||
dasm_put(Dst, 15549, DISPATCH_GL(vmstate), ~LJ_VMST_INTERP, Dt1(->base), Dt1(->top));
|
||||
break;
|
||||
|
||||
/* ---------------------------------------------------------------------- */
|
||||
@@ -2350,7 +2393,7 @@ static int build_backend(BuildCtx *ctx)
|
||||
|
||||
build_subroutines(ctx, cmov, sse);
|
||||
|
||||
dasm_put(Dst, 15258);
|
||||
dasm_put(Dst, 15574);
|
||||
for (op = 0; op < BC__MAX; op++)
|
||||
build_ins(ctx, (BCOp)op, op, cmov, sse);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user