DrSocalkwe3n/luajit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Optimize BC_VARG: use RC for numparams.

Browse Source
This commit is contained in:
Mike Pall
2010-09-10 11:34:29 +02:00
parent 96957a4551
commit 6fd315581c
6 changed files with 333 additions and 339 deletions
Download Patch File Download Diff File Expand all files Collapse all files

221
src/buildvm_x64win.h
View File

@@ -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[14042] = {
static const unsigned char build_actionlist[14034] = {
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,
@@ -640,62 +640,61 @@ static const unsigned char build_actionlist[14042] = {
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,252,235,255,15,182,252,236,139,66,252,248,
141,12,202,139,128,233,15,182,128,233,137,124,36,80,141,188,253,194,233,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,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,255,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,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,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,
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,84,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,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
15,182,205,131,198,4,252,255,36,252,235,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,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,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,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,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,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,84,
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,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 {
@@ -1992,8 +1991,8 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse)
break;
case BC_VARG:
dasm_put(Dst, 12926, Dt7(->pc), PC2PROTO(numparams), (8+FRAME_VARG), LJ_TNIL);
dasm_put(Dst, 13071, Dt1(->maxstack), Dt1(->base), Dt1(->top), Dt1(->base), Dt1(->top));
dasm_put(Dst, 12926, (8+FRAME_VARG), LJ_TNIL, Dt1(->maxstack));
dasm_put(Dst, 13091, Dt1(->base), Dt1(->top), Dt1(->base), Dt1(->top));
break;
/* -- Returns ----------------------------------------------------------- */
@@ -2004,30 +2003,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, 13170);
dasm_put(Dst, 13162);
}
dasm_put(Dst, 13174, FRAME_TYPE);
dasm_put(Dst, 13166, FRAME_TYPE);
switch (op) {
case BC_RET:
dasm_put(Dst, 13193);
dasm_put(Dst, 13185);
break;
case BC_RET1:
dasm_put(Dst, 13251);
dasm_put(Dst, 13243);
/* fallthrough */
case BC_RET0:
dasm_put(Dst, 13267);
dasm_put(Dst, 13259);
default:
break;
}
dasm_put(Dst, 13278, Dt7(->pc), PC2PROTO(k));
dasm_put(Dst, 13270, Dt7(->pc), PC2PROTO(k));
if (op == BC_RET) {
dasm_put(Dst, 13322, LJ_TNIL);
dasm_put(Dst, 13314, LJ_TNIL);
} else {
dasm_put(Dst, 13331, LJ_TNIL);
dasm_put(Dst, 13323, LJ_TNIL);
}
dasm_put(Dst, 13338, -FRAME_VARG, FRAME_TYPEP);
dasm_put(Dst, 13330, -FRAME_VARG, FRAME_TYPEP);
if (op != BC_RET0) {
dasm_put(Dst, 13362);
dasm_put(Dst, 13354);
}
dasm_put(Dst, 4573);
break;
@@ -2037,7 +2036,7 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse)
case BC_FORL:
#if LJ_HASJIT
dasm_put(Dst, 13366, HOTCOUNT_PCMASK, GG_DISP2HOT);
dasm_put(Dst, 13358, HOTCOUNT_PCMASK, GG_DISP2HOT);
#endif
break;
@@ -2049,57 +2048,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, 13387);
dasm_put(Dst, 13379);
if (!vk) {
dasm_put(Dst, 13391, LJ_TISNUM, LJ_TISNUM);
dasm_put(Dst, 13383, LJ_TISNUM, LJ_TISNUM);
}
dasm_put(Dst, 13410);
dasm_put(Dst, 13402);
if (!vk) {
dasm_put(Dst, 13414, LJ_TISNUM);
dasm_put(Dst, 13406, LJ_TISNUM);
}
if (sse) {
dasm_put(Dst, 13423);
dasm_put(Dst, 13415);
if (vk) {
dasm_put(Dst, 13435);
dasm_put(Dst, 13427);
} else {
dasm_put(Dst, 13454);
dasm_put(Dst, 13446);
}
dasm_put(Dst, 13459);
dasm_put(Dst, 13451);
} else {
dasm_put(Dst, 13472);
dasm_put(Dst, 13464);
if (vk) {
dasm_put(Dst, 13478);
dasm_put(Dst, 13470);
} else {
dasm_put(Dst, 13494);
dasm_put(Dst, 13486);
}
dasm_put(Dst, 13502);
dasm_put(Dst, 13494);
if (cmov) {
dasm_put(Dst, 9536);
} else {
dasm_put(Dst, 9542);
}
if (!cmov) {
dasm_put(Dst, 13507);
dasm_put(Dst, 13499);
}
}
if (op == BC_FORI) {
dasm_put(Dst, 13513, -BCBIAS_J*4);
dasm_put(Dst, 13505, -BCBIAS_J*4);
} else if (op == BC_JFORI) {
dasm_put(Dst, 13523, -BCBIAS_J*4, BC_JLOOP);
dasm_put(Dst, 13515, -BCBIAS_J*4, BC_JLOOP);
} else if (op == BC_IFORL) {
dasm_put(Dst, 13537, -BCBIAS_J*4);
dasm_put(Dst, 13529, -BCBIAS_J*4);
} else {
dasm_put(Dst, 13533, BC_JLOOP);
dasm_put(Dst, 13525, BC_JLOOP);
}
dasm_put(Dst, 9571);
if (sse) {
dasm_put(Dst, 13547);
dasm_put(Dst, 13539);
}
break;
case BC_ITERL:
#if LJ_HASJIT
dasm_put(Dst, 13366, HOTCOUNT_PCMASK, GG_DISP2HOT);
dasm_put(Dst, 13358, HOTCOUNT_PCMASK, GG_DISP2HOT);
#endif
break;
@@ -2108,18 +2107,18 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse)
break;
#endif
case BC_IITERL:
dasm_put(Dst, 13558, LJ_TNIL);
dasm_put(Dst, 13550, LJ_TNIL);
if (op == BC_JITERL) {
dasm_put(Dst, 13573, BC_JLOOP);
dasm_put(Dst, 13565, BC_JLOOP);
} else {
dasm_put(Dst, 13587, -BCBIAS_J*4);
dasm_put(Dst, 13579, -BCBIAS_J*4);
}
dasm_put(Dst, 9871);
break;
case BC_LOOP:
#if LJ_HASJIT
dasm_put(Dst, 13366, HOTCOUNT_PCMASK, GG_DISP2HOT);
dasm_put(Dst, 13358, HOTCOUNT_PCMASK, GG_DISP2HOT);
#endif
break;
@@ -2129,12 +2128,12 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse)
case BC_JLOOP:
#if LJ_HASJIT
dasm_put(Dst, 13603, 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, 13595, 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, 13712, -BCBIAS_J*4);
dasm_put(Dst, 13704, -BCBIAS_J*4);
break;
/* -- Function headers -------------------------------------------------- */
@@ -2148,7 +2147,7 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse)
case BC_FUNCF:
#if LJ_HASJIT
dasm_put(Dst, 13737, HOTCOUNT_PCMASK, GG_DISP2HOT);
dasm_put(Dst, 13729, HOTCOUNT_PCMASK, GG_DISP2HOT);
#endif
case BC_FUNCV: /* NYI: compiled vararg functions. */
break;
@@ -2158,13 +2157,13 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse)
break;
#endif
case BC_IFUNCF:
dasm_put(Dst, 13758, -4+PC2PROTO(k), Dt1(->maxstack), -4+PC2PROTO(numparams));
dasm_put(Dst, 13750, -4+PC2PROTO(k), Dt1(->maxstack), -4+PC2PROTO(numparams));
if (op == BC_JFUNCF) {
dasm_put(Dst, 13788, BC_JLOOP);
dasm_put(Dst, 13780, BC_JLOOP);
} else {
dasm_put(Dst, 9573);
}
dasm_put(Dst, 13797, LJ_TNIL);
dasm_put(Dst, 13789, LJ_TNIL);
break;
case BC_JFUNCV:
@@ -2175,30 +2174,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, 13819, FRAME_VARG, Dt1(->maxstack), -4+PC2PROTO(numparams), LJ_TNIL);
dasm_put(Dst, 13811, FRAME_VARG, Dt1(->maxstack), -4+PC2PROTO(numparams), LJ_TNIL);
if (op == BC_JFUNCV) {
dasm_put(Dst, 13788, BC_JLOOP);
dasm_put(Dst, 13780, BC_JLOOP);
} else {
dasm_put(Dst, 13910, -4+PC2PROTO(k));
dasm_put(Dst, 13902, -4+PC2PROTO(k));
}
dasm_put(Dst, 13933, LJ_TNIL);
dasm_put(Dst, 13925, LJ_TNIL);
break;
case BC_FUNCC:
case BC_FUNCCW:
dasm_put(Dst, 13955, Dt8(->f), Dt1(->base), 8*LUA_MINSTACK, Dt1(->maxstack), Dt1(->top));
dasm_put(Dst, 13947, Dt8(->f), Dt1(->base), 8*LUA_MINSTACK, Dt1(->maxstack), Dt1(->top));
if (op == BC_FUNCC) {
dasm_put(Dst, 13985);
dasm_put(Dst, 13977);
} else {
dasm_put(Dst, 13989);
dasm_put(Dst, 13981);
}
dasm_put(Dst, 13997, DISPATCH_GL(vmstate), ~LJ_VMST_C);
dasm_put(Dst, 13989, DISPATCH_GL(vmstate), ~LJ_VMST_C);
if (op == BC_FUNCC) {
dasm_put(Dst, 14006);
dasm_put(Dst, 13998);
} else {
dasm_put(Dst, 14010, DISPATCH_GL(wrapf));
dasm_put(Dst, 14002, DISPATCH_GL(wrapf));
}
dasm_put(Dst, 14015, DISPATCH_GL(vmstate), ~LJ_VMST_INTERP, Dt1(->base), Dt1(->top));
dasm_put(Dst, 14007, DISPATCH_GL(vmstate), ~LJ_VMST_INTERP, Dt1(->base), Dt1(->top));
break;
/* ---------------------------------------------------------------------- */
@@ -2226,7 +2225,7 @@ static int build_backend(BuildCtx *ctx)
build_subroutines(ctx, cmov, sse);
dasm_put(Dst, 14040);
dasm_put(Dst, 14032);
for (op = 0; op < BC__MAX; op++)
build_ins(ctx, (BCOp)op, op, cmov, sse);