diff options
| author | Mike Pall <mike> | 2017-02-20 02:35:00 +0100 |
|---|---|---|
| committer | Mike Pall <mike> | 2017-02-20 02:35:00 +0100 |
| commit | ee33a1f9b33577e23e5ec0aedd5ebe1baeef7f7c (patch) | |
| tree | 1c0d4de8308f1a7016928fc6f713a0c37c3e8c93 | |
| parent | 1abd779907d429fc24c2d7787ba128d8b39c592f (diff) | |
| download | luajit2-ee33a1f9b33577e23e5ec0aedd5ebe1baeef7f7c.tar.gz | |
MIPS: Fix emitted code for U32 to float conversion.
| -rw-r--r-- | src/lj_asm_mips.h | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/src/lj_asm_mips.h b/src/lj_asm_mips.h index 8044037b..03270cca 100644 --- a/src/lj_asm_mips.h +++ b/src/lj_asm_mips.h @@ -443,18 +443,14 @@ static void asm_conv(ASMState *as, IRIns *ir) /* y = (x ^ 0x8000000) + 2147483648.0 */ Reg left = ra_alloc1(as, lref, RSET_GPR); Reg tmp = ra_scratch(as, rset_exclude(RSET_FPR, dest)); - emit_fgh(as, irt_isfloat(ir->t) ? MIPSI_ADD_S : MIPSI_ADD_D, - dest, dest, tmp); - emit_fg(as, irt_isfloat(ir->t) ? MIPSI_CVT_S_W : MIPSI_CVT_D_W, - dest, dest); if (irt_isfloat(ir->t)) - emit_lsptr(as, MIPSI_LWC1, (tmp & 31), - (void *)lj_ir_k64_find(as->J, U64x(4f000000,4f000000)), - RSET_GPR); - else - emit_lsptr(as, MIPSI_LDC1, (tmp & 31), - (void *)lj_ir_k64_find(as->J, U64x(41e00000,00000000)), - RSET_GPR); + emit_fg(as, MIPSI_CVT_S_D, dest, dest); + /* Must perform arithmetic with doubles to keep the precision. */ + emit_fgh(as, MIPSI_ADD_D, dest, dest, tmp); + emit_fg(as, MIPSI_CVT_D_W, dest, dest); + emit_lsptr(as, MIPSI_LDC1, (tmp & 31), + (void *)lj_ir_k64_find(as->J, U64x(41e00000,00000000)), + RSET_GPR); emit_tg(as, MIPSI_MTC1, RID_TMP, dest); emit_dst(as, MIPSI_XOR, RID_TMP, RID_TMP, left); emit_ti(as, MIPSI_LUI, RID_TMP, 0x8000); |