зеркало из https://github.com/mozilla/pjs.git
Fixing bug 316879:
Special treatment of int values in numeric operations for faster and smaller code. r=brendan
This commit is contained in:
igor%mir2.org
Родитель
ae6b010cc6
Коммит
0d72563c7c
|
|
@ -208,6 +208,34 @@ static JSClass prop_iterator_class = {
|
|||
STORE_OPND(n, v_); \
|
||||
JS_END_MACRO
|
||||
|
||||
#define STORE_INT(cx, n, i) \
|
||||
JS_BEGIN_MACRO \
|
||||
jsval v_; \
|
||||
\
|
||||
if (INT_FITS_IN_JSVAL(i)) { \
|
||||
v_ = INT_TO_JSVAL(i); \
|
||||
} else { \
|
||||
ok = js_NewDoubleValue(cx, (jsdouble)(i), &v_); \
|
||||
if (!ok) \
|
||||
goto out; \
|
||||
} \
|
||||
STORE_OPND(n, v_); \
|
||||
JS_END_MACRO
|
||||
|
||||
#define STORE_UINT(cx, n, u) \
|
||||
JS_BEGIN_MACRO \
|
||||
jsval v_; \
|
||||
\
|
||||
if ((u) <= JSVAL_INT_MAX) { \
|
||||
v_ = INT_TO_JSVAL(u); \
|
||||
} else { \
|
||||
ok = js_NewDoubleValue(cx, (jsdouble)(u), &v_); \
|
||||
if (!ok) \
|
||||
goto out; \
|
||||
} \
|
||||
STORE_OPND(n, v_); \
|
||||
JS_END_MACRO
|
||||
|
||||
#define FETCH_NUMBER(cx, n, d) \
|
||||
JS_BEGIN_MACRO \
|
||||
jsval v_; \
|
||||
|
|
@ -2761,12 +2789,10 @@ interrupt:
|
|||
JS_BEGIN_MACRO \
|
||||
FETCH_INT(cx, -1, j); \
|
||||
FETCH_INT(cx, -2, i); \
|
||||
if (!ok) \
|
||||
goto out; \
|
||||
EXTRA_CODE \
|
||||
d = i OP j; \
|
||||
i = i OP j; \
|
||||
sp--; \
|
||||
STORE_NUMBER(cx, -1, d); \
|
||||
STORE_INT(cx, -1, i); \
|
||||
JS_END_MACRO
|
||||
|
||||
#define BITWISE_OP(OP) INTEGER_OP(OP, (void) 0;)
|
||||
|
|
@ -2993,10 +3019,9 @@ interrupt:
|
|||
|
||||
FETCH_INT(cx, -1, j);
|
||||
FETCH_UINT(cx, -2, u);
|
||||
j &= 31;
|
||||
d = u >> j;
|
||||
u >>= j & 31;
|
||||
sp--;
|
||||
STORE_NUMBER(cx, -1, d);
|
||||
STORE_UINT(cx, -1, u);
|
||||
}
|
||||
END_CASE(JSOP_URSH)
|
||||
|
||||
|
|
@ -3117,28 +3142,66 @@ interrupt:
|
|||
|
||||
BEGIN_CASE(JSOP_BITNOT)
|
||||
FETCH_INT(cx, -1, i);
|
||||
d = (jsdouble) ~i;
|
||||
STORE_NUMBER(cx, -1, d);
|
||||
i = ~i;
|
||||
STORE_INT(cx, -1, i);
|
||||
END_CASE(JSOP_BITNOT)
|
||||
|
||||
BEGIN_CASE(JSOP_NEG)
|
||||
FETCH_NUMBER(cx, -1, d);
|
||||
#ifdef HPUX
|
||||
/*
|
||||
* Negation of a zero doesn't produce a negative
|
||||
* zero on HPUX. Perform the operation by bit
|
||||
* twiddling.
|
||||
* Optimize the case of an int-tagged operand by noting that
|
||||
* INT_FITS_IN_JSVAL(i) => INT_FITS_IN_JSVAL(-i) unless i is 0
|
||||
* when -i is the negative zero which is jsdouble.
|
||||
*/
|
||||
JSDOUBLE_HI32(d) ^= JSDOUBLE_HI32_SIGNBIT;
|
||||
rval = FETCH_OPND(-1);
|
||||
if (JSVAL_IS_INT(rval) && (i = JSVAL_TO_INT(rval)) != 0) {
|
||||
i = -i;
|
||||
JS_ASSERT(INT_FITS_IN_JSVAL(i));
|
||||
rval = INT_TO_JSVAL(i);
|
||||
} else {
|
||||
if (JSVAL_IS_DOUBLE(rval)) {
|
||||
d = *JSVAL_TO_DOUBLE(rval);
|
||||
} else {
|
||||
SAVE_SP_AND_PC(fp);
|
||||
ok = js_ValueToNumber(cx, rval, &d);
|
||||
if (!ok)
|
||||
goto out;
|
||||
}
|
||||
if (JSDOUBLE_IS_NEGZERO(d)) {
|
||||
rval = INT_TO_JSVAL(0);
|
||||
} else {
|
||||
#ifdef HPUX
|
||||
/*
|
||||
* Negation of a zero doesn't produce a negative
|
||||
* zero on HPUX. Perform the operation by bit
|
||||
* twiddling.
|
||||
*/
|
||||
JSDOUBLE_HI32(d) ^= JSDOUBLE_HI32_SIGNBIT;
|
||||
#else
|
||||
d = -d;
|
||||
d = -d;
|
||||
#endif
|
||||
STORE_NUMBER(cx, -1, d);
|
||||
/* Here the negated number must not fit INT jsval. */
|
||||
JS_ASSERT(!JSDOUBLE_IS_INT(d, i) || !INT_FITS_IN_JSVAL(i));
|
||||
ok = js_NewDoubleValue(cx, d, &rval);
|
||||
if (!ok)
|
||||
goto out;
|
||||
}
|
||||
}
|
||||
STORE_OPND(-1, rval);
|
||||
END_CASE(JSOP_NEG)
|
||||
|
||||
BEGIN_CASE(JSOP_POS)
|
||||
FETCH_NUMBER(cx, -1, d);
|
||||
STORE_NUMBER(cx, -1, d);
|
||||
rval = FETCH_OPND(-1);
|
||||
if (!JSVAL_IS_NUMBER(rval)) {
|
||||
SAVE_SP_AND_PC(fp);
|
||||
ok = js_ValueToNumber(cx, rval, &d);
|
||||
if (!ok)
|
||||
goto out;
|
||||
ok = js_NewNumberValue(cx, d, &rval);
|
||||
if (!ok)
|
||||
goto out;
|
||||
sp[-1] = rval;
|
||||
}
|
||||
sp[-1-depth] = (jsval)pc;
|
||||
END_CASE(JSOP_POS)
|
||||
|
||||
BEGIN_CASE(JSOP_NEW)
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче