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

FFI/x86: Fix CONV.u32.num rounding.

Browse Source
This commit is contained in:
Mike Pall 2011-10-19 00:18:36 +02:00
parent 2fcd562582
commit 45df079c01
1 changed files with 10 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/lj_asm_x86.h
View File

@ -620,33 +620,23 @@ static void asm_conv(ASMState *as, IRIns *ir)
x86Op op = st == IRT_NUM ? x86Op op = st == IRT_NUM ?
((ir->op2 & IRCONV_TRUNC) ? XO_CVTTSD2SI : XO_CVTSD2SI) : ((ir->op2 & IRCONV_TRUNC) ? XO_CVTTSD2SI : XO_CVTSD2SI) :
((ir->op2 & IRCONV_TRUNC) ? XO_CVTTSS2SI : XO_CVTSS2SI); ((ir->op2 & IRCONV_TRUNC) ? XO_CVTTSS2SI : XO_CVTSS2SI);
if (LJ_32 && irt_isu32(ir->t)) { /* FP to U32 conversion on x86. */ if (LJ_64 ? irt_isu64(ir->t) : irt_isu32(ir->t)) {
/* u32 = (int32_t)(number - 2^31) + 2^31 */ /* LJ_64: For inputs >= 2^63 add -2^64, convert again. */
Reg tmp = ra_noreg(IR(lref)->r) ? ra_alloc1(as, lref, RSET_FPR) : /* LJ_32: For inputs >= 2^31 add -2^31, convert again and add 2^31. */
ra_scratch(as, RSET_FPR);
emit_gri(as, XG_ARITHi(XOg_ADD), dest, (int32_t)0x80000000);
emit_rr(as, op, dest, tmp);
if (st == IRT_NUM)
emit_rma(as, XO_ADDSD, tmp,
lj_ir_k64_find(as->J, U64x(c1e00000,00000000)));
else
emit_rma(as, XO_ADDSS, tmp,
lj_ir_k64_find(as->J, U64x(00000000,cf000000)));
ra_left(as, tmp, lref);
} else if (LJ_64 && irt_isu64(ir->t)) {
/* For inputs in [2^63,2^64-1] add -2^64 and convert again. */
Reg tmp = ra_noreg(IR(lref)->r) ? ra_alloc1(as, lref, RSET_FPR) : Reg tmp = ra_noreg(IR(lref)->r) ? ra_alloc1(as, lref, RSET_FPR) :
ra_scratch(as, RSET_FPR); ra_scratch(as, RSET_FPR);
MCLabel l_end = emit_label(as); MCLabel l_end = emit_label(as);
if (LJ_32)
emit_gri(as, XG_ARITHi(XOg_ADD), dest, (int32_t)0x80000000);
emit_rr(as, op, dest|REX_64, tmp); emit_rr(as, op, dest|REX_64, tmp);
if (st == IRT_NUM) if (st == IRT_NUM)
emit_rma(as, XO_ADDSD, tmp, emit_rma(as, XO_ADDSD, tmp, lj_ir_k64_find(as->J,
lj_ir_k64_find(as->J, U64x(c3f00000,00000000))); LJ_64 ? U64x(c3f00000,00000000) : U64x(c1e00000,00000000)));
else else
emit_rma(as, XO_ADDSS, tmp, emit_rma(as, XO_ADDSS, tmp, lj_ir_k64_find(as->J,
lj_ir_k64_find(as->J, U64x(00000000,df800000))); LJ_64 ? U64x(00000000,df800000) : U64x(00000000,cf000000)));
emit_sjcc(as, CC_NS, l_end); emit_sjcc(as, CC_NS, l_end);
emit_rr(as, XO_TEST, dest|REX_64, dest); /* Check if dest < 2^63. */ emit_rr(as, XO_TEST, dest|REX_64, dest); /* Check if dest negative. */
emit_rr(as, op, dest|REX_64, tmp); emit_rr(as, op, dest|REX_64, tmp);
ra_left(as, tmp, lref); ra_left(as, tmp, lref);
} else { } else {