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

Merge branch 'master' into v2.1

Browse Source
This commit is contained in:
Mike Pall 2014-03-28 19:11:35 +01:00
commit b65515fb48
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/lj_opt_mem.c
View File

@ -749,21 +749,19 @@ retry:
case ALIAS_MUST:
/* Emit conversion if the loaded type doesn't match the forwarded type. */
if (!irt_sametype(fins->t, IR(store->op2)->t)) {
IRType st = irt_type(fins->t);
if (st == IRT_I8 || st == IRT_I16) { /* Trunc + sign-extend. */
st |= IRCONV_SEXT;
} else if (st == IRT_U8 || st == IRT_U16) { /* Trunc + zero-extend. */
} else if (st == IRT_INT) {
st = irt_type(IR(store->op2)->t); /* Needs dummy CONV.int.*. */
} else { /* I64/U64 are boxed, U32 is hidden behind a CONV.num.u32. */
goto store_fwd;
IRType dt = irt_type(fins->t), st = irt_type(IR(store->op2)->t);
if (dt == IRT_I8 || dt == IRT_I16) { /* Trunc + sign-extend. */
st = dt | IRCONV_SEXT;
dt = IRT_INT;
} else if (dt == IRT_U8 || dt == IRT_U16) { /* Trunc + zero-extend. */
st = dt;
dt = IRT_INT;
}
fins->ot = IRTI(IR_CONV);
fins->ot = IRT(IR_CONV, dt);
fins->op1 = store->op2;
fins->op2 = (IRT_INT<<5)|st;
fins->op2 = (dt<<5)|st;
return RETRYFOLD;
}
store_fwd:
return store->op2; /* Store forwarding. */
}
ref = store->prev;