More calling convention cleanups for x64 interpreter.

This commit is contained in:
Mike Pall 2009-12-27 18:44:12 +01:00
parent e5438daffe
commit 3a15e46b79
2 changed files with 284 additions and 203 deletions

View File

@ -863,12 +863,32 @@ static void build_subroutines(BuildCtx *ctx, int cmov, int sse)
| je ->cont_ra | je ->cont_ra
| neg RA | neg RA
| shr RA, 3 | shr RA, 3
|.if X64WIN
| mov CARG3d, RA
| mov L:CARG1d, SAVE_L
| mov L:CARG1d->base, BASE
| mov CARG2d, [RC+4]
| mov RC, [RC]
| mov [RB+4], CARG2d
| mov [RB], RC
| mov CARG2d, RB
|.elif X64
| mov L:CARG1d, SAVE_L
| mov L:CARG1d->base, BASE
| mov CARG3d, RA
| mov RA, [RC+4]
| mov RC, [RC]
| mov [RB+4], RA
| mov [RB], RC
| mov CARG2d, RB
|.else
| mov ARG3, RA | mov ARG3, RA
| mov RA, [RC+4] | mov RA, [RC+4]
| mov RC, [RC] | mov RC, [RC]
| mov [RB+4], RA | mov [RB+4], RA
| mov [RB], RC | mov [RB], RC
| mov ARG2, RB | mov ARG2, RB
|.endif
| jmp ->BC_CAT_Z | jmp ->BC_CAT_Z
| |
|//-- Table indexing metamethods ----------------------------------------- |//-- Table indexing metamethods -----------------------------------------
@ -3624,6 +3644,15 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse)
case BC_CAT: case BC_CAT:
| ins_ABC // RA = dst, RB = src_start, RC = src_end | ins_ABC // RA = dst, RB = src_start, RC = src_end
|.if X64
| mov L:CARG1d, SAVE_L
| mov L:CARG1d->base, BASE
| lea CARG2d, [BASE+RC*8]
| mov CARG3d, RC
| sub CARG3d, RB
|->BC_CAT_Z:
| mov L:RB, L:CARG1d
|.else
| lea RA, [BASE+RC*8] | lea RA, [BASE+RC*8]
| sub RC, RB | sub RC, RB
| mov ARG2, RA | mov ARG2, RA
@ -3631,8 +3660,9 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse)
|->BC_CAT_Z: |->BC_CAT_Z:
| mov L:RB, SAVE_L | mov L:RB, SAVE_L
| mov ARG1, L:RB | mov ARG1, L:RB
| mov SAVE_PC, PC
| mov L:RB->base, BASE | mov L:RB->base, BASE
|.endif
| mov SAVE_PC, PC
| call extern lj_meta_cat // (lua_State *L, TValue *top, int left) | call extern lj_meta_cat // (lua_State *L, TValue *top, int left)
| // NULL (finished) or TValue * (metamethod) returned in eax (RC). | // NULL (finished) or TValue * (metamethod) returned in eax (RC).
| mov BASE, L:RB->base | mov BASE, L:RB->base
@ -3817,14 +3847,22 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse)
case BC_FNEW: case BC_FNEW:
| ins_AND // RA = dst, RD = proto const (~) (holding function prototype) | ins_AND // RA = dst, RD = proto const (~) (holding function prototype)
|.if X64
| mov L:RB, SAVE_L
| mov L:RB->base, BASE // Caveat: CARG2d/CARG3d may be BASE.
| mov CARG3d, [BASE-8]
| mov CARG2d, [KBASE+RD*4] // Fetch GCproto *.
| mov CARG1d, L:RB
|.else
| mov LFUNC:RA, [BASE-8] | mov LFUNC:RA, [BASE-8]
| mov PROTO:RD, [KBASE+RD*4] // Fetch GCproto *. | mov PROTO:RD, [KBASE+RD*4] // Fetch GCproto *.
| mov L:RB, SAVE_L | mov L:RB, SAVE_L
| mov ARG3, LFUNC:RA | mov ARG3, LFUNC:RA
| mov ARG2, PROTO:RD | mov ARG2, PROTO:RD
| mov SAVE_PC, PC
| mov ARG1, L:RB | mov ARG1, L:RB
| mov L:RB->base, BASE | mov L:RB->base, BASE
|.endif
| mov SAVE_PC, PC
| // (lua_State *L, GCproto *pt, GCfuncL *parent) | // (lua_State *L, GCproto *pt, GCfuncL *parent)
| call extern lj_func_newL_gc | call extern lj_func_newL_gc
| // GCfuncL * returned in eax (RC). | // GCfuncL * returned in eax (RC).
@ -3839,23 +3877,40 @@ 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:CARG1d, SAVE_L
|1:
| mov L:CARG1d->base, BASE // Caveat: CARG2d/CARG3d may be BASE.
| mov CARG3d, RD
| and RD, 0x7ff
| 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
| mov RB, RD | mov RB, RD
| and RD, 0x7ff | and RD, 0x7ff
| shr RB, 11 | shr RB, 11
| cmp RD, 0x7ff // Turn 0x7ff into 0x801. | cmp RD, 0x7ff
| sete RAL | je >3
|2:
| mov ARG3, RB | mov ARG3, RB
| add RD, RA
| mov L:RB, SAVE_L | mov L:RB, SAVE_L
| add RD, RA
| mov ARG2, RD | mov ARG2, RD
| mov SAVE_PC, PC | mov SAVE_PC, PC
| mov RA, [DISPATCH+DISPATCH_GL(gc.total)] | mov RD, [DISPATCH+DISPATCH_GL(gc.total)]
| mov ARG1, L:RB | mov ARG1, L:RB
| cmp RA, [DISPATCH+DISPATCH_GL(gc.threshold)] | cmp RD, [DISPATCH+DISPATCH_GL(gc.threshold)]
| mov L:RB->base, BASE | mov L:RB->base, BASE
| jae >2 | jae >5
|1: |1:
|.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).
| mov BASE, L:RB->base | mov BASE, L:RB->base
@ -3863,10 +3918,20 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse)
| mov [BASE+RA*8], TAB:RC | mov [BASE+RA*8], TAB:RC
| mov dword [BASE+RA*8+4], LJ_TTAB | mov dword [BASE+RA*8+4], LJ_TTAB
| ins_next | ins_next
|2: |3: // Turn 0x7ff into 0x801.
| mov RD, 0x801
| jmp <2
|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)
| 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)
@ -4144,14 +4209,22 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse)
|6: |6:
| mov TMP1, STR:RC | mov TMP1, STR:RC
| mov TMP2, LJ_TSTR | mov TMP2, LJ_TSTR
| lea RC, TMP1 // Store temp. TValue in TMP1/TMP2.
| mov TMP3, TAB:RB // Save TAB:RB for us. | mov TMP3, TAB:RB // Save TAB:RB for us.
|.if X64
| mov L:CARG1d, SAVE_L
| mov L:CARG1d->base, BASE
| lea CARG3, TMP1
| mov CARG2d, TAB:RB
| mov L:RB, L:CARG1d
|.else
| lea RC, TMP1 // Store temp. TValue in TMP1/TMP2.
| mov ARG2, TAB:RB | mov ARG2, TAB:RB
| mov L:RB, SAVE_L | mov L:RB, SAVE_L
| mov ARG3, RC | mov ARG3, RC
| mov ARG1, L:RB | mov ARG1, L:RB
| mov SAVE_PC, PC
| mov L:RB->base, BASE | mov L:RB->base, BASE
|.endif
| mov SAVE_PC, PC
| call extern lj_tab_newkey // (lua_State *L, GCtab *t, TValue *k) | call extern lj_tab_newkey // (lua_State *L, GCtab *t, TValue *k)
| // Handles write barrier for the new key. TValue * returned in eax (RC). | // Handles write barrier for the new key. TValue * returned in eax (RC).
| mov BASE, L:RB->base | mov BASE, L:RB->base
@ -4245,12 +4318,20 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse)
| ins_next | ins_next
| |
|5: // Need to resize array part. |5: // Need to resize array part.
|.if X64
| mov L:CARG1d, SAVE_L
| mov L:CARG1d->base, BASE // Caveat: CARG2d/CARG3d may be BASE.
| mov CARG2d, TAB:RB
| mov CARG3d, RD
| mov L:RB, L:CARG1d
|.else
| mov ARG2, TAB:RB | mov ARG2, TAB:RB
| mov L:RB, SAVE_L | mov L:RB, SAVE_L
| mov L:RB->base, BASE
| mov ARG3, RD | mov ARG3, RD
| mov ARG1, L:RB | mov ARG1, L:RB
|.endif
| mov SAVE_PC, PC | mov SAVE_PC, PC
| mov L:RB->base, BASE
| call extern lj_tab_reasize // (lua_State *L, GCtab *t, int nasize) | call extern lj_tab_reasize // (lua_State *L, GCtab *t, int nasize)
| mov BASE, L:RB->base | mov BASE, L:RB->base
| movzx RA, PC_RA // Restore RA. | movzx RA, PC_RA // Restore RA.

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[15184] = { static const unsigned char build_actionlist[15194] = {
254,1,248,10,137,202,139,173,233,137,114,252,252,15,182,141,233,139,181,233, 254,1,248,10,137,202,139,173,233,137,114,252,252,15,182,141,233,139,181,233,
139,189,233,139,108,36,48,141,12,202,141,68,194,252,252,59,141,233,15,135, 139,189,233,139,108,36,48,141,12,202,141,68,194,252,252,59,141,233,15,135,
244,11,248,9,189,237,248,1,137,40,137,104,8,131,192,16,57,200,15,130,244, 244,11,248,9,189,237,248,1,137,40,137,104,8,131,192,16,57,200,15,130,244,
@ -595,7 +595,7 @@ static const unsigned char build_actionlist[15184] = {
234,255,221,4,199,221,4,252,234,255,252,242,15,16,4,252,234,252,242,15,16, 234,255,221,4,199,221,4,252,234,255,252,242,15,16,4,252,234,252,242,15,16,
12,194,255,221,4,252,234,221,4,194,255,248,153,232,244,145,255,252,233,244, 12,194,255,221,4,252,234,221,4,194,255,248,153,232,244,145,255,252,233,244,
153,255,232,244,106,255,15,182,252,236,15,182,192,141,12,194,41,232,137,76, 153,255,232,244,106,255,15,182,252,236,15,182,192,141,12,194,41,232,137,76,
36,4,137,68,36,8,248,33,139,108,36,48,137,44,36,137,116,36,24,137,149,233, 36,4,137,68,36,8,248,33,139,108,36,48,137,44,36,137,149,233,137,116,36,24,
232,251,1,23,139,149,233,133,192,15,133,244,42,15,182,110,252,255,15,182, 232,251,1,23,139,149,233,133,192,15,133,244,42,15,182,110,252,255,15,182,
78,252,253,139,68,252,234,4,139,44,252,234,137,68,202,4,137,44,202,139,6, 78,252,253,139,68,252,234,4,139,44,252,234,137,68,202,4,137,44,202,139,6,
15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,171,255,252,247,208, 15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,171,255,252,247,208,
@ -624,126 +624,126 @@ static const unsigned char build_actionlist[15184] = {
131,189,233,0,15,132,244,247,137,149,233,141,20,202,137,252,233,232,251,1, 131,189,233,0,15,132,244,247,137,149,233,141,20,202,137,252,233,232,251,1,
25,139,149,233,248,1,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252, 25,139,149,233,248,1,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,
255,36,171,255,252,247,208,139,74,252,248,139,4,135,139,108,36,48,137,76, 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,116,36,24,137,44,36,137,149,233,232,251,1,26,139,149, 36,8,137,68,36,4,137,44,36,137,149,233,137,116,36,24,232,251,1,26,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,137,197,37,252,255,7,0,0,193,
252,237,11,61,252,255,7,0,0,15,148,209,137,108,36,8,1,200,139,108,36,48,1, 252,237,11,61,252,255,7,0,0,15,132,244,249,248,2,137,108,36,8,139,108,36,
200,137,68,36,4,137,116,36,24,139,139,233,137,44,36,59,139,233,137,149,233, 48,137,68,36,4,137,116,36,24,139,131,233,137,44,36,59,131,233,137,149,233,
15,131,244,248,248,1,232,251,1,27,139,149,233,15,182,78,252,253,137,4,202, 15,131,244,251,248,1,232,251,1,27,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, 199,68,202,4,237,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,
36,171,248,2,137,252,233,232,251,1,28,252,233,244,1,255,252,247,208,139,108, 36,171,248,3,184,1,8,0,0,252,233,244,2,248,5,137,252,233,232,251,1,28,252,
36,48,139,139,233,137,116,36,24,59,139,233,137,149,233,15,131,244,249,248, 233,244,1,255,252,247,208,139,108,36,48,139,139,233,137,116,36,24,59,139,
2,139,20,135,137,252,233,232,251,1,29,139,149,233,15,182,78,252,253,137,4, 233,137,149,233,15,131,244,249,248,2,139,20,135,137,252,233,232,251,1,29,
202,199,68,202,4,237,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252, 139,149,233,15,182,78,252,253,137,4,202,199,68,202,4,237,139,6,15,182,204,
255,36,171,248,3,137,252,233,232,251,1,28,15,183,70,252,254,252,247,208,252, 15,182,232,131,198,4,193,232,16,252,255,36,171,248,3,137,252,233,232,251,
233,244,2,255,252,247,208,139,106,252,248,139,173,233,139,4,135,252,233,244, 1,28,15,183,70,252,254,252,247,208,252,233,244,2,255,252,247,208,139,106,
154,255,252,247,208,139,106,252,248,139,173,233,139,4,135,252,233,244,155, 252,248,139,173,233,139,4,135,252,233,244,154,255,252,247,208,139,106,252,
255,15,182,252,236,15,182,192,129,124,253,252,234,4,239,15,133,244,36,139, 248,139,173,233,139,4,135,252,233,244,155,255,15,182,252,236,15,182,192,129,
44,252,234,129,124,253,194,4,239,15,135,244,251,255,252,242,15,16,4,194,252, 124,253,252,234,4,239,15,133,244,36,139,44,252,234,129,124,253,194,4,239,
242,15,45,192,252,242,15,42,200,102,15,46,193,255,221,4,194,219,20,36,219, 15,135,244,251,255,252,242,15,16,4,194,252,242,15,45,192,252,242,15,42,200,
4,36,255,15,133,244,36,59,133,233,15,131,244,36,193,224,3,3,133,233,129,120, 102,15,46,193,255,221,4,194,219,20,36,219,4,36,255,15,133,244,36,59,133,233,
253,4,239,15,132,244,248,248,1,139,40,139,64,4,137,44,202,137,68,202,4,139, 15,131,244,36,193,224,3,3,133,233,129,120,253,4,239,15,132,244,248,248,1,
6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,171,248,2,131,189, 139,40,139,64,4,137,44,202,137,68,202,4,139,6,15,182,204,15,182,232,131,198,
233,0,15,132,244,1,139,141,233,252,246,129,233,235,15,132,244,36,15,182,78, 4,193,232,16,252,255,36,171,248,2,131,189,233,0,15,132,244,1,139,141,233,
252,253,252,233,244,1,248,5,255,129,124,253,194,4,239,15,133,244,36,139,4, 252,246,129,233,235,15,132,244,36,15,182,78,252,253,252,233,244,1,248,5,255,
194,252,233,244,154,255,15,182,252,236,15,182,192,252,247,208,139,4,135,129, 129,124,253,194,4,239,15,133,244,36,139,4,194,252,233,244,154,255,15,182,
124,253,252,234,4,239,15,133,244,34,139,44,252,234,248,154,139,141,233,35, 252,236,15,182,192,252,247,208,139,4,135,129,124,253,252,234,4,239,15,133,
136,233,105,201,239,3,141,233,248,1,129,185,233,239,15,133,244,250,57,129, 244,34,139,44,252,234,248,154,139,141,233,35,136,233,105,201,239,3,141,233,
233,15,133,244,250,129,121,253,4,239,15,132,244,251,15,182,70,252,253,139, 248,1,129,185,233,239,15,133,244,250,57,129,233,15,133,244,250,129,121,253,
41,139,73,4,137,44,194,248,2,255,137,76,194,4,139,6,15,182,204,15,182,232, 4,239,15,132,244,251,15,182,70,252,253,139,41,139,73,4,137,44,194,248,2,255,
131,198,4,193,232,16,252,255,36,171,248,3,15,182,70,252,253,185,237,252,233, 137,76,194,4,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,
244,2,248,4,139,137,233,133,201,15,133,244,1,248,5,139,141,233,133,201,15, 171,248,3,15,182,70,252,253,185,237,252,233,244,2,248,4,139,137,233,133,201,
132,244,3,252,246,129,233,235,15,133,244,3,252,233,244,34,255,15,182,252, 15,133,244,1,248,5,139,141,233,133,201,15,132,244,3,252,246,129,233,235,15,
236,15,182,192,129,124,253,252,234,4,239,15,133,244,35,139,44,252,234,59, 133,244,3,252,233,244,34,255,15,182,252,236,15,182,192,129,124,253,252,234,
133,233,15,131,244,35,193,224,3,3,133,233,129,120,253,4,239,15,132,244,248, 4,239,15,133,244,35,139,44,252,234,59,133,233,15,131,244,35,193,224,3,3,133,
248,1,139,40,139,64,4,137,44,202,137,68,202,4,139,6,15,182,204,15,182,232, 233,129,120,253,4,239,15,132,244,248,248,1,139,40,139,64,4,137,44,202,137,
131,198,4,193,232,16,252,255,36,171,248,2,131,189,233,0,15,132,244,1,139, 68,202,4,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,171,
141,233,252,246,129,233,235,15,132,244,35,255,15,182,252,236,15,182,192,129, 248,2,131,189,233,0,15,132,244,1,139,141,233,252,246,129,233,235,15,132,244,
124,253,252,234,4,239,15,133,244,39,139,44,252,234,129,124,253,194,4,239, 35,255,15,182,252,236,15,182,192,129,124,253,252,234,4,239,15,133,244,39,
15,135,244,251,255,15,133,244,39,59,133,233,15,131,244,39,193,224,3,3,133, 139,44,252,234,129,124,253,194,4,239,15,135,244,251,255,15,133,244,39,59,
133,233,15,131,244,39,193,224,3,3,133,233,129,120,253,4,239,15,132,244,249,
248,1,252,246,133,233,235,15,133,244,253,248,2,139,108,202,4,139,12,202,137,
104,4,137,8,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,171,
248,3,131,189,233,0,15,132,244,1,139,141,233,255,252,246,129,233,235,15,132,
244,39,15,182,78,252,253,252,233,244,1,248,5,129,124,253,194,4,239,15,133,
244,39,139,4,194,252,233,244,155,248,7,128,165,233,235,139,139,233,137,171,
233,137,141,233,15,182,78,252,253,252,233,244,2,255,15,182,252,236,15,182,
192,252,247,208,139,4,135,129,124,253,252,234,4,239,15,133,244,37,139,44,
252,234,248,155,139,141,233,35,136,233,105,201,239,198,133,233,0,3,141,233,
248,1,129,185,233,239,15,133,244,251,57,129,233,15,133,244,251,129,121,253,
4,239,15,132,244,250,248,2,255,252,246,133,233,235,15,133,244,253,248,3,15,
182,70,252,253,139,108,194,4,139,4,194,137,105,4,137,1,139,6,15,182,204,15,
182,232,131,198,4,193,232,16,252,255,36,171,248,4,131,189,233,0,15,132,244,
2,137,76,36,16,139,141,233,252,246,129,233,235,15,132,244,37,139,76,36,16,
252,233,244,2,248,5,139,137,233,133,201,15,133,244,1,255,139,141,233,133,
201,15,132,244,252,252,246,129,233,235,15,132,244,37,248,6,137,68,36,16,199,
68,36,20,237,137,108,36,12,141,68,36,16,137,108,36,4,139,108,36,48,137,68,
36,8,137,44,36,137,149,233,137,116,36,24,232,251,1,30,139,149,233,139,108,
36,12,137,193,252,233,244,2,248,7,128,165,233,235,139,131,233,137,171,233,
137,133,233,252,233,244,3,255,15,182,252,236,15,182,192,129,124,253,252,234,
4,239,15,133,244,38,139,44,252,234,59,133,233,15,131,244,38,193,224,3,3,133,
233,129,120,253,4,239,15,132,244,249,248,1,252,246,133,233,235,15,133,244, 233,129,120,253,4,239,15,132,244,249,248,1,252,246,133,233,235,15,133,244,
253,248,2,139,108,202,4,139,12,202,137,104,4,137,8,139,6,15,182,204,15,182, 253,248,2,139,108,202,4,139,12,202,137,104,4,137,8,139,6,15,182,204,15,182,
232,131,198,4,193,232,16,252,255,36,171,248,3,131,189,233,0,15,132,244,1, 232,131,198,4,193,232,16,252,255,36,171,248,3,131,189,233,0,15,132,244,1,
139,141,233,255,252,246,129,233,235,15,132,244,39,15,182,78,252,253,252,233, 255,139,141,233,252,246,129,233,235,15,132,244,38,15,182,78,252,253,252,233,
244,1,248,5,129,124,253,194,4,239,15,133,244,39,139,4,194,252,233,244,155, 244,1,248,7,128,165,233,235,139,139,233,137,171,233,137,141,233,15,182,78,
248,7,128,165,233,235,139,139,233,137,171,233,137,141,233,15,182,78,252,253, 252,253,252,233,244,2,255,137,124,36,16,255,221,4,199,219,92,36,12,255,248,
252,233,244,2,255,15,182,252,236,15,182,192,252,247,208,139,4,135,129,124, 1,141,12,202,139,105,252,248,252,246,133,233,235,15,133,244,253,248,2,139,
253,252,234,4,239,15,133,244,37,139,44,252,234,248,155,139,141,233,35,136, 68,36,20,255,252,242,15,45,252,248,255,139,124,36,12,255,131,232,1,15,132,
233,105,201,239,198,133,233,0,3,141,233,248,1,129,185,233,239,15,133,244, 244,250,1,252,248,59,133,233,15,131,244,251,41,252,248,193,231,3,3,189,233,
251,57,129,233,15,133,244,251,129,121,253,4,239,15,132,244,250,248,2,255, 248,3,139,41,137,47,139,105,4,131,193,8,137,111,4,131,199,8,131,232,1,15,
252,246,133,233,235,15,133,244,253,248,3,15,182,70,252,253,139,108,194,4, 133,244,3,248,4,139,124,36,16,139,6,15,182,204,15,182,232,131,198,4,193,232,
139,4,194,137,105,4,137,1,139,6,15,182,204,15,182,232,131,198,4,193,232,16, 16,252,255,36,171,248,5,137,108,36,4,139,108,36,48,137,149,233,137,68,36,
252,255,36,171,248,4,131,189,233,0,15,132,244,2,137,76,36,16,139,141,233, 8,137,44,36,137,116,36,24,232,251,1,31,139,149,233,15,182,78,252,253,252,
252,246,129,233,235,15,132,244,37,139,76,36,16,252,233,244,2,248,5,139,137, 233,244,1,248,7,128,165,233,235,139,131,233,137,171,233,255,137,133,233,252,
233,133,201,15,133,244,1,255,139,141,233,133,201,15,132,244,252,252,246,129, 233,244,2,255,3,68,36,20,255,141,76,202,8,139,105,252,248,129,121,253,252,
233,235,15,132,244,37,248,6,137,68,36,16,199,68,36,20,237,141,68,36,16,137, 252,239,15,133,244,29,252,255,165,233,255,141,76,202,8,137,215,139,105,252,
108,36,12,137,108,36,4,139,108,36,48,137,68,36,8,137,44,36,137,116,36,24, 248,129,121,253,252,252,239,15,133,244,29,248,51,139,114,252,252,252,247,
137,149,233,232,251,1,30,139,149,233,139,108,36,12,137,193,252,233,244,2, 198,237,15,133,244,253,248,1,137,106,252,248,137,68,36,20,131,232,1,15,132,
248,7,128,165,233,235,139,131,233,137,171,233,137,133,233,252,233,244,3,255, 244,249,248,2,139,41,137,47,139,105,4,137,111,4,131,199,8,131,193,8,131,232,
15,182,252,236,15,182,192,129,124,253,252,234,4,239,15,133,244,38,139,44, 1,15,133,244,2,139,106,252,248,248,3,137,209,128,189,233,1,15,135,244,251,
252,234,59,133,233,15,131,244,38,193,224,3,3,133,233,129,120,253,4,239,15, 248,4,139,68,36,20,252,255,165,233,248,5,255,252,247,198,237,15,133,244,4,
132,244,249,248,1,252,246,133,233,235,15,133,244,253,248,2,139,108,202,4, 15,182,70,252,253,252,247,208,141,20,194,139,122,252,248,139,191,233,139,
139,12,202,137,104,4,137,8,139,6,15,182,204,15,182,232,131,198,4,193,232, 191,233,252,233,244,4,248,7,15,139,244,1,131,230,252,248,41,252,242,137,215,
16,252,255,36,171,248,3,131,189,233,0,15,132,244,1,255,139,141,233,252,246, 139,114,252,252,252,233,244,1,255,141,76,202,8,139,105,232,139,65,252,236,
129,233,235,15,132,244,38,15,182,78,252,253,252,233,244,1,248,7,128,165,233, 137,41,137,65,4,139,105,252,240,139,65,252,244,137,105,8,137,65,12,139,105,
235,139,139,233,137,171,233,137,141,233,15,182,78,252,253,252,233,244,2,255, 224,139,65,228,137,105,252,248,137,65,252,252,129,252,248,239,184,3,0,0,0,
137,124,36,16,255,221,4,199,219,92,36,12,255,248,1,141,12,202,139,105,252, 15,133,244,29,252,255,165,233,255,15,182,252,236,139,66,252,248,141,12,202,
248,252,246,133,233,235,15,133,244,253,248,2,139,68,36,20,255,252,242,15, 139,128,233,15,182,128,233,137,124,36,16,141,188,253,194,233,43,122,252,252,
45,252,248,255,139,124,36,12,255,131,232,1,15,132,244,250,1,252,248,59,133, 133,252,237,15,132,244,251,141,108,252,233,252,248,57,215,15,131,244,248,
233,15,131,244,251,41,252,248,193,231,3,3,189,233,248,3,139,41,137,47,139, 248,1,139,71,252,248,137,1,139,71,252,252,131,199,8,137,65,4,131,193,8,57,
105,4,131,193,8,137,111,4,131,199,8,131,232,1,15,133,244,3,248,4,139,124, 252,233,15,131,244,249,57,215,15,130,244,1,248,2,199,65,4,237,131,193,8,57,
36,16,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,171,248, 252,233,15,130,244,2,248,3,139,124,36,16,139,6,15,182,204,15,182,232,131,
5,137,108,36,4,139,108,36,48,137,68,36,8,137,44,36,137,116,36,24,137,149, 198,4,193,232,16,252,255,36,171,248,5,199,68,36,20,1,0,0,0,137,208,41,252,
233,232,251,1,31,139,149,233,15,182,78,252,253,252,233,244,1,248,7,128,165, 248,15,134,244,3,255,137,197,193,252,237,3,131,197,1,137,108,36,20,139,108,
233,235,139,131,233,137,171,233,255,137,133,233,252,233,244,2,255,3,68,36, 36,48,1,200,59,133,233,15,135,244,253,248,6,139,71,252,248,137,1,139,71,252,
20,255,141,76,202,8,139,105,252,248,129,121,253,252,252,239,15,133,244,29, 252,131,199,8,137,65,4,131,193,8,57,215,15,130,244,6,252,233,244,3,248,7,
252,255,165,233,255,141,76,202,8,137,215,139,105,252,248,129,121,253,252, 137,149,233,137,141,233,137,116,36,24,41,215,139,84,36,20,131,252,234,1,137,
252,239,15,133,244,29,248,51,139,114,252,252,252,247,198,237,15,133,244,253, 252,233,232,251,1,0,139,149,233,139,141,233,1,215,252,233,244,6,255,193,225,
248,1,137,106,252,248,137,68,36,20,131,232,1,15,132,244,249,248,2,139,41, 3,255,248,1,139,114,252,252,137,68,36,20,252,247,198,237,15,133,244,253,255,
137,47,139,105,4,137,111,4,131,199,8,131,193,8,131,232,1,15,133,244,2,139, 248,17,137,215,131,232,1,15,132,244,249,248,2,139,44,15,137,111,252,248,139,
106,252,248,248,3,137,209,128,189,233,1,15,135,244,251,248,4,139,68,36,20, 108,15,4,137,111,252,252,131,199,8,131,232,1,15,133,244,2,248,3,139,68,36,
252,255,165,233,248,5,255,252,247,198,237,15,133,244,4,15,182,70,252,253, 20,15,182,110,252,255,248,5,57,197,15,135,244,252,255,139,108,10,4,137,106,
252,247,208,141,20,194,139,122,252,248,139,191,233,139,191,233,252,233,244, 252,252,139,44,10,137,106,252,248,255,248,5,56,70,252,255,15,135,244,252,
4,248,7,15,139,244,1,131,230,252,248,41,252,242,137,215,139,114,252,252,252, 255,15,182,78,252,253,252,247,209,141,20,202,139,122,252,248,139,191,233,
233,244,1,255,141,76,202,8,139,105,232,139,65,252,236,137,41,137,65,4,139, 139,191,233,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,171,
105,252,240,139,65,252,244,137,105,8,137,65,12,139,105,224,139,65,228,137, 248,6,255,199,71,252,252,237,131,199,8,255,199,68,194,252,244,237,255,131,
105,252,248,137,65,252,252,129,252,248,239,184,3,0,0,0,15,133,244,29,252, 192,1,252,233,244,5,248,7,15,139,244,18,131,230,252,248,41,252,242,255,1,
255,165,233,255,15,182,252,236,139,66,252,248,141,12,202,139,128,233,15,182, 252,241,255,137,252,245,209,252,237,129,229,239,102,131,172,253,43,233,1,
128,233,137,124,36,16,141,188,253,194,233,43,122,252,252,133,252,237,15,132, 15,132,244,138,255,141,12,202,255,129,121,253,4,239,15,135,244,52,129,121,
244,251,141,108,252,233,252,248,57,215,15,131,244,248,248,1,139,71,252,248, 253,12,239,15,135,244,52,255,139,105,20,255,129,252,253,239,15,135,244,52,
137,1,139,71,252,252,131,199,8,137,65,4,131,193,8,57,252,233,15,131,244,249, 255,252,242,15,16,1,252,242,15,16,73,8,255,252,242,15,88,65,16,252,242,15,
57,215,15,130,244,1,248,2,199,65,4,237,131,193,8,57,252,233,15,130,244,2, 17,1,133,252,237,15,136,244,249,255,15,140,244,249,255,102,15,46,200,248,
248,3,139,124,36,16,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252, 1,252,242,15,17,65,24,255,221,65,8,221,1,255,220,65,16,221,17,221,81,24,133,
255,36,171,248,5,199,68,36,20,1,0,0,0,137,208,41,252,248,15,134,244,3,255, 252,237,15,136,244,247,255,221,81,24,15,140,244,247,255,217,201,248,1,255,
137,197,193,252,237,3,131,197,1,137,108,36,20,139,108,36,48,1,200,59,133, 15,183,70,252,254,255,15,131,244,248,141,180,253,134,233,255,141,180,253,
233,15,135,244,253,248,6,139,71,252,248,137,1,139,71,252,252,131,199,8,137, 134,233,15,183,70,252,254,15,131,245,255,15,130,244,248,141,180,253,134,233,
65,4,131,193,8,57,215,15,130,244,6,252,233,244,3,248,7,137,149,233,137,141, 255,248,3,102,15,46,193,252,233,244,1,255,141,12,202,139,105,4,129,252,253,
233,137,116,36,24,41,215,139,84,36,20,131,252,234,1,137,252,233,232,251,1, 239,15,132,244,247,255,137,105,252,252,139,41,137,105,252,248,252,233,245,
0,139,149,233,139,141,233,1,215,252,233,244,6,255,193,225,3,255,248,1,139, 255,141,180,253,134,233,139,1,137,105,252,252,137,65,252,248,255,139,139,
114,252,252,137,68,36,20,252,247,198,237,15,133,244,253,255,248,17,137,215, 233,139,4,129,139,128,233,139,108,36,48,137,147,233,137,171,233,252,255,224,
131,232,1,15,132,244,249,248,2,139,44,15,137,111,252,248,139,108,15,4,137, 255,141,180,253,134,233,139,6,15,182,204,15,182,232,131,198,4,193,232,16,
111,252,252,131,199,8,131,232,1,15,133,244,2,248,3,139,68,36,20,15,182,110, 252,255,36,171,255,254,0
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,15,139,244,18,131,230,252,248,41,252,242,255,1,252,241,255,137,
252,245,209,252,237,129,229,239,102,131,172,253,43,233,1,15,132,244,138,255,
141,12,202,255,129,121,253,4,239,15,135,244,52,129,121,253,12,239,15,135,
244,52,255,139,105,20,255,129,252,253,239,15,135,244,52,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,
254,0
}; };
enum { enum {
@ -2024,22 +2024,22 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse)
dasm_put(Dst, 12774, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), Dt1(->base), LJ_TTAB); dasm_put(Dst, 12774, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), Dt1(->base), LJ_TTAB);
break; break;
case BC_TDUP: case BC_TDUP:
dasm_put(Dst, 12885, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), Dt1(->base), LJ_TTAB); dasm_put(Dst, 12895, 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, 12977, Dt7(->env)); dasm_put(Dst, 12987, Dt7(->env));
break; break;
case BC_GSET: case BC_GSET:
dasm_put(Dst, 12995, Dt7(->env)); dasm_put(Dst, 13005, Dt7(->env));
break; break;
case BC_TGETV: case BC_TGETV:
dasm_put(Dst, 13013, LJ_TTAB, LJ_TISNUM); dasm_put(Dst, 13023, LJ_TTAB, LJ_TISNUM);
if (sse) { if (sse) {
dasm_put(Dst, 13046); dasm_put(Dst, 13056);
} else { } else {
dasm_put(Dst, 13067); dasm_put(Dst, 13077);
if (cmov) { if (cmov) {
dasm_put(Dst, 11132); dasm_put(Dst, 11132);
} else { } else {
@ -2047,24 +2047,24 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse)
} }
dasm_put(Dst, 2856); dasm_put(Dst, 2856);
} }
dasm_put(Dst, 13077, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<<MM_index); dasm_put(Dst, 13087, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<<MM_index);
dasm_put(Dst, 13169, LJ_TSTR); dasm_put(Dst, 13179, LJ_TSTR);
break; break;
case BC_TGETS: case BC_TGETS:
dasm_put(Dst, 13187, LJ_TTAB, Dt6(->hmask), Dt5(->hash), sizeof(Node), Dt6(->node), DtB(->key.it), LJ_TSTR, DtB(->key.gcr), LJ_TNIL); dasm_put(Dst, 13197, LJ_TTAB, Dt6(->hmask), Dt5(->hash), sizeof(Node), Dt6(->node), DtB(->key.it), LJ_TSTR, DtB(->key.gcr), LJ_TNIL);
dasm_put(Dst, 13271, LJ_TNIL, DtB(->next), Dt6(->metatable), Dt6(->nomm), 1<<MM_index); dasm_put(Dst, 13281, LJ_TNIL, DtB(->next), Dt6(->metatable), Dt6(->nomm), 1<<MM_index);
break; break;
case BC_TGETB: case BC_TGETB:
dasm_put(Dst, 13342, LJ_TTAB, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<<MM_index); dasm_put(Dst, 13352, LJ_TTAB, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<<MM_index);
dasm_put(Dst, 11703); dasm_put(Dst, 11703);
break; break;
case BC_TSETV: case BC_TSETV:
dasm_put(Dst, 13441, LJ_TTAB, LJ_TISNUM); dasm_put(Dst, 13451, LJ_TTAB, LJ_TISNUM);
if (sse) { if (sse) {
dasm_put(Dst, 13046); dasm_put(Dst, 13056);
} else { } else {
dasm_put(Dst, 13067); dasm_put(Dst, 13077);
if (cmov) { if (cmov) {
dasm_put(Dst, 11132); dasm_put(Dst, 11132);
} else { } else {
@ -2072,34 +2072,34 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse)
} }
dasm_put(Dst, 2856); dasm_put(Dst, 2856);
} }
dasm_put(Dst, 13474, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->metatable)); dasm_put(Dst, 13484, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->metatable));
dasm_put(Dst, 13557, 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, 13567, 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, 13619, 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, 13629, 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, 13694, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<<MM_newindex, DtB(->next)); dasm_put(Dst, 13704, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<<MM_newindex, DtB(->next));
dasm_put(Dst, 13786, 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, 13796, 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, 13882, LJ_TTAB, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable)); dasm_put(Dst, 13892, LJ_TTAB, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable));
dasm_put(Dst, 13980, 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, 13990, 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, 14026); dasm_put(Dst, 14036);
if (sse) { if (sse) {
dasm_put(Dst, 12596); dasm_put(Dst, 12596);
} else { } else {
dasm_put(Dst, 14031); dasm_put(Dst, 14041);
} }
dasm_put(Dst, 14039, Dt6(->marked), LJ_GC_BLACK); dasm_put(Dst, 14049, Dt6(->marked), LJ_GC_BLACK);
if (sse) { if (sse) {
dasm_put(Dst, 14064); dasm_put(Dst, 14074);
} else { } else {
dasm_put(Dst, 14071); dasm_put(Dst, 14081);
} }
dasm_put(Dst, 14076, Dt6(->asize), Dt6(->array), Dt1(->base), Dt1(->base), Dt6(->marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain)); dasm_put(Dst, 14086, Dt6(->asize), Dt6(->array), Dt1(->base), Dt1(->base), Dt6(->marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain));
dasm_put(Dst, 14204, Dt6(->gclist)); dasm_put(Dst, 14214, Dt6(->gclist));
break; break;
/* -- Calls and vararg handling ----------------------------------------- */ /* -- Calls and vararg handling ----------------------------------------- */
@ -2107,60 +2107,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, 11717); dasm_put(Dst, 11717);
if (op == BC_CALLM) { if (op == BC_CALLM) {
dasm_put(Dst, 14212); dasm_put(Dst, 14222);
} }
dasm_put(Dst, 14217, LJ_TFUNC, Dt7(->gate)); dasm_put(Dst, 14227, LJ_TFUNC, Dt7(->gate));
break; break;
case BC_CALLMT: case BC_CALLMT:
dasm_put(Dst, 14212); dasm_put(Dst, 14222);
break; break;
case BC_CALLT: case BC_CALLT:
dasm_put(Dst, 14240, LJ_TFUNC, FRAME_TYPE, Dt7(->ffid), Dt7(->gate)); dasm_put(Dst, 14250, LJ_TFUNC, FRAME_TYPE, Dt7(->ffid), Dt7(->gate));
dasm_put(Dst, 14345, FRAME_TYPE, Dt7(->pt), Dt9(->k)); dasm_put(Dst, 14355, FRAME_TYPE, Dt7(->pt), Dt9(->k));
break; break;
case BC_ITERC: case BC_ITERC:
dasm_put(Dst, 14402, LJ_TFUNC, Dt7(->gate)); dasm_put(Dst, 14412, LJ_TFUNC, Dt7(->gate));
break; break;
case BC_VARG: case BC_VARG:
dasm_put(Dst, 14464, Dt7(->pt), Dt9(->numparams), (8+FRAME_VARG), LJ_TNIL); dasm_put(Dst, 14474, Dt7(->pt), Dt9(->numparams), (8+FRAME_VARG), LJ_TNIL);
dasm_put(Dst, 14608, Dt1(->maxstack), Dt1(->base), Dt1(->top), Dt1(->base), Dt1(->top)); dasm_put(Dst, 14618, Dt1(->maxstack), Dt1(->base), Dt1(->top), Dt1(->base), Dt1(->top));
break; break;
/* -- Returns ----------------------------------------------------------- */ /* -- Returns ----------------------------------------------------------- */
case BC_RETM: case BC_RETM:
dasm_put(Dst, 14212); dasm_put(Dst, 14222);
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, 14707); dasm_put(Dst, 14717);
} }
dasm_put(Dst, 14711, FRAME_TYPE); dasm_put(Dst, 14721, FRAME_TYPE);
switch (op) { switch (op) {
case BC_RET: case BC_RET:
dasm_put(Dst, 14730); dasm_put(Dst, 14740);
break; break;
case BC_RET1: case BC_RET1:
dasm_put(Dst, 14788); dasm_put(Dst, 14798);
/* fallthrough */ /* fallthrough */
case BC_RET0: case BC_RET0:
dasm_put(Dst, 14804); dasm_put(Dst, 14814);
default: default:
break; break;
} }
dasm_put(Dst, 14815, Dt7(->pt), Dt9(->k)); dasm_put(Dst, 14825, Dt7(->pt), Dt9(->k));
if (op == BC_RET) { if (op == BC_RET) {
dasm_put(Dst, 14857, LJ_TNIL); dasm_put(Dst, 14867, LJ_TNIL);
} else { } else {
dasm_put(Dst, 14866, LJ_TNIL); dasm_put(Dst, 14876, LJ_TNIL);
} }
dasm_put(Dst, 14873); dasm_put(Dst, 14883);
if (op != BC_RET0) { if (op != BC_RET0) {
dasm_put(Dst, 14894); dasm_put(Dst, 14904);
} }
dasm_put(Dst, 5061); dasm_put(Dst, 5061);
break; break;
@ -2170,7 +2170,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, 14898, HOTCOUNT_PCMASK, GG_DISP2HOT); dasm_put(Dst, 14908, HOTCOUNT_PCMASK, GG_DISP2HOT);
#endif #endif
break; break;
@ -2182,57 +2182,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, 14919); dasm_put(Dst, 14929);
if (!vk) { if (!vk) {
dasm_put(Dst, 14923, LJ_TISNUM, LJ_TISNUM); dasm_put(Dst, 14933, LJ_TISNUM, LJ_TISNUM);
} }
dasm_put(Dst, 14942); dasm_put(Dst, 14952);
if (!vk) { if (!vk) {
dasm_put(Dst, 14946, LJ_TISNUM); dasm_put(Dst, 14956, LJ_TISNUM);
} }
if (sse) { if (sse) {
dasm_put(Dst, 14955); dasm_put(Dst, 14965);
if (vk) { if (vk) {
dasm_put(Dst, 14967); dasm_put(Dst, 14977);
} else { } else {
dasm_put(Dst, 14986); dasm_put(Dst, 14996);
} }
dasm_put(Dst, 14991); dasm_put(Dst, 15001);
} else { } else {
dasm_put(Dst, 15004); dasm_put(Dst, 15014);
if (vk) { if (vk) {
dasm_put(Dst, 15010); dasm_put(Dst, 15020);
} else { } else {
dasm_put(Dst, 15026); dasm_put(Dst, 15036);
} }
dasm_put(Dst, 15034); dasm_put(Dst, 15044);
if (cmov) { if (cmov) {
dasm_put(Dst, 11132); dasm_put(Dst, 11132);
} else { } else {
dasm_put(Dst, 11138); dasm_put(Dst, 11138);
} }
if (!cmov) { if (!cmov) {
dasm_put(Dst, 15039); dasm_put(Dst, 15049);
} }
} }
if (op == BC_FORI) { if (op == BC_FORI) {
dasm_put(Dst, 15045, -BCBIAS_J*4); dasm_put(Dst, 15055, -BCBIAS_J*4);
} else if (op == BC_JFORI) { } else if (op == BC_JFORI) {
dasm_put(Dst, 15055, -BCBIAS_J*4, BC_JLOOP); dasm_put(Dst, 15065, -BCBIAS_J*4, BC_JLOOP);
} else if (op == BC_IFORL) { } else if (op == BC_IFORL) {
dasm_put(Dst, 15069, -BCBIAS_J*4); dasm_put(Dst, 15079, -BCBIAS_J*4);
} else { } else {
dasm_put(Dst, 15065, BC_JLOOP); dasm_put(Dst, 15075, BC_JLOOP);
} }
dasm_put(Dst, 11167); dasm_put(Dst, 11167);
if (sse) { if (sse) {
dasm_put(Dst, 15079); dasm_put(Dst, 15089);
} }
break; break;
case BC_ITERL: case BC_ITERL:
#if LJ_HASJIT #if LJ_HASJIT
dasm_put(Dst, 14898, HOTCOUNT_PCMASK, GG_DISP2HOT); dasm_put(Dst, 14908, HOTCOUNT_PCMASK, GG_DISP2HOT);
#endif #endif
break; break;
@ -2241,18 +2241,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, 15090, LJ_TNIL); dasm_put(Dst, 15100, LJ_TNIL);
if (op == BC_JITERL) { if (op == BC_JITERL) {
dasm_put(Dst, 15105, BC_JLOOP); dasm_put(Dst, 15115, BC_JLOOP);
} else { } else {
dasm_put(Dst, 15119, -BCBIAS_J*4); dasm_put(Dst, 15129, -BCBIAS_J*4);
} }
dasm_put(Dst, 11464); dasm_put(Dst, 11464);
break; break;
case BC_LOOP: case BC_LOOP:
#if LJ_HASJIT #if LJ_HASJIT
dasm_put(Dst, 14898, HOTCOUNT_PCMASK, GG_DISP2HOT); dasm_put(Dst, 14908, HOTCOUNT_PCMASK, GG_DISP2HOT);
#endif #endif
break; break;
@ -2262,12 +2262,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, 15135, DISPATCH_J(trace), DtD(->mcode), DISPATCH_GL(jit_base), DISPATCH_GL(jit_L)); dasm_put(Dst, 15145, 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, 15158, -BCBIAS_J*4); dasm_put(Dst, 15168, -BCBIAS_J*4);
break; break;
/* ---------------------------------------------------------------------- */ /* ---------------------------------------------------------------------- */
@ -2295,7 +2295,7 @@ static int build_backend(BuildCtx *ctx)
build_subroutines(ctx, cmov, sse); build_subroutines(ctx, cmov, sse);
dasm_put(Dst, 15182); dasm_put(Dst, 15192);
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);