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:
Brendan Eich 2008-08-21 00:47:51 -07:00
commit 321ae383ba
3 changed files with 38 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
js/src/jsnum.cpp
View File

@ -557,7 +557,7 @@ static JSConstDoubleSpec number_constants[] = {
{0,0,0,{0,0,0}}
};
static jsdouble NaN;
jsdouble js_NaN;
#if (defined XP_WIN || defined XP_OS2) && \
!defined WINCE && \
@ -592,8 +592,8 @@ js_InitRuntimeNumberState(JSContext *cx)
u.s.hi = JSDOUBLE_HI32_EXPMASK | JSDOUBLE_HI32_MANTMASK;
u.s.lo = 0xffffffff;
number_constants[NC_NaN].dval = NaN = u.d;
rt->jsNaN = js_NewWeaklyRootedDouble(cx, NaN);
number_constants[NC_NaN].dval = js_NaN = u.d;
rt->jsNaN = js_NewWeaklyRootedDouble(cx, js_NaN);
if (!rt->jsNaN)
return JS_FALSE;

2
js/src/jsnum.h
View File

@ -143,6 +143,8 @@ typedef union jsdpun {
#define JSDOUBLE_COMPARE(LVAL, OP, RVAL, IFNAN) ((LVAL) OP (RVAL))
#endif
extern jsdouble js_NaN;
/* Initialize number constants and runtime state for the first context. */
extern JSBool
js_InitRuntimeNumberState(JSContext *cx);

51
js/src/jstracer.cpp
View File

@ -850,27 +850,32 @@ TraceRecorder::trackNativeStackUse(unsigned slots)
/* Unbox a jsval into a slot. Slots are wide enough to hold double values
directly (instead of storing a pointer to them). */
static bool
ValueToNative(jsval v, uint8 type, double* slot)
ValueToNative(JSContext* cx, jsval v, uint8 type, double* slot)
{
if (type == JSVAL_INT) {
unsigned tag = JSVAL_TAG(v);
switch (type) {
case JSVAL_INT:
jsint i;
if (JSVAL_IS_INT(v))
*(jsint*)slot = JSVAL_TO_INT(v);
else if (JSVAL_IS_DOUBLE(v) && JSDOUBLE_IS_INT(*JSVAL_TO_DOUBLE(v), i))
else if ((tag == JSVAL_DOUBLE) && JSDOUBLE_IS_INT(*JSVAL_TO_DOUBLE(v), i))
*(jsint*)slot = i;
else if (v == JSVAL_VOID)
*(jsint*)slot = 0;
else {
debug_only_v(printf("int != tag%lu(value=%lu) ", JSVAL_TAG(v), v);)
return false;
}
debug_only_v(printf("int<%d> ", *(jsint*)slot);)
return true;
}
if (type == JSVAL_DOUBLE) {
case JSVAL_DOUBLE:
jsdouble d;
if (JSVAL_IS_INT(v))
d = JSVAL_TO_INT(v);
else if (JSVAL_IS_DOUBLE(v))
else if (tag == JSVAL_DOUBLE)
d = *JSVAL_TO_DOUBLE(v);
else if (v == JSVAL_VOID)
d = js_NaN;
else {
debug_only_v(printf("double != tag%lu ", JSVAL_TAG(v));)
return false;
@ -878,29 +883,39 @@ ValueToNative(jsval v, uint8 type, double* slot)
*(jsdouble*)slot = d;
debug_only_v(printf("double<%g> ", d);)
return true;
}
if (JSVAL_TAG(v) != type) {
debug_only_v(printf("%d != tag%lu ", type, JSVAL_TAG(v));)
return false;
}
switch (JSVAL_TAG(v)) {
case JSVAL_BOOLEAN:
if (tag != JSVAL_BOOLEAN) {
debug_only_v(printf("bool != tag%u ", tag);)
return false;
}
*(JSBool*)slot = JSVAL_TO_BOOLEAN(v);
debug_only_v(printf("boolean<%d> ", *(bool*)slot);)
break;
return true;
case JSVAL_STRING:
if (v == JSVAL_VOID) {
*(JSString**)slot = ATOM_TO_STRING(cx->runtime->atomState.typeAtoms[JSTYPE_VOID]);
return true;
}
if (tag != JSVAL_STRING) {
debug_only_v(printf("string != tag%u ", tag);)
return false;
}
*(JSString**)slot = JSVAL_TO_STRING(v);
debug_only_v(printf("string<%p> ", *(JSString**)slot);)
break;
return true;
default:
JS_ASSERT(JSVAL_IS_OBJECT(v));
JS_ASSERT(type == JSVAL_OBJECT);
if (tag != JSVAL_OBJECT) {
debug_only_v(printf("object != tag%u ", tag);)
return false;
}
*(JSObject**)slot = JSVAL_TO_OBJECT(v);
debug_only_v(printf("object<%p:%s> ", JSVAL_TO_OBJECT(v),
JSVAL_IS_NULL(v)
? "null"
: STOBJ_GET_CLASS(JSVAL_TO_OBJECT(v))->name);)
return true;
}
return true;
}
/* Box a value from the native stack back into the jsval format. Integers
@ -958,7 +973,7 @@ BuildNativeGlobalFrame(JSContext* cx, unsigned ngslots, uint16* gslots, uint8* m
{
debug_only_v(printf("global: ");)
FORALL_GLOBAL_SLOTS(cx, ngslots, gslots,
if (!ValueToNative(*vp, *mp, np + gslots[n]))
if (!ValueToNative(cx, *vp, *mp, np + gslots[n]))
return false;
++mp;
);
@ -974,7 +989,7 @@ BuildNativeStackFrame(JSContext* cx, unsigned callDepth, uint8* mp, double* np)
debug_only_v(printf("stack: ");)
FORALL_SLOTS_IN_PENDING_FRAMES(cx, callDepth,
debug_only_v(printf("%s%u=", vpname, vpnum);)
if (!ValueToNative(*vp, *mp, np))
if (!ValueToNative(cx, *vp, *mp, np))
return false;
++mp; ++np;
);