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

Merge.

Browse Source
This commit is contained in:
David Anderson 2008-10-06 16:48:14 -07:00
commit 26d5db2cc5
1 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
js/src/jstracer.cpp
View File

@ -77,6 +77,13 @@
#undef JSVAL_IS_BOOLEAN
#define JSVAL_IS_BOOLEAN(x) JS_STATIC_ASSERT(0)
/* Use a fake tag to represent boxed values, borrowing from the integer tag
range since we only use JSVAL_INT to indicate integers. */
#define JSVAL_BOXED 3
/* Map to translate a type tag into a printable representation. */
static const char typeChar[] = "OIDVS?B?";
/* Number of iterations of a loop where we start tracing. That is, we don't
start tracing until the beginning of the HOTLOOP-th iteration. */
#define HOTLOOP 2
@ -821,6 +828,7 @@ TypeMap::captureGlobalTypes(JSContext* cx, SlotList& slots)
uint8 type = getCoercedType(*vp);
if ((type == JSVAL_INT) && oracle.isGlobalSlotUndemotable(cx->fp->script, gslots[n]))
type = JSVAL_DOUBLE;
JS_ASSERT(type != JSVAL_BOXED);
*m++ = type;
);
}
@ -840,6 +848,12 @@ TypeMap::captureStackTypes(JSContext* cx, unsigned callDepth)
}
*m++ = type;
);
/* If we are capturing the stack state on a JSOP_RESUME instruction, the value on top of
the stack is a boxed value. */
if (*cx->fp->regs->pc == JSOP_RESUME) {
JS_ASSERT(m > map);
m[-1] = JSVAL_BOXED;
}
}
/* Compare this type map to another one and see whether they match. */
@ -1136,6 +1150,7 @@ ValueToNative(JSContext* cx, jsval v, uint8 type, double* slot)
debug_only_v(printf("string<%p> ", *(JSString**)slot);)
return true;
default:
/* Note: we should never see JSVAL_BOXED in an entry type map. */
JS_ASSERT(type == JSVAL_OBJECT);
if (v == JSVAL_VOID) {
*(JSObject**)slot = NULL;
@ -1248,6 +1263,10 @@ NativeToValue(JSContext* cx, jsval& v, uint8 type, double* slot)
v = STRING_TO_JSVAL(*(JSString**)slot);
debug_only_v(printf("string<%p> ", *(JSString**)slot);)
break;
case JSVAL_BOXED:
v = *(jsval*)slot;
debug_only_v(printf("box<%lx> ", v));
break;
default:
JS_ASSERT(type == JSVAL_OBJECT);
v = OBJECT_TO_JSVAL(*(JSObject**)slot);
@ -1379,7 +1398,7 @@ TraceRecorder::import(LIns* base, ptrdiff_t offset, jsval* p, uint8& t,
ins = lir->insLoadi(base, offset);
ins = lir->ins1(LIR_i2f, ins);
} else {
JS_ASSERT(isNumber(*p) == (t == JSVAL_DOUBLE));
JS_ASSERT(t == JSVAL_BOXED || isNumber(*p) == (t == JSVAL_DOUBLE));
if (t == JSVAL_DOUBLE) {
ins = lir->insLoad(LIR_ldq, base, offset);
} else if (t == JSVAL_BOOLEAN) {
@ -1758,8 +1777,8 @@ TraceRecorder::checkType(jsval& v, uint8 t, bool& unstable)
/* for non-number types we expect a precise match of the type */
#ifdef DEBUG
if (JSVAL_TAG(v) != t) {
debug_only_v(printf("Type mismatch: val %c, map %c ", "OID?S?B"[JSVAL_TAG(v)],
"OID?S?B"[t]););
debug_only_v(printf("Type mismatch: val %c, map %c ", typeChar[JSVAL_TAG(v)],
typeChar[t]););
}
#endif
return JSVAL_TAG(v) == t;