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

Demote floating point comparisons even if one side is constant (bug in nanojit, filed as #443884 against tamarin). Also demote add/sub/mul using the integer overflow detection side exit code that Ed adopted upstream. Tight loops (bitwise) are not emitted completely as integer code after the initial compilation using doubles triggered a speculative demotion of the context slots.

Browse Source
This commit is contained in:
Andreas Gal 2008-07-07 00:43:40 -07:00
parent 8ce0de1ad7
commit efa3309778
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
js/src/jstracer.cpp
View File

@ -200,12 +200,12 @@ static LIns* demote(LirWriter *out, LInsp i)
static bool isPromoteInt(LIns *i)
{
return i->isop(LIR_i2f);
return i->isop(LIR_i2f) || i->isconstq();
}
static bool isPromoteUint(LIns *i)
{
return i->isop(LIR_u2f);
return i->isop(LIR_u2f) || i->isconstq();
}
static bool isPromote(LIns *i)
@ -215,9 +215,10 @@ static bool isPromote(LIns *i)
class FuncFilter: public LirWriter
{
TraceRecorder& recorder;
public:
FuncFilter(LirWriter *out):
LirWriter(out)
FuncFilter(LirWriter *out, TraceRecorder& _recorder):
LirWriter(out), recorder(_recorder)
{
}
@ -264,6 +265,14 @@ public:
v = LOpcode(v + (LIR_ult - LIR_lt)); // cmp -> ucmp
return out->ins2(v, demote(out, s1), demote(out, s0));
}
} else if (v == LIR_fadd || v == LIR_fsub || v == LIR_fmul) {
if (isPromoteInt(s0) && isPromoteInt(s1)) {
// demote fop to op
v = (LOpcode)((int)v & ~LIR64);
LIns* result = out->ins2(v, demote(out, s1), demote(out, s0));
out->insGuard(LIR_xt, out->ins1(LIR_ov, result), recorder.snapshot());
return out->ins1(LIR_i2f, result);
}
}
return out->ins2(v, s1, s0);
}
@ -401,7 +410,7 @@ TraceRecorder::TraceRecorder(JSContext* cx, Fragmento* fragmento, Fragment* _fra
lir = cse_filter = new (&gc) CseFilter(lir, &gc);
lir = expr_filter = new (&gc) ExprFilter(lir);
lir = exit_filter = new (&gc) ExitFilter(lir, *this);
lir = func_filter = new (&gc) FuncFilter(lir);
lir = func_filter = new (&gc) FuncFilter(lir, *this);
lir->ins0(LIR_trace);
if (fragment->vmprivate == NULL) {
/* generate the entry map and stash it in the trace */

2
js/src/jstracer.h
View File

@ -133,7 +133,6 @@ class TraceRecorder {
void import(jsval*, uint8& t, char *prefix, int index);
void trackNativeFrameUse(unsigned slots);
nanojit::SideExit* snapshot();
unsigned getCallDepth() const;
void guard(bool expected, nanojit::LIns* cond);
@ -194,6 +193,7 @@ public:
JSStackFrame* getFp() const;
JSFrameRegs& getRegs() const;
nanojit::Fragment* getFragment() const;
nanojit::SideExit* snapshot();
nanojit::LIns* get(void* p);