mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Pass JSContext* to all primitives (needed by the recorder.)
This commit is contained in:
Andreas Gal
parent
fef28e9f56
commit
73698e5e72
@ -2297,75 +2297,75 @@ js_DumpOpMeters()
|
||||
#endif
|
||||
|
||||
static inline void
|
||||
push_stack_constant(JSFrameRegs& regs, jsval c)
|
||||
push_stack_constant(JSContext* cx, JSFrameRegs& regs, jsval c)
|
||||
{
|
||||
jsval v;
|
||||
prim_generate_constant(c, v);
|
||||
prim_push_stack(regs, v);
|
||||
prim_generate_constant(cx, c, v);
|
||||
prim_push_stack(cx, regs, v);
|
||||
}
|
||||
|
||||
static inline void
|
||||
push_stack_boolean(JSFrameRegs& regs, JSBool& b)
|
||||
push_stack_boolean(JSContext* cx, JSFrameRegs& regs, JSBool& b)
|
||||
{
|
||||
jsval v;
|
||||
prim_boolean_to_jsval(b, v);
|
||||
prim_push_stack(regs, v);
|
||||
prim_boolean_to_jsval(cx, b, v);
|
||||
prim_push_stack(cx, regs, v);
|
||||
}
|
||||
|
||||
static inline void
|
||||
push_stack_object(JSFrameRegs& regs, JSObject*& obj)
|
||||
push_stack_object(JSContext* cx, JSFrameRegs& regs, JSObject*& obj)
|
||||
{
|
||||
jsval v;
|
||||
prim_object_to_jsval(obj, v);
|
||||
prim_push_stack(regs, v);
|
||||
prim_object_to_jsval(cx, obj, v);
|
||||
prim_push_stack(cx, regs, v);
|
||||
}
|
||||
|
||||
static inline void
|
||||
push_stack_id(JSFrameRegs& regs, jsid& id)
|
||||
push_stack_id(JSContext* cx, JSFrameRegs& regs, jsid& id)
|
||||
{
|
||||
jsval v;
|
||||
prim_id_to_jsval(id, v);
|
||||
prim_push_stack(regs, v);
|
||||
prim_id_to_jsval(cx, id, v);
|
||||
prim_push_stack(cx, regs, v);
|
||||
}
|
||||
|
||||
static inline void
|
||||
store_stack_constant(JSFrameRegs& regs, int n, jsval c)
|
||||
store_stack_constant(JSContext* cx, JSFrameRegs& regs, int n, jsval c)
|
||||
{
|
||||
jsval v;
|
||||
prim_generate_constant(c, v);
|
||||
prim_store_stack(regs, n, v);
|
||||
prim_generate_constant(cx, c, v);
|
||||
prim_store_stack(cx, regs, n, v);
|
||||
}
|
||||
|
||||
static inline void
|
||||
store_stack_boolean(JSFrameRegs& regs, int n, JSBool& b)
|
||||
store_stack_boolean(JSContext* cx, JSFrameRegs& regs, int n, JSBool& b)
|
||||
{
|
||||
jsval v;
|
||||
prim_boolean_to_jsval(b, v);
|
||||
prim_store_stack(regs, n, v);
|
||||
prim_boolean_to_jsval(cx, b, v);
|
||||
prim_store_stack(cx, regs, n, v);
|
||||
}
|
||||
|
||||
static inline void
|
||||
store_stack_string(JSFrameRegs& regs, int n, JSString*& str)
|
||||
store_stack_string(JSContext* cx, JSFrameRegs& regs, int n, JSString*& str)
|
||||
{
|
||||
jsval v;
|
||||
prim_string_to_jsval(str, v);
|
||||
prim_store_stack(regs, n, v);
|
||||
prim_string_to_jsval(cx, str, v);
|
||||
prim_store_stack(cx, regs, n, v);
|
||||
}
|
||||
|
||||
static inline void
|
||||
store_stack_object(JSFrameRegs& regs, int n, JSObject*& obj)
|
||||
store_stack_object(JSContext* cx, JSFrameRegs& regs, int n, JSObject*& obj)
|
||||
{
|
||||
jsval v;
|
||||
prim_object_to_jsval(obj, v);
|
||||
prim_store_stack(regs, n, v);
|
||||
prim_object_to_jsval(cx, obj, v);
|
||||
prim_store_stack(cx, regs, n, v);
|
||||
}
|
||||
|
||||
static inline bool
|
||||
store_number(JSContext* cx, JSFrameRegs& regs, int n, jsdouble& d)
|
||||
{
|
||||
jsint i;
|
||||
if (guard_jsdouble_is_int_and_int_fits_in_jsval(d, i))
|
||||
prim_int_to_jsval(i, regs.sp[n]);
|
||||
if (guard_jsdouble_is_int_and_int_fits_in_jsval(cx, d, i))
|
||||
prim_int_to_jsval(cx, i, regs.sp[n]);
|
||||
else if (!call_NewDoubleInRootedValue(cx, d, ®s.sp[n]))
|
||||
return JS_FALSE;
|
||||
return JS_TRUE;
|
||||
@ -2374,11 +2374,11 @@ store_number(JSContext* cx, JSFrameRegs& regs, int n, jsdouble& d)
|
||||
static inline bool
|
||||
store_int(JSContext* cx, JSFrameRegs& regs, int n, jsint& i)
|
||||
{
|
||||
if (guard_int_fits_in_jsval(i)) {
|
||||
prim_int_to_jsval(i, regs.sp[n]);
|
||||
if (guard_int_fits_in_jsval(cx, i)) {
|
||||
prim_int_to_jsval(cx, i, regs.sp[n]);
|
||||
} else {
|
||||
jsdouble d;
|
||||
prim_int_to_double(i, d);
|
||||
prim_int_to_double(cx, i, d);
|
||||
if (!call_NewDoubleInRootedValue(cx, d, ®s.sp[n]))
|
||||
return JS_FALSE;
|
||||
}
|
||||
@ -2388,11 +2388,11 @@ store_int(JSContext* cx, JSFrameRegs& regs, int n, jsint& i)
|
||||
static bool
|
||||
store_uint(JSContext* cx, JSFrameRegs& regs, int n, uint32& u)
|
||||
{
|
||||
if (guard_uint_fits_in_jsval(u)) {
|
||||
prim_uint_to_jsval(u, regs.sp[n]);
|
||||
if (guard_uint_fits_in_jsval(cx, u)) {
|
||||
prim_uint_to_jsval(cx, u, regs.sp[n]);
|
||||
} else {
|
||||
jsdouble d;
|
||||
prim_uint_to_double(u, d);
|
||||
prim_uint_to_double(cx, u, d);
|
||||
if (!call_NewDoubleInRootedValue(cx, d, ®s.sp[n]))
|
||||
return JS_FALSE;
|
||||
}
|
||||
@ -2408,15 +2408,15 @@ value_to_number(JSContext* cx, JSFrameRegs& regs, int n, jsval& v,
|
||||
jsdouble& d)
|
||||
{
|
||||
JS_ASSERT(v == regs.sp[n]);
|
||||
if (guard_jsval_is_int(v)) {
|
||||
if (guard_jsval_is_int(cx, v)) {
|
||||
int i;
|
||||
prim_jsval_to_int(v, i);
|
||||
prim_int_to_double(i, d);
|
||||
} else if (guard_jsval_is_double(v)) {
|
||||
prim_jsval_to_double(v, d);
|
||||
prim_jsval_to_int(cx, v, i);
|
||||
prim_int_to_double(cx, i, d);
|
||||
} else if (guard_jsval_is_double(cx, v)) {
|
||||
prim_jsval_to_double(cx, v, d);
|
||||
} else {
|
||||
call_ValueToNumber(cx, ®s.sp[n], d);
|
||||
if (guard_jsval_is_null(regs.sp[n]))
|
||||
if (guard_jsval_is_null(cx, regs.sp[n]))
|
||||
return JS_FALSE;
|
||||
JS_ASSERT(JSVAL_IS_NUMBER(regs.sp[n]) || (regs.sp[n] == JSVAL_TRUE));
|
||||
}
|
||||
@ -2428,7 +2428,7 @@ fetch_number(JSContext* cx, JSFrameRegs& regs, int n, jsdouble& d)
|
||||
{
|
||||
jsval v;
|
||||
|
||||
prim_fetch_stack(regs, n, v);
|
||||
prim_fetch_stack(cx, regs, n, v);
|
||||
return value_to_number(cx, regs, n, v, d);
|
||||
}
|
||||
|
||||
@ -2437,12 +2437,12 @@ fetch_int(JSContext* cx, JSFrameRegs& regs, int n, jsint& i)
|
||||
{
|
||||
jsval v;
|
||||
|
||||
prim_fetch_stack(regs, n, v);
|
||||
if (guard_jsval_is_int(v)) {
|
||||
prim_jsval_to_int(v, i);
|
||||
prim_fetch_stack(cx, regs, n, v);
|
||||
if (guard_jsval_is_int(cx, v)) {
|
||||
prim_jsval_to_int(cx, v, i);
|
||||
} else {
|
||||
call_ValueToECMAInt32(cx, ®s.sp[n], i);
|
||||
if (guard_jsval_is_null(regs.sp[n]))
|
||||
if (guard_jsval_is_null(cx, regs.sp[n]))
|
||||
return JS_FALSE;
|
||||
}
|
||||
return JS_TRUE;
|
||||
@ -2453,14 +2453,14 @@ fetch_uint(JSContext* cx, JSFrameRegs& regs, int n, uint32& u)
|
||||
{
|
||||
jsval v;
|
||||
|
||||
prim_fetch_stack(regs, n, v);
|
||||
if (guard_jsval_is_int(v)) {
|
||||
prim_fetch_stack(cx, regs, n, v);
|
||||
if (guard_jsval_is_int(cx, v)) {
|
||||
int i;
|
||||
prim_jsval_to_int(v, i);
|
||||
prim_int_to_uint(i, u);
|
||||
prim_jsval_to_int(cx, v, i);
|
||||
prim_int_to_uint(cx, i, u);
|
||||
} else {
|
||||
call_ValueToECMAUint32(cx, ®s.sp[n], u);
|
||||
if (guard_jsval_is_null(regs.sp[n]))
|
||||
if (guard_jsval_is_null(cx, regs.sp[n]))
|
||||
return JS_FALSE;
|
||||
}
|
||||
return JS_TRUE;
|
||||
@ -2469,30 +2469,30 @@ fetch_uint(JSContext* cx, JSFrameRegs& regs, int n, uint32& u)
|
||||
static inline void
|
||||
pop_boolean(JSContext* cx, JSFrameRegs& regs, jsval& v, JSBool& b)
|
||||
{
|
||||
prim_fetch_stack(regs, -1, v);
|
||||
if (guard_jsval_is_null(v)) {
|
||||
prim_generate_boolean_constant(JS_FALSE, b);
|
||||
} else if (guard_jsval_is_boolean(v)) {
|
||||
prim_jsval_to_boolean(v, b);
|
||||
prim_fetch_stack(cx, regs, -1, v);
|
||||
if (guard_jsval_is_null(cx, v)) {
|
||||
prim_generate_boolean_constant(cx, JS_FALSE, b);
|
||||
} else if (guard_jsval_is_boolean(cx, v)) {
|
||||
prim_jsval_to_boolean(cx, v, b);
|
||||
} else {
|
||||
call_ValueToBoolean(v, b);
|
||||
call_ValueToBoolean(cx, v, b);
|
||||
}
|
||||
prim_adjust_stack(regs, -1);
|
||||
prim_adjust_stack(cx, regs, -1);
|
||||
}
|
||||
|
||||
static inline bool
|
||||
value_to_object(JSContext* cx, JSFrameRegs& regs, int n, jsval& v,
|
||||
JSObject*& obj)
|
||||
{
|
||||
if (!guard_jsval_is_primitive(v)) {
|
||||
prim_jsval_to_object(v, obj);
|
||||
if (!guard_jsval_is_primitive(cx, v)) {
|
||||
prim_jsval_to_object(cx, v, obj);
|
||||
} else {
|
||||
call_ValueToNonNullObject(cx, v, obj);
|
||||
if (guard_obj_is_null(obj))
|
||||
if (guard_obj_is_null(cx, obj))
|
||||
return JS_FALSE;
|
||||
jsval x;
|
||||
prim_object_to_jsval(obj, x);
|
||||
prim_store_stack(regs, n, x);
|
||||
prim_object_to_jsval(cx, obj, x);
|
||||
prim_store_stack(cx, regs, n, x);
|
||||
}
|
||||
return JS_TRUE;
|
||||
}
|
||||
@ -2501,7 +2501,7 @@ static inline bool
|
||||
fetch_object(JSContext* cx, JSFrameRegs& regs, int n, jsval& v,
|
||||
JSObject*& obj)
|
||||
{
|
||||
prim_fetch_stack(regs, n, v);
|
||||
prim_fetch_stack(cx, regs, n, v);
|
||||
return value_to_object(cx, regs, n, v, obj);
|
||||
}
|
||||
|
||||
@ -2512,27 +2512,27 @@ default_value(JSContext* cx, JSFrameRegs& regs, int n, JSType hint,
|
||||
JS_ASSERT(!JSVAL_IS_PRIMITIVE(v));
|
||||
JS_ASSERT(v == regs.sp[n]);
|
||||
JSObject* obj;
|
||||
prim_jsval_to_object(v, obj);
|
||||
prim_jsval_to_object(cx, v, obj);
|
||||
if (!call_obj_default_value(cx, obj, hint, ®s.sp[n]))
|
||||
return JS_FALSE;
|
||||
prim_fetch_stack(regs, n, v);
|
||||
prim_fetch_stack(cx, regs, n, v);
|
||||
return JS_TRUE;
|
||||
}
|
||||
|
||||
#define PUSH_STACK(v) prim_push_stack(regs, (v))
|
||||
#define POP_STACK(v) prim_pop_stack(regs, (v))
|
||||
#define STORE_STACK(n,v) prim_store_stack(regs, (n), (v))
|
||||
#define FETCH_STACK(n,v) prim_fetch_stack(regs, (n), (v))
|
||||
#define ADJUST_STACK(n) prim_adjust_stack(regs, (n))
|
||||
#define PUSH_STACK(v) prim_push_stack(cx, regs, (v))
|
||||
#define POP_STACK(v) prim_pop_stack(cx, regs, (v))
|
||||
#define STORE_STACK(n,v) prim_store_stack(cx, regs, (n), (v))
|
||||
#define FETCH_STACK(n,v) prim_fetch_stack(cx, regs, (n), (v))
|
||||
#define ADJUST_STACK(n) prim_adjust_stack(cx, regs, (n))
|
||||
|
||||
#define PUSH_STACK_CONSTANT(c) push_stack_constant(regs, (c))
|
||||
#define PUSH_STACK_BOOLEAN(b) push_stack_boolean(regs, (b))
|
||||
#define PUSH_STACK_OBJECT(obj) push_stack_object(regs, (obj))
|
||||
#define PUSH_STACK_ID(id) push_stack_id(regs, (id))
|
||||
#define STORE_STACK_CONSTANT(n, c) store_stack_constant(regs, (n), (c))
|
||||
#define STORE_STACK_BOOLEAN(n, b) store_stack_boolean(regs, (n), (b))
|
||||
#define STORE_STACK_STRING(n, str) store_stack_string(regs, (n), (str))
|
||||
#define STORE_STACK_OBJECT(n, obj) store_stack_object(regs, (n), (obj))
|
||||
#define PUSH_STACK_CONSTANT(c) push_stack_constant(cx, regs, (c))
|
||||
#define PUSH_STACK_BOOLEAN(b) push_stack_boolean(cx, regs, (b))
|
||||
#define PUSH_STACK_OBJECT(obj) push_stack_object(cx, regs, (obj))
|
||||
#define PUSH_STACK_ID(id) push_stack_id(cx, regs, (id))
|
||||
#define STORE_STACK_CONSTANT(n, c) store_stack_constant(cx, regs, (n), (c))
|
||||
#define STORE_STACK_BOOLEAN(n, b) store_stack_boolean(cx, regs, (n), (b))
|
||||
#define STORE_STACK_STRING(n, str) store_stack_string(cx, regs, (n), (str))
|
||||
#define STORE_STACK_OBJECT(n, obj) store_stack_object(cx, regs, (n), (obj))
|
||||
|
||||
/*
|
||||
* Push the double d using regs from the lexical environment. Try to convert d
|
||||
@ -3252,7 +3252,7 @@ JS_INTERPRET(JSContext *cx, JSInterpreterState *state)
|
||||
|
||||
TRACE_CASE(JSOP_IFEQ)
|
||||
POP_BOOLEAN(cx, rval, cond);
|
||||
if (!guard_boolean_is_true(cond)) {
|
||||
if (!guard_boolean_is_true(cx, cond)) {
|
||||
len = GET_JUMP_OFFSET(regs.pc);
|
||||
BRANCH(len);
|
||||
}
|
||||
@ -3260,7 +3260,7 @@ JS_INTERPRET(JSContext *cx, JSInterpreterState *state)
|
||||
|
||||
TRACE_CASE(JSOP_IFNE)
|
||||
POP_BOOLEAN(cx, rval, cond);
|
||||
if (guard_boolean_is_true(cond)) {
|
||||
if (guard_boolean_is_true(cx, cond)) {
|
||||
len = GET_JUMP_OFFSET(regs.pc);
|
||||
BRANCH(len);
|
||||
}
|
||||
@ -3268,7 +3268,7 @@ JS_INTERPRET(JSContext *cx, JSInterpreterState *state)
|
||||
|
||||
TRACE_CASE(JSOP_OR)
|
||||
POP_BOOLEAN(cx, rval, cond);
|
||||
if (guard_boolean_is_true(cond)) {
|
||||
if (guard_boolean_is_true(cx, cond)) {
|
||||
len = GET_JUMP_OFFSET(regs.pc);
|
||||
PUSH_STACK(rval);
|
||||
DO_NEXT_OP(len);
|
||||
@ -3277,7 +3277,7 @@ JS_INTERPRET(JSContext *cx, JSInterpreterState *state)
|
||||
|
||||
TRACE_CASE(JSOP_AND)
|
||||
POP_BOOLEAN(cx, rval, cond);
|
||||
if (!guard_boolean_is_true(cond)) {
|
||||
if (!guard_boolean_is_true(cx, cond)) {
|
||||
len = GET_JUMP_OFFSET(regs.pc);
|
||||
PUSH_STACK(rval);
|
||||
DO_NEXT_OP(len);
|
||||
@ -3293,7 +3293,7 @@ JS_INTERPRET(JSContext *cx, JSInterpreterState *state)
|
||||
|
||||
TRACE_CASE(JSOP_IFEQX)
|
||||
POP_BOOLEAN(cx, rval, cond);
|
||||
if (!guard_boolean_is_true(cond)) {
|
||||
if (!guard_boolean_is_true(cx, cond)) {
|
||||
len = GET_JUMPX_OFFSET(regs.pc);
|
||||
BRANCH(len);
|
||||
}
|
||||
@ -3301,7 +3301,7 @@ JS_INTERPRET(JSContext *cx, JSInterpreterState *state)
|
||||
|
||||
TRACE_CASE(JSOP_IFNEX)
|
||||
POP_BOOLEAN(cx, rval, cond);
|
||||
if (guard_boolean_is_true(cond)) {
|
||||
if (guard_boolean_is_true(cx, cond)) {
|
||||
len = GET_JUMPX_OFFSET(regs.pc);
|
||||
BRANCH(len);
|
||||
}
|
||||
@ -3309,7 +3309,7 @@ JS_INTERPRET(JSContext *cx, JSInterpreterState *state)
|
||||
|
||||
TRACE_CASE(JSOP_ORX)
|
||||
POP_BOOLEAN(cx, rval, cond);
|
||||
if (guard_boolean_is_true(cond)) {
|
||||
if (guard_boolean_is_true(cx, cond)) {
|
||||
len = GET_JUMPX_OFFSET(regs.pc);
|
||||
PUSH_STACK(rval);
|
||||
DO_NEXT_OP(len);
|
||||
@ -3318,7 +3318,7 @@ JS_INTERPRET(JSContext *cx, JSInterpreterState *state)
|
||||
|
||||
TRACE_CASE(JSOP_ANDX)
|
||||
POP_BOOLEAN(cx, rval, cond);
|
||||
if (!guard_boolean_is_true(cond)) {
|
||||
if (!guard_boolean_is_true(cx, cond)) {
|
||||
len = GET_JUMPX_OFFSET(regs.pc);
|
||||
PUSH_STACK(rval);
|
||||
DO_NEXT_OP(len);
|
||||
@ -3685,7 +3685,7 @@ JS_INTERPRET(JSContext *cx, JSInterpreterState *state)
|
||||
JS_BEGIN_MACRO \
|
||||
FETCH_INT(cx, -2, i); \
|
||||
FETCH_INT(cx, -1, j); \
|
||||
prim_##OP(i, j, i); \
|
||||
prim_##OP(cx, i, j, i); \
|
||||
ADJUST_STACK(-1); \
|
||||
STORE_INT(cx, -1, i); \
|
||||
JS_END_MACRO
|
||||
@ -3707,25 +3707,25 @@ JS_INTERPRET(JSContext *cx, JSInterpreterState *state)
|
||||
FETCH_STACK(-1, rval); \
|
||||
FETCH_STACK(-2, lval); \
|
||||
/* Optimize for two int-tagged operands (typical loop control). */ \
|
||||
if (guard_both_jsvals_are_int(lval, rval)) { \
|
||||
prim_jsval_to_int(lval, i); \
|
||||
prim_jsval_to_int(rval, j); \
|
||||
prim_icmp_##OP(i, j, cond); \
|
||||
if (guard_both_jsvals_are_int(cx, lval, rval)) { \
|
||||
prim_jsval_to_int(cx, lval, i); \
|
||||
prim_jsval_to_int(cx, rval, j); \
|
||||
prim_icmp_##OP(cx, i, j, cond); \
|
||||
} else { \
|
||||
if (!guard_jsval_is_primitive(lval)) \
|
||||
if (!guard_jsval_is_primitive(cx, lval)) \
|
||||
DEFAULT_VALUE(cx, -2, JSTYPE_NUMBER, lval); \
|
||||
if (!guard_jsval_is_primitive(rval)) \
|
||||
if (!guard_jsval_is_primitive(cx, rval)) \
|
||||
DEFAULT_VALUE(cx, -1, JSTYPE_NUMBER, rval); \
|
||||
if (guard_both_jsvals_are_string(lval, rval)) { \
|
||||
prim_jsval_to_string(lval, str); \
|
||||
prim_jsval_to_string(rval, str2); \
|
||||
call_CompareStrings(str, str2, i); \
|
||||
prim_generate_int_constant(0, j); \
|
||||
prim_icmp_##OP(i, j, cond); \
|
||||
if (guard_both_jsvals_are_string(cx, lval, rval)) { \
|
||||
prim_jsval_to_string(cx, lval, str); \
|
||||
prim_jsval_to_string(cx, rval, str2); \
|
||||
call_CompareStrings(cx, str, str2, i); \
|
||||
prim_generate_int_constant(cx, 0, j); \
|
||||
prim_icmp_##OP(cx, i, j, cond); \
|
||||
} else { \
|
||||
VALUE_TO_NUMBER(cx, -2, lval, d); \
|
||||
VALUE_TO_NUMBER(cx, -1, rval, d2); \
|
||||
prim_dcmp_##OP(JS_FALSE, d, d2, cond); \
|
||||
prim_dcmp_##OP(cx, JS_FALSE, d, d2, cond); \
|
||||
} \
|
||||
} \
|
||||
ADJUST_STACK(-1); \
|
||||
@ -3888,7 +3888,7 @@ JS_INTERPRET(JSContext *cx, JSInterpreterState *state)
|
||||
JS_BEGIN_MACRO \
|
||||
FETCH_INT(cx, -2, i); \
|
||||
FETCH_INT(cx, -1, j); \
|
||||
prim_##OP(i, j, i); \
|
||||
prim_##OP(cx, i, j, i); \
|
||||
ADJUST_STACK(-1); \
|
||||
STORE_INT(cx, -1, i); \
|
||||
JS_END_MACRO
|
||||
@ -3907,7 +3907,7 @@ JS_INTERPRET(JSContext *cx, JSInterpreterState *state)
|
||||
|
||||
FETCH_UINT(cx, -2, u);
|
||||
FETCH_INT(cx, -1, j);
|
||||
prim_ursh(u, j, u);
|
||||
prim_ursh(cx, u, j, u);
|
||||
ADJUST_STACK(-1);
|
||||
STORE_UINT(cx, -1, u);
|
||||
}
|
||||
@ -3959,7 +3959,7 @@ JS_INTERPRET(JSContext *cx, JSInterpreterState *state)
|
||||
} else {
|
||||
VALUE_TO_NUMBER(cx, -2, lval, d);
|
||||
VALUE_TO_NUMBER(cx, -1, rval, d2);
|
||||
prim_dadd(d, d2, d);
|
||||
prim_dadd(cx, d, d2, d);
|
||||
ADJUST_STACK(-1);
|
||||
STORE_NUMBER(cx, -1, d);
|
||||
}
|
||||
@ -3970,7 +3970,7 @@ JS_INTERPRET(JSContext *cx, JSInterpreterState *state)
|
||||
JS_BEGIN_MACRO \
|
||||
FETCH_NUMBER(cx, -2, d); \
|
||||
FETCH_NUMBER(cx, -1, d2); \
|
||||
prim_##OP(d, d2, d); \
|
||||
prim_##OP(cx, d, d2, d); \
|
||||
ADJUST_STACK(-1); \
|
||||
STORE_NUMBER(cx, -1, d); \
|
||||
JS_END_MACRO
|
||||
|
||||
@ -45,73 +45,73 @@
|
||||
#endif
|
||||
|
||||
static inline void
|
||||
PRIMITIVE(prim_push_stack)(JSFrameRegs& regs, jsval& v)
|
||||
PRIMITIVE(prim_push_stack)(JSContext* cx, JSFrameRegs& regs, jsval& v)
|
||||
{
|
||||
*regs.sp++ = v;
|
||||
}
|
||||
|
||||
static inline void
|
||||
PRIMITIVE(prim_pop_stack)(JSFrameRegs& regs, jsval& v)
|
||||
PRIMITIVE(prim_pop_stack)(JSContext* cx, JSFrameRegs& regs, jsval& v)
|
||||
{
|
||||
v = *--regs.sp;
|
||||
}
|
||||
|
||||
static inline void
|
||||
PRIMITIVE(prim_store_stack)(JSFrameRegs& regs, int n, jsval& v)
|
||||
PRIMITIVE(prim_store_stack)(JSContext* cx, JSFrameRegs& regs, int n, jsval& v)
|
||||
{
|
||||
regs.sp[n] = v;
|
||||
}
|
||||
|
||||
static inline void
|
||||
PRIMITIVE(prim_fetch_stack)(JSFrameRegs& regs, int n, jsval& v)
|
||||
PRIMITIVE(prim_fetch_stack)(JSContext* cx, JSFrameRegs& regs, int n, jsval& v)
|
||||
{
|
||||
v = regs.sp[n];
|
||||
}
|
||||
|
||||
static inline void
|
||||
PRIMITIVE(prim_adjust_stack)(JSFrameRegs& regs, int n)
|
||||
PRIMITIVE(prim_adjust_stack)(JSContext* cx, JSFrameRegs& regs, int n)
|
||||
{
|
||||
regs.sp += n;
|
||||
}
|
||||
|
||||
static inline void
|
||||
PRIMITIVE(prim_generate_constant)(jsval c, jsval& v)
|
||||
PRIMITIVE(prim_generate_constant)(JSContext* cx, jsval c, jsval& v)
|
||||
{
|
||||
v = c;
|
||||
}
|
||||
|
||||
static inline void
|
||||
PRIMITIVE(prim_boolean_to_jsval)(JSBool& b, jsval& v)
|
||||
PRIMITIVE(prim_boolean_to_jsval)(JSContext* cx, JSBool& b, jsval& v)
|
||||
{
|
||||
v = BOOLEAN_TO_JSVAL(b);
|
||||
}
|
||||
|
||||
static inline void
|
||||
PRIMITIVE(prim_string_to_jsval)(JSString*& str, jsval& v)
|
||||
PRIMITIVE(prim_string_to_jsval)(JSContext* cx, JSString*& str, jsval& v)
|
||||
{
|
||||
v = STRING_TO_JSVAL(str);
|
||||
}
|
||||
|
||||
static inline void
|
||||
PRIMITIVE(prim_object_to_jsval)(JSObject*& obj, jsval& v)
|
||||
PRIMITIVE(prim_object_to_jsval)(JSContext* cx, JSObject*& obj, jsval& v)
|
||||
{
|
||||
v = OBJECT_TO_JSVAL(obj);
|
||||
}
|
||||
|
||||
static inline void
|
||||
PRIMITIVE(prim_id_to_jsval)(jsid& id, jsval& v)
|
||||
PRIMITIVE(prim_id_to_jsval)(JSContext* cx, jsid& id, jsval& v)
|
||||
{
|
||||
v = ID_TO_VALUE(id);
|
||||
}
|
||||
|
||||
static inline bool
|
||||
PRIMITIVE(guard_jsdouble_is_int_and_int_fits_in_jsval)(jsdouble& d, jsint& i)
|
||||
PRIMITIVE(guard_jsdouble_is_int_and_int_fits_in_jsval)(JSContext* cx, jsdouble& d, jsint& i)
|
||||
{
|
||||
return JSDOUBLE_IS_INT(d, i) && INT_FITS_IN_JSVAL(i);
|
||||
}
|
||||
|
||||
static inline void
|
||||
PRIMITIVE(prim_int_to_jsval)(jsint& i, jsval& v)
|
||||
PRIMITIVE(prim_int_to_jsval)(JSContext* cx, jsint& i, jsval& v)
|
||||
{
|
||||
v = INT_TO_JSVAL(i);
|
||||
}
|
||||
@ -123,55 +123,55 @@ PRIMITIVE(call_NewDoubleInRootedValue)(JSContext* cx, jsdouble& d, jsval* vp)
|
||||
}
|
||||
|
||||
static inline bool
|
||||
PRIMITIVE(guard_int_fits_in_jsval)(jsint& i)
|
||||
PRIMITIVE(guard_int_fits_in_jsval)(JSContext* cx, jsint& i)
|
||||
{
|
||||
return INT_FITS_IN_JSVAL(i);
|
||||
}
|
||||
|
||||
static inline void
|
||||
PRIMITIVE(prim_int_to_double)(jsint& i, jsdouble& d)
|
||||
PRIMITIVE(prim_int_to_double)(JSContext* cx, jsint& i, jsdouble& d)
|
||||
{
|
||||
d = (jsdouble) i;
|
||||
}
|
||||
|
||||
static inline bool
|
||||
PRIMITIVE(guard_uint_fits_in_jsval)(uint32& u)
|
||||
PRIMITIVE(guard_uint_fits_in_jsval)(JSContext* cx, uint32& u)
|
||||
{
|
||||
return u <= JSVAL_INT_MAX;
|
||||
}
|
||||
|
||||
static inline void
|
||||
PRIMITIVE(prim_uint_to_jsval)(uint32& u, jsval& v)
|
||||
PRIMITIVE(prim_uint_to_jsval)(JSContext* cx, uint32& u, jsval& v)
|
||||
{
|
||||
v = INT_TO_JSVAL(u);
|
||||
}
|
||||
|
||||
static inline void
|
||||
PRIMITIVE(prim_uint_to_double)(uint32& u, jsdouble& d)
|
||||
PRIMITIVE(prim_uint_to_double)(JSContext* cx, uint32& u, jsdouble& d)
|
||||
{
|
||||
d = (jsdouble) u;
|
||||
}
|
||||
|
||||
static inline bool
|
||||
PRIMITIVE(guard_jsval_is_int)(jsval& v)
|
||||
PRIMITIVE(guard_jsval_is_int)(JSContext* cx, jsval& v)
|
||||
{
|
||||
return JSVAL_IS_INT(v);
|
||||
}
|
||||
|
||||
static inline void
|
||||
PRIMITIVE(prim_jsval_to_int)(jsval& v, jsint& i)
|
||||
PRIMITIVE(prim_jsval_to_int)(JSContext* cx, jsval& v, jsint& i)
|
||||
{
|
||||
i = JSVAL_TO_INT(v);
|
||||
}
|
||||
|
||||
static inline bool
|
||||
PRIMITIVE(guard_jsval_is_double)(jsval& v)
|
||||
PRIMITIVE(guard_jsval_is_double)(JSContext* cx, jsval& v)
|
||||
{
|
||||
return JSVAL_IS_DOUBLE(v);
|
||||
}
|
||||
|
||||
static inline void
|
||||
PRIMITIVE(prim_jsval_to_double)(jsval& v, jsdouble& d)
|
||||
PRIMITIVE(prim_jsval_to_double)(JSContext* cx, jsval& v, jsdouble& d)
|
||||
{
|
||||
d = *JSVAL_TO_DOUBLE(v);
|
||||
}
|
||||
@ -183,7 +183,7 @@ PRIMITIVE(call_ValueToNumber)(JSContext* cx, jsval* vp, jsdouble& d)
|
||||
}
|
||||
|
||||
static inline bool
|
||||
PRIMITIVE(guard_jsval_is_null)(jsval& v)
|
||||
PRIMITIVE(guard_jsval_is_null)(JSContext* cx, jsval& v)
|
||||
{
|
||||
return JSVAL_IS_NULL(v);
|
||||
}
|
||||
@ -195,7 +195,7 @@ PRIMITIVE(call_ValueToECMAInt32)(JSContext* cx, jsval* vp, jsint& i)
|
||||
}
|
||||
|
||||
static inline void
|
||||
PRIMITIVE(prim_int_to_uint)(jsint& i, uint32& u)
|
||||
PRIMITIVE(prim_int_to_uint)(JSContext* cx, jsint& i, uint32& u)
|
||||
{
|
||||
u = (uint32) i;
|
||||
}
|
||||
@ -207,43 +207,43 @@ PRIMITIVE(call_ValueToECMAUint32)(JSContext* cx, jsval* vp, uint32& u)
|
||||
}
|
||||
|
||||
static inline void
|
||||
PRIMITIVE(prim_generate_boolean_constant)(JSBool c, JSBool& b)
|
||||
PRIMITIVE(prim_generate_boolean_constant)(JSContext* cx, JSBool c, JSBool& b)
|
||||
{
|
||||
b = c;
|
||||
}
|
||||
|
||||
static inline bool
|
||||
PRIMITIVE(guard_jsval_is_boolean)(jsval& v)
|
||||
PRIMITIVE(guard_jsval_is_boolean)(JSContext* cx, jsval& v)
|
||||
{
|
||||
return JSVAL_IS_BOOLEAN(v);
|
||||
}
|
||||
|
||||
static inline void
|
||||
PRIMITIVE(prim_jsval_to_boolean)(jsval& v, JSBool& b)
|
||||
PRIMITIVE(prim_jsval_to_boolean)(JSContext* cx, jsval& v, JSBool& b)
|
||||
{
|
||||
b = JSVAL_TO_BOOLEAN(v);
|
||||
}
|
||||
|
||||
static inline void
|
||||
PRIMITIVE(call_ValueToBoolean)(jsval& v, JSBool& b)
|
||||
PRIMITIVE(call_ValueToBoolean)(JSContext* cx, jsval& v, JSBool& b)
|
||||
{
|
||||
b = js_ValueToBoolean(v);
|
||||
}
|
||||
|
||||
static inline bool
|
||||
PRIMITIVE(guard_jsval_is_primitive)(jsval& v)
|
||||
PRIMITIVE(guard_jsval_is_primitive)(JSContext* cx, jsval& v)
|
||||
{
|
||||
return JSVAL_IS_PRIMITIVE(v);
|
||||
}
|
||||
|
||||
static inline void
|
||||
PRIMITIVE(prim_jsval_to_object)(jsval& v, JSObject*& obj)
|
||||
PRIMITIVE(prim_jsval_to_object)(JSContext* cx, jsval& v, JSObject*& obj)
|
||||
{
|
||||
obj = JSVAL_TO_OBJECT(v);
|
||||
}
|
||||
|
||||
static inline bool
|
||||
PRIMITIVE(guard_obj_is_null)(JSObject*& obj)
|
||||
PRIMITIVE(guard_obj_is_null)(JSContext* cx, JSObject*& obj)
|
||||
{
|
||||
return !obj;
|
||||
}
|
||||
@ -262,19 +262,19 @@ PRIMITIVE(call_obj_default_value)(JSContext* cx, JSObject*& obj, JSType hint,
|
||||
}
|
||||
|
||||
static inline void
|
||||
PRIMITIVE(prim_dadd)(jsdouble& a, jsdouble& b, jsdouble& r)
|
||||
PRIMITIVE(prim_dadd)(JSContext* cx, jsdouble& a, jsdouble& b, jsdouble& r)
|
||||
{
|
||||
r = a + b;
|
||||
}
|
||||
|
||||
static inline void
|
||||
PRIMITIVE(prim_dsub)(jsdouble& a, jsdouble& b, jsdouble& r)
|
||||
PRIMITIVE(prim_dsub)(JSContext* cx, jsdouble& a, jsdouble& b, jsdouble& r)
|
||||
{
|
||||
r = a - b;
|
||||
}
|
||||
|
||||
static inline void
|
||||
PRIMITIVE(prim_dmul)(jsdouble& a, jsdouble& b, jsdouble& r)
|
||||
PRIMITIVE(prim_dmul)(JSContext* cx, jsdouble& a, jsdouble& b, jsdouble& r)
|
||||
{
|
||||
r = a * b;
|
||||
}
|
||||
@ -335,121 +335,121 @@ PRIMITIVE(prim_dmod)(JSContext* cx, JSRuntime* rt, JSFrameRegs& regs, int n,
|
||||
}
|
||||
|
||||
static inline void
|
||||
PRIMITIVE(prim_ior)(jsint& a, jsint& b, jsint& r)
|
||||
PRIMITIVE(prim_ior)(JSContext* cx, jsint& a, jsint& b, jsint& r)
|
||||
{
|
||||
r = a | b;
|
||||
}
|
||||
|
||||
static inline void
|
||||
PRIMITIVE(prim_ixor)(jsint& a, jsint& b, jsint& r)
|
||||
PRIMITIVE(prim_ixor)(JSContext* cx, jsint& a, jsint& b, jsint& r)
|
||||
{
|
||||
r = a ^ b;
|
||||
}
|
||||
|
||||
static inline void
|
||||
PRIMITIVE(prim_iand)(jsint& a, jsint& b, jsint& r)
|
||||
PRIMITIVE(prim_iand)(JSContext* cx, jsint& a, jsint& b, jsint& r)
|
||||
{
|
||||
r = a & b;
|
||||
}
|
||||
|
||||
static inline void
|
||||
PRIMITIVE(prim_ilsh)(jsint& a, jsint& b, jsint& r)
|
||||
PRIMITIVE(prim_ilsh)(JSContext* cx, jsint& a, jsint& b, jsint& r)
|
||||
{
|
||||
r = a << (b & 31);
|
||||
}
|
||||
|
||||
static inline void
|
||||
PRIMITIVE(prim_irsh)(jsint& a, jsint& b, jsint& r)
|
||||
PRIMITIVE(prim_irsh)(JSContext* cx, jsint& a, jsint& b, jsint& r)
|
||||
{
|
||||
r = a >> (b & 31);
|
||||
}
|
||||
|
||||
static inline void
|
||||
PRIMITIVE(prim_ursh)(uint32& a, jsint& b, uint32& r)
|
||||
PRIMITIVE(prim_ursh)(JSContext* cx, uint32& a, jsint& b, uint32& r)
|
||||
{
|
||||
r = a >> (b & 31);
|
||||
}
|
||||
|
||||
static inline bool
|
||||
PRIMITIVE(guard_boolean_is_true)(JSBool& cond)
|
||||
PRIMITIVE(guard_boolean_is_true)(JSContext* cx, JSBool& cond)
|
||||
{
|
||||
return cond;
|
||||
}
|
||||
|
||||
static inline void
|
||||
PRIMITIVE(prim_icmp_lt)(jsint& a, jsint& b, JSBool& r)
|
||||
PRIMITIVE(prim_icmp_lt)(JSContext* cx, jsint& a, jsint& b, JSBool& r)
|
||||
{
|
||||
r = a < b;
|
||||
}
|
||||
|
||||
static inline void
|
||||
PRIMITIVE(prim_icmp_le)(jsint& a, jsint& b, JSBool& r)
|
||||
PRIMITIVE(prim_icmp_le)(JSContext* cx, jsint& a, jsint& b, JSBool& r)
|
||||
{
|
||||
r = a <= b;
|
||||
}
|
||||
|
||||
static inline void
|
||||
PRIMITIVE(prim_icmp_gt)(jsint& a, jsint& b, JSBool& r)
|
||||
PRIMITIVE(prim_icmp_gt)(JSContext* cx, jsint& a, jsint& b, JSBool& r)
|
||||
{
|
||||
r = a > b;
|
||||
}
|
||||
|
||||
static inline void
|
||||
PRIMITIVE(prim_icmp_ge)(jsint& a, jsint& b, JSBool& r)
|
||||
PRIMITIVE(prim_icmp_ge)(JSContext* cx, jsint& a, jsint& b, JSBool& r)
|
||||
{
|
||||
r = a >= b;
|
||||
}
|
||||
|
||||
static inline void
|
||||
PRIMITIVE(prim_dcmp_lt)(bool ifnan, jsdouble& a, jsdouble& b, JSBool& r)
|
||||
PRIMITIVE(prim_dcmp_lt)(JSContext* cx, bool ifnan, jsdouble& a, jsdouble& b, JSBool& r)
|
||||
{
|
||||
r = JSDOUBLE_COMPARE(a, <, b, ifnan);
|
||||
}
|
||||
|
||||
static inline void
|
||||
PRIMITIVE(prim_dcmp_le)(bool ifnan, jsdouble& a, jsdouble& b, JSBool& r)
|
||||
PRIMITIVE(prim_dcmp_le)(JSContext* cx, bool ifnan, jsdouble& a, jsdouble& b, JSBool& r)
|
||||
{
|
||||
r = JSDOUBLE_COMPARE(a, <=, b, ifnan);
|
||||
}
|
||||
|
||||
static inline void
|
||||
PRIMITIVE(prim_dcmp_gt)(bool ifnan, jsdouble& a, jsdouble& b, JSBool& r)
|
||||
PRIMITIVE(prim_dcmp_gt)(JSContext* cx, bool ifnan, jsdouble& a, jsdouble& b, JSBool& r)
|
||||
{
|
||||
r = JSDOUBLE_COMPARE(a, >, b, ifnan);
|
||||
}
|
||||
|
||||
static inline void
|
||||
PRIMITIVE(prim_dcmp_ge)(bool ifnan, jsdouble& a, jsdouble& b, JSBool& r)
|
||||
PRIMITIVE(prim_dcmp_ge)(JSContext* cx, bool ifnan, jsdouble& a, jsdouble& b, JSBool& r)
|
||||
{
|
||||
r = JSDOUBLE_COMPARE(a, >=, b, ifnan);
|
||||
}
|
||||
|
||||
static inline void
|
||||
PRIMITIVE(prim_generate_int_constant)(jsint c, jsint& v)
|
||||
PRIMITIVE(prim_generate_int_constant)(JSContext* cx, jsint c, jsint& v)
|
||||
{
|
||||
v = c;
|
||||
}
|
||||
|
||||
static inline void
|
||||
PRIMITIVE(prim_jsval_to_string)(jsval& v, JSString*& s)
|
||||
PRIMITIVE(prim_jsval_to_string)(JSContext* cx, jsval& v, JSString*& s)
|
||||
{
|
||||
s = JSVAL_TO_STRING(v);
|
||||
}
|
||||
|
||||
static inline void
|
||||
PRIMITIVE(call_CompareStrings)(JSString*& a, JSString*& b, jsint& r)
|
||||
PRIMITIVE(call_CompareStrings)(JSContext* cx, JSString*& a, JSString*& b, jsint& r)
|
||||
{
|
||||
r = js_CompareStrings(a, b);
|
||||
}
|
||||
|
||||
static inline bool
|
||||
PRIMITIVE(guard_both_jsvals_are_int)(jsval& a, jsval& b)
|
||||
PRIMITIVE(guard_both_jsvals_are_int)(JSContext* cx, jsval& a, jsval& b)
|
||||
{
|
||||
return (a & b) & JSVAL_INT;
|
||||
}
|
||||
|
||||
static inline bool
|
||||
PRIMITIVE(guard_both_jsvals_are_string)(jsval& a, jsval& b)
|
||||
PRIMITIVE(guard_both_jsvals_are_string)(JSContext* cx, jsval& a, jsval& b)
|
||||
{
|
||||
return JSVAL_IS_STRING(a) && JSVAL_IS_STRING(b);
|
||||
}
|
||||
|
||||
@ -46,75 +46,75 @@
|
||||
#undef PRIMITIVE
|
||||
|
||||
static inline void
|
||||
prim_push_stack(JSFrameRegs& regs, jsval& v)
|
||||
prim_push_stack(JSContext* cx, JSFrameRegs& regs, jsval& v)
|
||||
{
|
||||
interp_prim_push_stack(regs, v);
|
||||
interp_prim_push_stack(cx, regs, v);
|
||||
}
|
||||
|
||||
static inline void
|
||||
prim_pop_stack(JSFrameRegs& regs, jsval& v)
|
||||
prim_pop_stack(JSContext* cx, JSFrameRegs& regs, jsval& v)
|
||||
{
|
||||
interp_prim_pop_stack(regs, v);
|
||||
interp_prim_pop_stack(cx, regs, v);
|
||||
}
|
||||
|
||||
static inline void
|
||||
prim_store_stack(JSFrameRegs& regs, int n, jsval& v)
|
||||
prim_store_stack(JSContext* cx, JSFrameRegs& regs, int n, jsval& v)
|
||||
{
|
||||
interp_prim_store_stack(regs, n, v);
|
||||
interp_prim_store_stack(cx, regs, n, v);
|
||||
}
|
||||
|
||||
static inline void
|
||||
prim_fetch_stack(JSFrameRegs& regs, int n, jsval& v)
|
||||
prim_fetch_stack(JSContext* cx, JSFrameRegs& regs, int n, jsval& v)
|
||||
{
|
||||
interp_prim_fetch_stack(regs, n, v);
|
||||
interp_prim_fetch_stack(cx, regs, n, v);
|
||||
}
|
||||
|
||||
static inline void
|
||||
prim_adjust_stack(JSFrameRegs& regs, int n)
|
||||
prim_adjust_stack(JSContext* cx, JSFrameRegs& regs, int n)
|
||||
{
|
||||
interp_prim_adjust_stack(regs, n);
|
||||
interp_prim_adjust_stack(cx, regs, n);
|
||||
}
|
||||
|
||||
static inline void
|
||||
prim_generate_constant(jsval c, jsval& v)
|
||||
prim_generate_constant(JSContext* cx, jsval c, jsval& v)
|
||||
{
|
||||
interp_prim_generate_constant(c, v);
|
||||
interp_prim_generate_constant(cx, c, v);
|
||||
}
|
||||
|
||||
static inline void
|
||||
prim_boolean_to_jsval(JSBool& b, jsval& v)
|
||||
prim_boolean_to_jsval(JSContext* cx, JSBool& b, jsval& v)
|
||||
{
|
||||
interp_prim_boolean_to_jsval(b, v);
|
||||
interp_prim_boolean_to_jsval(cx, b, v);
|
||||
}
|
||||
|
||||
static inline void
|
||||
prim_string_to_jsval(JSString*& str, jsval& v)
|
||||
prim_string_to_jsval(JSContext* cx, JSString*& str, jsval& v)
|
||||
{
|
||||
interp_prim_string_to_jsval(str, v);
|
||||
interp_prim_string_to_jsval(cx, str, v);
|
||||
}
|
||||
|
||||
static inline void
|
||||
prim_object_to_jsval(JSObject*& obj, jsval& v)
|
||||
prim_object_to_jsval(JSContext* cx, JSObject*& obj, jsval& v)
|
||||
{
|
||||
interp_prim_object_to_jsval(obj, v);
|
||||
interp_prim_object_to_jsval(cx, obj, v);
|
||||
}
|
||||
|
||||
static inline void
|
||||
prim_id_to_jsval(jsid& id, jsval& v)
|
||||
prim_id_to_jsval(JSContext* cx, jsid& id, jsval& v)
|
||||
{
|
||||
interp_prim_id_to_jsval(id, v);
|
||||
interp_prim_id_to_jsval(cx, id, v);
|
||||
}
|
||||
|
||||
static inline bool
|
||||
guard_jsdouble_is_int_and_int_fits_in_jsval(jsdouble& d, jsint& i)
|
||||
guard_jsdouble_is_int_and_int_fits_in_jsval(JSContext* cx, jsdouble& d, jsint& i)
|
||||
{
|
||||
return interp_guard_jsdouble_is_int_and_int_fits_in_jsval(d, i);
|
||||
return interp_guard_jsdouble_is_int_and_int_fits_in_jsval(cx, d, i);
|
||||
}
|
||||
|
||||
static inline void
|
||||
prim_int_to_jsval(jsint& i, jsval& v)
|
||||
prim_int_to_jsval(JSContext* cx, jsint& i, jsval& v)
|
||||
{
|
||||
interp_prim_int_to_jsval(i, v);
|
||||
interp_prim_int_to_jsval(cx, i, v);
|
||||
}
|
||||
|
||||
static inline bool
|
||||
@ -124,57 +124,57 @@ call_NewDoubleInRootedValue(JSContext* cx, jsdouble& d, jsval* vp)
|
||||
}
|
||||
|
||||
static inline bool
|
||||
guard_int_fits_in_jsval(jsint& i)
|
||||
guard_int_fits_in_jsval(JSContext* cx, jsint& i)
|
||||
{
|
||||
return interp_guard_int_fits_in_jsval(i);
|
||||
return interp_guard_int_fits_in_jsval(cx, i);
|
||||
}
|
||||
|
||||
static inline void
|
||||
prim_int_to_double(jsint& i, jsdouble& d)
|
||||
prim_int_to_double(JSContext* cx, jsint& i, jsdouble& d)
|
||||
{
|
||||
interp_prim_int_to_double(i, d);
|
||||
interp_prim_int_to_double(cx, i, d);
|
||||
}
|
||||
|
||||
static inline bool
|
||||
guard_uint_fits_in_jsval(uint32& u)
|
||||
guard_uint_fits_in_jsval(JSContext* cx, uint32& u)
|
||||
{
|
||||
return interp_guard_uint_fits_in_jsval(u);
|
||||
return interp_guard_uint_fits_in_jsval(cx, u);
|
||||
}
|
||||
|
||||
static inline void
|
||||
prim_uint_to_jsval(uint32& u, jsval& v)
|
||||
prim_uint_to_jsval(JSContext* cx, uint32& u, jsval& v)
|
||||
{
|
||||
interp_prim_uint_to_jsval(u, v);
|
||||
interp_prim_uint_to_jsval(cx, u, v);
|
||||
}
|
||||
|
||||
static inline void
|
||||
prim_uint_to_double(uint32& u, jsdouble& d)
|
||||
prim_uint_to_double(JSContext* cx, uint32& u, jsdouble& d)
|
||||
{
|
||||
interp_prim_uint_to_double(u, d);
|
||||
interp_prim_uint_to_double(cx, u, d);
|
||||
}
|
||||
|
||||
static inline bool
|
||||
guard_jsval_is_int(jsval& v)
|
||||
guard_jsval_is_int(JSContext* cx, jsval& v)
|
||||
{
|
||||
return interp_guard_jsval_is_int(v);
|
||||
return interp_guard_jsval_is_int(cx, v);
|
||||
}
|
||||
|
||||
static inline void
|
||||
prim_jsval_to_int(jsval& v, jsint& i)
|
||||
prim_jsval_to_int(JSContext* cx, jsval& v, jsint& i)
|
||||
{
|
||||
interp_prim_jsval_to_int(v, i);
|
||||
interp_prim_jsval_to_int(cx, v, i);
|
||||
}
|
||||
|
||||
static inline bool
|
||||
guard_jsval_is_double(jsval& v)
|
||||
guard_jsval_is_double(JSContext* cx, jsval& v)
|
||||
{
|
||||
return interp_guard_jsval_is_double(v);
|
||||
return interp_guard_jsval_is_double(cx, v);
|
||||
}
|
||||
|
||||
static inline void
|
||||
prim_jsval_to_double(jsval& v, jsdouble& d)
|
||||
prim_jsval_to_double(JSContext* cx, jsval& v, jsdouble& d)
|
||||
{
|
||||
interp_prim_jsval_to_double(v, d);
|
||||
interp_prim_jsval_to_double(cx, v, d);
|
||||
}
|
||||
|
||||
static inline void
|
||||
@ -184,9 +184,9 @@ call_ValueToNumber(JSContext* cx, jsval* vp, jsdouble& d)
|
||||
}
|
||||
|
||||
static inline bool
|
||||
guard_jsval_is_null(jsval& v)
|
||||
guard_jsval_is_null(JSContext* cx, jsval& v)
|
||||
{
|
||||
return interp_guard_jsval_is_null(v);
|
||||
return interp_guard_jsval_is_null(cx, v);
|
||||
}
|
||||
|
||||
static inline void
|
||||
@ -196,9 +196,9 @@ call_ValueToECMAInt32(JSContext* cx, jsval* vp, jsint& i)
|
||||
}
|
||||
|
||||
static inline void
|
||||
prim_int_to_uint(jsint& i, uint32& u)
|
||||
prim_int_to_uint(JSContext* cx, jsint& i, uint32& u)
|
||||
{
|
||||
interp_prim_int_to_uint(i, u);
|
||||
interp_prim_int_to_uint(cx, i, u);
|
||||
}
|
||||
|
||||
static inline void
|
||||
@ -208,45 +208,45 @@ call_ValueToECMAUint32(JSContext* cx, jsval* vp, uint32& u)
|
||||
}
|
||||
|
||||
static inline void
|
||||
prim_generate_boolean_constant(JSBool c, JSBool& b)
|
||||
prim_generate_boolean_constant(JSContext* cx, JSBool c, JSBool& b)
|
||||
{
|
||||
interp_prim_generate_boolean_constant(c, b);
|
||||
interp_prim_generate_boolean_constant(cx, c, b);
|
||||
}
|
||||
|
||||
static inline bool
|
||||
guard_jsval_is_boolean(jsval& v)
|
||||
guard_jsval_is_boolean(JSContext* cx, jsval& v)
|
||||
{
|
||||
return interp_guard_jsval_is_boolean(v);
|
||||
return interp_guard_jsval_is_boolean(cx, v);
|
||||
}
|
||||
|
||||
static inline void
|
||||
prim_jsval_to_boolean(jsval& v, JSBool& b)
|
||||
prim_jsval_to_boolean(JSContext* cx, jsval& v, JSBool& b)
|
||||
{
|
||||
interp_prim_jsval_to_boolean(v, b);
|
||||
interp_prim_jsval_to_boolean(cx, v, b);
|
||||
}
|
||||
|
||||
static inline void
|
||||
call_ValueToBoolean(jsval& v, JSBool& b)
|
||||
call_ValueToBoolean(JSContext* cx, jsval& v, JSBool& b)
|
||||
{
|
||||
interp_call_ValueToBoolean(v, b);
|
||||
interp_call_ValueToBoolean(cx, v, b);
|
||||
}
|
||||
|
||||
static inline bool
|
||||
guard_jsval_is_primitive(jsval& v)
|
||||
guard_jsval_is_primitive(JSContext* cx, jsval& v)
|
||||
{
|
||||
return interp_guard_jsval_is_primitive(v);
|
||||
return interp_guard_jsval_is_primitive(cx, v);
|
||||
}
|
||||
|
||||
static inline void
|
||||
prim_jsval_to_object(jsval& v, JSObject*& obj)
|
||||
prim_jsval_to_object(JSContext* cx, jsval& v, JSObject*& obj)
|
||||
{
|
||||
interp_prim_jsval_to_object(v, obj);
|
||||
interp_prim_jsval_to_object(cx, v, obj);
|
||||
}
|
||||
|
||||
static inline bool
|
||||
guard_obj_is_null(JSObject*& obj)
|
||||
guard_obj_is_null(JSContext* cx, JSObject*& obj)
|
||||
{
|
||||
return interp_guard_obj_is_null(obj);
|
||||
return interp_guard_obj_is_null(cx, obj);
|
||||
}
|
||||
|
||||
static inline void
|
||||
@ -263,21 +263,21 @@ call_obj_default_value(JSContext* cx, JSObject*& obj, JSType hint,
|
||||
}
|
||||
|
||||
static inline void
|
||||
prim_dadd(jsdouble& a, jsdouble& b, jsdouble& r)
|
||||
prim_dadd(JSContext* cx, jsdouble& a, jsdouble& b, jsdouble& r)
|
||||
{
|
||||
interp_prim_dadd(a, b, r);
|
||||
interp_prim_dadd(cx, a, b, r);
|
||||
}
|
||||
|
||||
static inline void
|
||||
prim_dsub(jsdouble& a, jsdouble& b, jsdouble& r)
|
||||
prim_dsub(JSContext* cx, jsdouble& a, jsdouble& b, jsdouble& r)
|
||||
{
|
||||
interp_prim_dsub(a, b, r);
|
||||
interp_prim_dsub(cx, a, b, r);
|
||||
}
|
||||
|
||||
static inline void
|
||||
prim_dmul(jsdouble& a, jsdouble& b, jsdouble& r)
|
||||
prim_dmul(JSContext* cx, jsdouble& a, jsdouble& b, jsdouble& r)
|
||||
{
|
||||
interp_prim_dmul(a, b, r);
|
||||
interp_prim_dmul(cx, a, b, r);
|
||||
}
|
||||
|
||||
static inline bool
|
||||
@ -295,123 +295,123 @@ prim_dmod(JSContext* cx, JSRuntime* rt, JSFrameRegs& regs, int n,
|
||||
}
|
||||
|
||||
static inline void
|
||||
prim_ior(jsint& a, jsint& b, jsint& r)
|
||||
prim_ior(JSContext* cx, jsint& a, jsint& b, jsint& r)
|
||||
{
|
||||
interp_prim_ior(a, b, r);
|
||||
interp_prim_ior(cx, a, b, r);
|
||||
}
|
||||
|
||||
static inline void
|
||||
prim_ixor(jsint& a, jsint& b, jsint& r)
|
||||
prim_ixor(JSContext* cx, jsint& a, jsint& b, jsint& r)
|
||||
{
|
||||
interp_prim_ixor(a, b, r);
|
||||
interp_prim_ixor(cx, a, b, r);
|
||||
}
|
||||
|
||||
static inline void
|
||||
prim_iand(jsint& a, jsint& b, jsint& r)
|
||||
prim_iand(JSContext* cx, jsint& a, jsint& b, jsint& r)
|
||||
{
|
||||
interp_prim_iand(a, b, r);
|
||||
interp_prim_iand(cx, a, b, r);
|
||||
}
|
||||
|
||||
static inline void
|
||||
prim_ilsh(jsint& a, jsint& b, jsint& r)
|
||||
prim_ilsh(JSContext* cx, jsint& a, jsint& b, jsint& r)
|
||||
{
|
||||
interp_prim_ilsh(a, b, r);
|
||||
interp_prim_ilsh(cx, a, b, r);
|
||||
}
|
||||
|
||||
static inline void
|
||||
prim_irsh(jsint& a, jsint& b, jsint& r)
|
||||
prim_irsh(JSContext* cx, jsint& a, jsint& b, jsint& r)
|
||||
{
|
||||
interp_prim_irsh(a, b, r);
|
||||
interp_prim_irsh(cx, a, b, r);
|
||||
}
|
||||
|
||||
static inline void
|
||||
prim_ursh(uint32& a, jsint& b, uint32& r)
|
||||
prim_ursh(JSContext* cx, uint32& a, jsint& b, uint32& r)
|
||||
{
|
||||
interp_prim_ursh(a, b, r);
|
||||
interp_prim_ursh(cx, a, b, r);
|
||||
}
|
||||
|
||||
static inline bool
|
||||
guard_boolean_is_true(JSBool& cond)
|
||||
guard_boolean_is_true(JSContext* cx, JSBool& cond)
|
||||
{
|
||||
return interp_guard_boolean_is_true(cond);
|
||||
return interp_guard_boolean_is_true(cx, cond);
|
||||
}
|
||||
|
||||
static inline void
|
||||
prim_icmp_lt(jsint& a, jsint& b, JSBool& r)
|
||||
prim_icmp_lt(JSContext* cx, jsint& a, jsint& b, JSBool& r)
|
||||
{
|
||||
interp_prim_icmp_lt(a, b, r);
|
||||
interp_prim_icmp_lt(cx, a, b, r);
|
||||
}
|
||||
|
||||
static inline void
|
||||
prim_icmp_le(jsint& a, jsint& b, JSBool& r)
|
||||
prim_icmp_le(JSContext* cx, jsint& a, jsint& b, JSBool& r)
|
||||
{
|
||||
interp_prim_icmp_le(a, b, r);
|
||||
interp_prim_icmp_le(cx, a, b, r);
|
||||
}
|
||||
|
||||
static inline void
|
||||
prim_icmp_gt(jsint& a, jsint& b, JSBool& r)
|
||||
prim_icmp_gt(JSContext* cx, jsint& a, jsint& b, JSBool& r)
|
||||
{
|
||||
interp_prim_icmp_gt(a, b, r);
|
||||
interp_prim_icmp_gt(cx, a, b, r);
|
||||
}
|
||||
|
||||
static inline void
|
||||
prim_icmp_ge(jsint& a, jsint& b, JSBool& r)
|
||||
prim_icmp_ge(JSContext* cx, jsint& a, jsint& b, JSBool& r)
|
||||
{
|
||||
interp_prim_icmp_ge(a, b, r);
|
||||
interp_prim_icmp_ge(cx, a, b, r);
|
||||
}
|
||||
|
||||
static inline void
|
||||
prim_dcmp_lt(bool ifnan, jsdouble& a, jsdouble& b, JSBool& r)
|
||||
prim_dcmp_lt(JSContext* cx, bool ifnan, jsdouble& a, jsdouble& b, JSBool& r)
|
||||
{
|
||||
interp_prim_dcmp_lt(ifnan, a, b, r);
|
||||
interp_prim_dcmp_lt(cx, ifnan, a, b, r);
|
||||
}
|
||||
|
||||
static inline void
|
||||
prim_dcmp_le(bool ifnan, jsdouble& a, jsdouble& b, JSBool& r)
|
||||
prim_dcmp_le(JSContext* cx, bool ifnan, jsdouble& a, jsdouble& b, JSBool& r)
|
||||
{
|
||||
interp_prim_dcmp_le(ifnan, a, b, r);
|
||||
interp_prim_dcmp_le(cx, ifnan, a, b, r);
|
||||
}
|
||||
|
||||
static inline void
|
||||
prim_dcmp_gt(bool ifnan, jsdouble& a, jsdouble& b, JSBool& r)
|
||||
prim_dcmp_gt(JSContext* cx, bool ifnan, jsdouble& a, jsdouble& b, JSBool& r)
|
||||
{
|
||||
interp_prim_dcmp_gt(ifnan, a, b, r);
|
||||
interp_prim_dcmp_gt(cx, ifnan, a, b, r);
|
||||
}
|
||||
|
||||
static inline void
|
||||
prim_dcmp_ge(bool ifnan, jsdouble& a, jsdouble& b, JSBool& r)
|
||||
prim_dcmp_ge(JSContext* cx, bool ifnan, jsdouble& a, jsdouble& b, JSBool& r)
|
||||
{
|
||||
interp_prim_dcmp_ge(ifnan, a, b, r);
|
||||
interp_prim_dcmp_ge(cx, ifnan, a, b, r);
|
||||
}
|
||||
|
||||
static inline void
|
||||
prim_generate_int_constant(jsint c, jsint& v)
|
||||
prim_generate_int_constant(JSContext* cx, jsint c, jsint& v)
|
||||
{
|
||||
interp_prim_generate_int_constant(c, v);
|
||||
interp_prim_generate_int_constant(cx, c, v);
|
||||
}
|
||||
|
||||
static inline void
|
||||
prim_jsval_to_string(jsval& v, JSString*& s)
|
||||
prim_jsval_to_string(JSContext* cx, jsval& v, JSString*& s)
|
||||
{
|
||||
interp_prim_jsval_to_string(v, s);
|
||||
interp_prim_jsval_to_string(cx, v, s);
|
||||
}
|
||||
|
||||
static inline void
|
||||
call_CompareStrings(JSString*& a, JSString*& b, jsint& r)
|
||||
call_CompareStrings(JSContext* cx, JSString*& a, JSString*& b, jsint& r)
|
||||
{
|
||||
interp_call_CompareStrings(a, b, r);
|
||||
interp_call_CompareStrings(cx, a, b, r);
|
||||
}
|
||||
|
||||
static inline bool
|
||||
guard_both_jsvals_are_int(jsval& a, jsval& b)
|
||||
guard_both_jsvals_are_int(JSContext* cx, jsval& a, jsval& b)
|
||||
{
|
||||
return interp_guard_both_jsvals_are_int(a, b);
|
||||
return interp_guard_both_jsvals_are_int(cx, a, b);
|
||||
}
|
||||
|
||||
static inline bool
|
||||
guard_both_jsvals_are_string(jsval& a, jsval& b)
|
||||
guard_both_jsvals_are_string(JSContext* cx, jsval& a, jsval& b)
|
||||
{
|
||||
return interp_guard_both_jsvals_are_string(a, b);
|
||||
return interp_guard_both_jsvals_are_string(cx, a, b);
|
||||
}
|
||||
|
||||
#endif /* jstracerinlines_h___ */
|
||||
|
||||
Loading…
Reference in New Issue
Block a user