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

DUALNUM: Fix narrowing of unary minus.

Browse Source
This commit is contained in:
Mike Pall 2011-03-19 17:46:10 +01:00
parent a1c887e3b9
commit 7088abce8f
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/lj_record.c
View File

@ -1655,7 +1655,7 @@ void lj_record_ins(jit_State *J)
rc = lj_ir_call(J, IRCALL_lj_tab_len, rc); rc = lj_ir_call(J, IRCALL_lj_tab_len, rc);
} else { } else {
ix.tab = rc; ix.tab = rc;
copyTV(J->L, &ix.tabv, &ix.keyv); copyTV(J->L, &ix.tabv, rcv);
ix.key = TREF_NIL; ix.key = TREF_NIL;
setnilV(&ix.keyv); setnilV(&ix.keyv);
rc = rec_mm_arith(J, &ix, MM_len); rc = rec_mm_arith(J, &ix, MM_len);
@ -1666,19 +1666,20 @@ void lj_record_ins(jit_State *J)
case BC_UNM: case BC_UNM:
if (tref_isnumber_str(rc)) { if (tref_isnumber_str(rc)) {
rc = lj_opt_narrow_unm(J, rc, &ix.tabv); rc = lj_opt_narrow_unm(J, rc, rcv);
} else { } else {
ix.tab = rc; ix.tab = rc;
copyTV(J->L, &ix.tabv, &ix.keyv); copyTV(J->L, &ix.tabv, rcv);
rc = rec_mm_arith(J, &ix, MM_unm); rc = rec_mm_arith(J, &ix, MM_unm);
} }
break; break;
case BC_ADDNV: case BC_SUBNV: case BC_MULNV: case BC_DIVNV: case BC_MODNV: case BC_ADDNV: case BC_SUBNV: case BC_MULNV: case BC_DIVNV: case BC_MODNV:
/* Swap rb/rc and rbv/rcv. rav is temp. */
ix.tab = rc; ix.key = rc = rb; rb = ix.tab; ix.tab = rc; ix.key = rc = rb; rb = ix.tab;
copyTV(J->L, &ix.valv, &ix.tabv); copyTV(J->L, rav, rbv);
copyTV(J->L, &ix.tabv, &ix.keyv); copyTV(J->L, rbv, rcv);
copyTV(J->L, &ix.keyv, &ix.valv); copyTV(J->L, rcv, rav);
if (op == BC_MODNV) if (op == BC_MODNV)
goto recmod; goto recmod;
/* fallthrough */ /* fallthrough */
@ -1686,7 +1687,7 @@ void lj_record_ins(jit_State *J)
case BC_ADDVV: case BC_SUBVV: case BC_MULVV: case BC_DIVVV: { case BC_ADDVV: case BC_SUBVV: case BC_MULVV: case BC_DIVVV: {
MMS mm = bcmode_mm(op); MMS mm = bcmode_mm(op);
if (tref_isnumber_str(rb) && tref_isnumber_str(rc)) if (tref_isnumber_str(rb) && tref_isnumber_str(rc))
rc = lj_opt_narrow_arith(J, rb, rc, &ix.tabv, &ix.keyv, rc = lj_opt_narrow_arith(J, rb, rc, rbv, rcv,
(int)mm - (int)MM_add + (int)IR_ADD); (int)mm - (int)MM_add + (int)IR_ADD);
else else
rc = rec_mm_arith(J, &ix, mm); rc = rec_mm_arith(J, &ix, mm);