wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 539874 - nanojit: remove LIR_ov (TM-specific part). r=gal.

Browse Source
This commit is contained in:
Nicholas Nethercote 2010-02-19 15:12:37 +11:00
parent f6908e48c7
commit 2631a1b7cf
2 changed files with 70 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
js/src/jstracer.cpp
View File

@ -157,6 +157,25 @@ LirNameMap::formatGuard(LIns *i, char *out)
(long int)x->rp_adj,
i->record()->profGuardID);
}
void
LirNameMap::formatGuardXov(LIns *i, char *out)
{
VMSideExit *x;
x = (VMSideExit *)i->record()->exit;
sprintf(out,
"%s = %s %s, %s -> pc=%p imacpc=%p sp%+ld rp%+ld (GuardID=%03d)",
formatRef(i),
lirNames[i->opcode()],
formatRef(i->oprnd1()),
formatRef(i->oprnd2()),
(void *)x->pc,
(void *)x->imacpc,
(long int)x->sp_adj,
(long int)x->rp_adj,
i->record()->profGuardID);
}
#endif
} /* namespace nanojit */
@ -4094,7 +4113,7 @@ TraceRecorder::guard(bool expected, LIns* cond, VMSideExit* exit)
if (exit->exitType == LOOP_EXIT)
tree->sideExits.add(exit);
if (!cond->isCond()) {
if (!cond->isCmp()) {
expected = !expected;
cond = cond->isI32() ? lir->ins_eq0(cond) : lir->ins_peq0(cond);
}
@ -4107,6 +4126,41 @@ TraceRecorder::guard(bool expected, LIns* cond, VMSideExit* exit)
}
}
/*
* Emit a guard a 32-bit integer arithmetic operation op(d0, d1) and
* using the supplied side exit if it overflows.
*/
JS_REQUIRES_STACK LIns*
TraceRecorder::guard_xov(LOpcode op, LIns* d0, LIns* d1, VMSideExit* exit)
{
debug_only_printf(LC_TMRecorder,
" About to try emitting guard_xov code for "
"SideExit=%p exitType=%s\n",
(void*)exit, getExitName(exit->exitType));
GuardRecord* guardRec = createGuardRecord(exit);
JS_ASSERT(exit->exitType == OVERFLOW_EXIT);
switch (op) {
case LIR_add:
op = LIR_addxov;
break;
case LIR_sub:
op = LIR_subxov;
break;
case LIR_mul:
op = LIR_mulxov;
break;
default:
JS_NOT_REACHED("unexpected comparison op");
break;
}
LIns* guardIns = lir->insGuardXov(op, d0, d1, guardRec);
NanoAssert(guardIns);
return guardIns;
}
JS_REQUIRES_STACK VMSideExit*
TraceRecorder::copy(VMSideExit* copy)
{
@ -8091,20 +8145,22 @@ TraceRecorder::alu(LOpcode v, jsdouble v0, jsdouble v1, LIns* s0, LIns* s1)
default:
v = f64arith_to_i32arith(v);
result = lir->ins2(v, d0, d1);
JS_ASSERT(v == LIR_add || v == LIR_mul || v == LIR_sub);
/*
* If the operands guarantee that the result will be an integer (i.e.
* z = x + y with 0 <= (x|y) <= 0xffff guarantees z <= fffe0001), we
* If the operands guarantee that the result will be an integer (e.g.
* z = x * y with 0 <= (x|y) <= 0xffff guarantees z <= fffe0001), we
* don't have to guard against an overflow. Otherwise we emit a guard
* that will inform the oracle and cause a non-demoted trace to be
* attached that uses floating-point math for this operation.
*/
if (!result->isconst() && result->isop(v) && (!IsOverflowSafe(v, d0) || !IsOverflowSafe(v, d1))) {
if (!IsOverflowSafe(v, d0) || !IsOverflowSafe(v, d1)) {
exit = snapshot(OVERFLOW_EXIT);
guard(false, lir->ins1(LIR_ov, result), exit);
result = guard_xov(v, d0, d1, exit);
if (v == LIR_mul) // make sure we don't lose a -0
guard(false, lir->ins_eq0(result), exit);
} else {
result = lir->ins2(v, d0, d1);
}
break;
}
@ -10205,12 +10261,12 @@ TraceRecorder::record_JSOP_NEG()
isPromoteInt(a) &&
(!JSVAL_IS_INT(v) || JSVAL_TO_INT(v) != 0) &&
(!JSVAL_IS_DOUBLE(v) || !JSDOUBLE_IS_NEGZERO(*JSVAL_TO_DOUBLE(v))) &&
-asNumber(v) == (int)-asNumber(v)) {
a = lir->ins1(LIR_neg, demote(lir, a));
if (!a->isconst() && a->isop(LIR_neg)) {
VMSideExit* exit = snapshot(OVERFLOW_EXIT);
guard(false, lir->ins1(LIR_ov, a), exit);
guard(false, lir->ins2i(LIR_eq, a, 0), exit);
-asNumber(v) == (int)-asNumber(v))
{
VMSideExit* exit = snapshot(OVERFLOW_EXIT);
a = guard_xov(LIR_sub, lir->insImm(0), demote(lir, a), exit);
if (!a->isconst() && a->isop(LIR_subxov)) {
guard(false, lir->ins2i(LIR_eq, a, 0), exit); // make sure we don't lose a -0
}
a = lir->ins1(LIR_i2f, a);
} else {

2
js/src/jstracer.h
View File

@ -1082,6 +1082,8 @@ class TraceRecorder
JS_REQUIRES_STACK void guard(bool expected, nanojit::LIns* cond, ExitType exitType);
JS_REQUIRES_STACK void guard(bool expected, nanojit::LIns* cond, VMSideExit* exit);
JS_REQUIRES_STACK nanojit::LIns* guard_xov(nanojit::LOpcode op, nanojit::LIns* d0,
nanojit::LIns* d1, VMSideExit* exit);
JS_REQUIRES_STACK nanojit::LIns* slurpInt32Slot(nanojit::LIns* val_ins, jsval* vp,
VMSideExit* exit);
JS_REQUIRES_STACK nanojit::LIns* slurpDoubleSlot(nanojit::LIns* val_ins, jsval* vp,