topchetoeu/tal-runtime
1
0
Fork 0
Code Pull Requests Activity

Add support for IRT_FLOAT to XLOAD/XSTORE.

Browse Source
This commit is contained in:
Mike Pall 2010-12-30 00:36:33 +01:00
parent 2ca2de7f0e
commit 8bcc5ed021
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/lj_asm.c
View File

@ -2130,6 +2130,7 @@ static void asm_fxload(ASMState *as, IRIns *ir)
case IRT_I16: xo = XO_MOVSXw; break; case IRT_I16: xo = XO_MOVSXw; break;
case IRT_U16: xo = XO_MOVZXw; break; case IRT_U16: xo = XO_MOVZXw; break;
case IRT_NUM: xo = XMM_MOVRM(as); break; case IRT_NUM: xo = XMM_MOVRM(as); break;
case IRT_FLOAT: xo = XO_MOVSS; break;
default: default:
if (LJ_64 && irt_is64(ir->t)) if (LJ_64 && irt_is64(ir->t))
dest |= REX_64; dest |= REX_64;
@ -2149,9 +2150,10 @@ static void asm_fxstore(ASMState *as, IRIns *ir)
/* The IRT_I16/IRT_U16 stores should never be simplified for constant /* The IRT_I16/IRT_U16 stores should never be simplified for constant
** values since mov word [mem], imm16 has a length-changing prefix. ** values since mov word [mem], imm16 has a length-changing prefix.
*/ */
if (irt_isi16(ir->t) || irt_isu16(ir->t) || irt_isnum(ir->t) || if (irt_isi16(ir->t) || irt_isu16(ir->t) ||
irt_isnum(ir->t) || irt_isfloat(ir->t) ||
!asm_isk32(as, ir->op2, &k)) { !asm_isk32(as, ir->op2, &k)) {
RegSet allow8 = irt_isnum(ir->t) ? RSET_FPR : RegSet allow8 = (irt_isnum(ir->t) || irt_isfloat(ir->t)) ? RSET_FPR :
(irt_isi8(ir->t) || irt_isu8(ir->t)) ? RSET_GPR8 : RSET_GPR; (irt_isi8(ir->t) || irt_isu8(ir->t)) ? RSET_GPR8 : RSET_GPR;
src = osrc = ra_alloc1(as, ir->op2, allow8); src = osrc = ra_alloc1(as, ir->op2, allow8);
if (!LJ_64 && !rset_test(allow8, src)) { /* Already in wrong register. */ if (!LJ_64 && !rset_test(allow8, src)) { /* Already in wrong register. */
@ -2171,6 +2173,7 @@ static void asm_fxstore(ASMState *as, IRIns *ir)
case IRT_I8: case IRT_U8: xo = XO_MOVtob; src |= FORCE_REX; break; case IRT_I8: case IRT_U8: xo = XO_MOVtob; src |= FORCE_REX; break;
case IRT_I16: case IRT_U16: xo = XO_MOVtow; break; case IRT_I16: case IRT_U16: xo = XO_MOVtow; break;
case IRT_NUM: xo = XO_MOVSDto; break; case IRT_NUM: xo = XO_MOVSDto; break;
case IRT_FLOAT: xo = XO_MOVSSto; break;
#if LJ_64 #if LJ_64
case IRT_LIGHTUD: lua_assert(0); /* NYI: mask 64 bit lightuserdata. */ case IRT_LIGHTUD: lua_assert(0); /* NYI: mask 64 bit lightuserdata. */
#endif #endif

2
src/lj_target_x86.h
View File

@ -235,6 +235,8 @@ typedef enum {
XO_MOVSD = XO_f20f(10), XO_MOVSD = XO_f20f(10),
XO_MOVSDto = XO_f20f(11), XO_MOVSDto = XO_f20f(11),
XO_MOVSS = XO_f30f(10),
XO_MOVSSto = XO_f30f(11),
XO_MOVLPD = XO_660f(12), XO_MOVLPD = XO_660f(12),
XO_MOVAPS = XO_0f(28), XO_MOVAPS = XO_0f(28),
XO_XORPS = XO_0f(57), XO_XORPS = XO_0f(57),