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

Trace GETGVAR and INCGVAR, though not yet correctly.

Browse Source
This commit is contained in:
shaver@mozilla.org 2008-07-06 16:59:59 -04:00
parent d30b7d1c8a
commit b28afaa80d
2 changed files with 51 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
js/src/jstracer.cpp
View File

@ -1199,6 +1199,20 @@ TraceRecorder::jsval_to_object(LIns* v_ins)
return lir->ins2(LIR_and, v_ins, lir->insImmPtr((void*)~JSVAL_TAGMASK)); return lir->ins2(LIR_and, v_ins, lir->insImmPtr((void*)~JSVAL_TAGMASK));
} }
bool
TraceRecorder::box_jsval(jsval v, LIns*& v_ins)
{
if (isInt(v))
v_ins = int32_to_jsval(v_ins);
else if (isDouble(v))
v_ins = double_to_jsval(v_ins);
else if (JSVAL_IS_BOOLEAN(v))
v_ins = boolean_to_jsval(v_ins);
else
return false; /* don't know how to box this type */
return true;
}
bool bool
TraceRecorder::unbox_jsval(jsval v, LIns*& v_ins) TraceRecorder::unbox_jsval(jsval v, LIns*& v_ins)
{ {
@ -1531,14 +1545,8 @@ bool TraceRecorder::JSOP_SETELEM()
/* ok, box the value we are storing, store it and we are done */ /* ok, box the value we are storing, store it and we are done */
LIns* v_ins = get(&v); LIns* v_ins = get(&v);
LIns* boxed_ins; LIns* boxed_ins;
if (isInt(v)) if (!box_jsval(v, boxed_ins))
boxed_ins = int32_to_jsval(v_ins); return false;
else if (isDouble(v))
boxed_ins = double_to_jsval(v_ins);
else if (JSVAL_IS_BOOLEAN(v))
boxed_ins = boolean_to_jsval(v_ins);
else
return false; /* don't know how to box this type */
lir->insStorei(boxed_ins, addr, 0); lir->insStorei(boxed_ins, addr, 0);
set(&l, v_ins); set(&l, v_ins);
return true; return true;
@ -1984,9 +1992,23 @@ bool TraceRecorder::JSOP_RETRVAL()
{ {
return false; return false;
} }
bool TraceRecorder::JSOP_GETGVAR() bool TraceRecorder::JSOP_GETGVAR()
{ {
jsval slotval = cx->fp->vars[GET_VARNO(cx->fp->regs->pc)];
if (JSVAL_IS_NULL(slotval))
return true; // We will see JSOP_NAME from the interpreter's jump, so no-op here.
uint32 slot = JSVAL_TO_INT(slotval);
LIns* varobj_ins = lir->insLoadi(lir->insLoadi(cx_ins, offsetof(JSContext, fp)),
offsetof(JSStackFrame, varobj));
LIns* dslots_ins = NULL;
LIns* v_ins = stobj_get_slot(varobj_ins, slot, dslots_ins);
if (!unbox_jsval(STOBJ_GET_SLOT(cx->fp->varobj, slot), v_ins))
return false; return false;
stack(0, v_ins);
return true;
} }
bool TraceRecorder::JSOP_SETGVAR() bool TraceRecorder::JSOP_SETGVAR()
{ {
@ -1994,7 +2016,25 @@ bool TraceRecorder::JSOP_SETGVAR()
} }
bool TraceRecorder::JSOP_INCGVAR() bool TraceRecorder::JSOP_INCGVAR()
{ {
jsval slotval = cx->fp->vars[GET_VARNO(cx->fp->regs->pc)];
if (JSVAL_IS_NULL(slotval))
return true; // We will see JSOP_INCNAME from the interpreter's jump, so no-op here.
uint32 slot = JSVAL_TO_INT(slotval);
LIns* varobj_ins = lir->insLoadi(lir->insLoadi(cx_ins, offsetof(JSContext, fp)),
offsetof(JSStackFrame, varobj));
LIns* dslots_ins = NULL;
LIns* v_ins = stobj_get_slot(varobj_ins, slot, dslots_ins);
jsval v = STOBJ_GET_SLOT(cx->fp->varobj, slot);
if (!unbox_jsval(v, v_ins))
return false; return false;
LIns* incr = lir->ins2i(LIR_add, v_ins, 1);
guard(false, lir->ins1(LIR_ov, incr));
if (!box_jsval(v, incr))
return false;
stobj_set_slot(varobj_ins, slot, dslots_ins, incr);
stack(0, incr);
return true;
} }
bool TraceRecorder::JSOP_DECGVAR() bool TraceRecorder::JSOP_DECGVAR()
{ {

1
js/src/jstracer.h
View File

@ -184,6 +184,7 @@ class TraceRecorder {
nanojit::LIns* jsval_to_boolean(nanojit::LIns* v_ins); nanojit::LIns* jsval_to_boolean(nanojit::LIns* v_ins);
nanojit::LIns* jsval_to_object(nanojit::LIns* v_ins); nanojit::LIns* jsval_to_object(nanojit::LIns* v_ins);
bool box_jsval(jsval v, nanojit::LIns*& v_ins);
bool unbox_jsval(jsval v, nanojit::LIns*& v_ins); bool unbox_jsval(jsval v, nanojit::LIns*& v_ins);
bool guardThatObjectIsDenseArray(JSObject* obj, bool guardThatObjectIsDenseArray(JSObject* obj,
nanojit::LIns* obj_ins, nanojit::LIns*& dslots_ins); nanojit::LIns* obj_ins, nanojit::LIns*& dslots_ins);