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

Restore MULTRES for snapshots pointing to CALLM etc. bytecodes.

Browse Source
This commit is contained in:
Mike Pall
2010-03-13 17:45:09 +01:00
parent 4f19a15bd9
commit 16f33422f1
3 changed files with 49 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/lj_asm.c
View File

@@ -3253,6 +3253,16 @@ static void asm_head_side(ASMState *as)
/* -- Tail of trace ------------------------------------------------------- */
/* Set MULTRES in C frame. */
static void asm_tail_multres(ASMState *as, BCReg mres)
{
/* We don't know spadj yet, so get the C frame from L->cframe. */
emit_movmroi(as, RID_RET, CFRAME_OFS_MULTRES, mres);
emit_gri(as, XG_ARITHi(XOg_AND), RID_RET|REX_64, CFRAME_RAWMASK);
emit_rmro(as, XO_MOV, RID_RET|REX_64, RID_RET, offsetof(lua_State, cframe));
emit_getgl(as, RID_RET, jit_L);
}
/* Link to another trace. */
static void asm_tail_link(ASMState *as)
{
@@ -3273,6 +3283,19 @@ static void asm_tail_link(ASMState *as)
}
emit_loada(as, RID_DISPATCH, J2GG(as->J)->dispatch);
emit_loada(as, RID_PC, pc);
switch (bc_op(*pc)) {
case BC_CALLM: case BC_CALLMT:
asm_tail_multres(as, snap->nslots - baseslot - 1 - bc_a(*pc) - bc_c(*pc));
break;
case BC_RETM:
asm_tail_multres(as, snap->nslots - baseslot - bc_a(*pc) - bc_d(*pc));
break;
case BC_TSETM:
asm_tail_multres(as, snap->nslots - baseslot - bc_a(*pc));
break;
default:
break;
}
} else if (baseslot) {
/* Save modified BASE for linking to trace with higher start frame. */
emit_setgl(as, RID_BASE, jit_base);