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

Fix incProp to box and store (incElem still todo).

Browse Source
This commit is contained in:
Brendan Eich 2008-07-19 10:24:28 -07:00
parent f2ad868fc0
commit a26be1bd4b
3 changed files with 44 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
js/src/jstracer.cpp
View File

@ -1443,11 +1443,22 @@ TraceRecorder::incProp(jsint incr, bool pre)
JSObject* obj = JSVAL_TO_OBJECT(l);
LIns* obj_ins = get(&l);
jsval* vp;
uint32 slot;
LIns* v_ins;
if (!prop(obj, obj_ins, vp, v_ins))
if (!prop(obj, obj_ins, slot, v_ins))
return false;
return inc(*vp, v_ins, incr, pre);
jsval& v = STOBJ_GET_SLOT(obj, slot);
if (!inc(v, v_ins, incr, pre))
return false;
LIns* boxed_ins = get(&v);
if (!box_jsval(v, boxed_ins))
return false;
LIns* dslots_ins = NULL;
stobj_set_slot(obj_ins, slot, dslots_ins, boxed_ins);
return true;
}
bool
@ -2300,7 +2311,7 @@ TraceRecorder::record_EnterFrame()
}
bool
TraceRecorder::prop(JSObject* obj, LIns* obj_ins, jsval*& vp, LIns*& v_ins)
TraceRecorder::prop(JSObject* obj, LIns* obj_ins, uint32& slot, LIns*& v_ins)
{
/*
* Can't specialize to assert obj != global, must guard to avoid aliasing
@ -2310,15 +2321,12 @@ TraceRecorder::prop(JSObject* obj, LIns* obj_ins, jsval*& vp, LIns*& v_ins)
ABORT_TRACE("prop op aliases global");
guard(false, lir->ins2(LIR_eq, obj_ins, lir->insImmPtr((void*)globalObj)));
uint32 slot;
if (!test_property_cache_direct_slot(obj, obj_ins, slot))
return false;
vp = &STOBJ_GET_SLOT(obj, slot);
LIns* dslots_ins = NULL;
v_ins = stobj_get_slot(obj_ins, slot, dslots_ins);
if (!unbox_jsval(*vp, v_ins))
if (!unbox_jsval(STOBJ_GET_SLOT(obj, slot), v_ins))
ABORT_TRACE("unboxing");
return true;
}
@ -2367,9 +2375,9 @@ TraceRecorder::elem(jsval& l, jsval& r, jsval*& vp, LIns*& v_ins)
bool
TraceRecorder::getProp(JSObject* obj, LIns* obj_ins)
{
jsval* vp;
uint32 slot;
LIns* v_ins;
if (!prop(obj, obj_ins, vp, v_ins))
if (!prop(obj, obj_ins, slot, v_ins))
return false;
const JSCodeSpec& cs = js_CodeSpec[*cx->fp->regs->pc];

2
js/src/jstracer.h
View File

@ -204,7 +204,7 @@ class TraceRecorder {
bool native_get(nanojit::LIns* obj_ins, nanojit::LIns* pobj_ins, JSScopeProperty* sprop,
nanojit::LIns*& dslots_ins, nanojit::LIns*& v_ins);
bool prop(JSObject* obj, nanojit::LIns* obj_ins, jsval*& vp, nanojit::LIns*& v_ins);
bool prop(JSObject* obj, nanojit::LIns* obj_ins, uint32& slot, nanojit::LIns*& v_ins);
bool elem(jsval& l, jsval& r, jsval*& vp, nanojit::LIns*& v_ins);
bool getProp(JSObject* obj, nanojit::LIns* obj_ins);

25
js/src/trace-test.js
View File

@ -266,3 +266,28 @@ if (passes.length)
if (fails.length)
print("FAIL:", fails.join(","));
function testincops(n) {
var i = 0, o = {p:0}, a = [0];
for (i = 0; i < n; i++);
while (i-- > 0);
for (i = 0; i < n; ++i);
while (--i >= 0);
for (o.p = 0; o.p < n; o.p++);
while (o.p-- > 0);
for (o.p = 0; o.p < n; ++o.p);
while (--o.p >= 0);
return ++o.p;
/*
++i; // set to 0
for (a[i] = 0; a[i] < n; a[i]++);
while (a[i]-- > 0);
for (a[i] = 0; a[i] < n; ++a[i]);
while (--a[i] >= 0);
return ++a[i];
*/
}
test("testincops", testincops(100), 0);