Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-11 20:35:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1034576 - Move math functions to the js namespace. r=bbouvier

Browse Source
This commit is contained in:
Tooru Fujisawa 2014-08-01 05:40:00 -04:00
parent 09c2a8c1e1
commit 52116146c5
5 changed files with 48 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
js/src/jit/AsmJSLink.cpp
View File

@ -185,11 +185,11 @@ ValidateMathBuiltinFunction(JSContext *cx, AsmJSModule::Global &global, HandleVa
case AsmJSMathBuiltin_floor: native = math_floor; break;
case AsmJSMathBuiltin_exp: native = math_exp; break;
case AsmJSMathBuiltin_log: native = math_log; break;
case AsmJSMathBuiltin_pow: native = js_math_pow; break;
case AsmJSMathBuiltin_sqrt: native = js_math_sqrt; break;
case AsmJSMathBuiltin_min: native = js_math_min; break;
case AsmJSMathBuiltin_max: native = js_math_max; break;
case AsmJSMathBuiltin_abs: native = js_math_abs; break;
case AsmJSMathBuiltin_pow: native = math_pow; break;
case AsmJSMathBuiltin_sqrt: native = math_sqrt; break;
case AsmJSMathBuiltin_min: native = math_min; break;
case AsmJSMathBuiltin_max: native = math_max; break;
case AsmJSMathBuiltin_abs: native = math_abs; break;
case AsmJSMathBuiltin_atan2: native = math_atan2; break;
case AsmJSMathBuiltin_imul: native = math_imul; break;
case AsmJSMathBuiltin_fround: native = math_fround; break;

14
js/src/jit/MCallOptimize.cpp
View File

@ -46,7 +46,7 @@ IonBuilder::inlineNativeCall(CallInfo &callInfo, JSFunction *target)
return inlineArraySplice(callInfo);
// Math natives.
if (native == js_math_abs)
if (native == js::math_abs)
return inlineMathAbs(callInfo);
if (native == js::math_floor)
return inlineMathFloor(callInfo);
@ -54,19 +54,19 @@ IonBuilder::inlineNativeCall(CallInfo &callInfo, JSFunction *target)
return inlineMathCeil(callInfo);
if (native == js::math_round)
return inlineMathRound(callInfo);
if (native == js_math_sqrt)
if (native == js::math_sqrt)
return inlineMathSqrt(callInfo);
if (native == math_atan2)
if (native == js::math_atan2)
return inlineMathAtan2(callInfo);
if (native == js::math_hypot)
return inlineMathHypot(callInfo);
if (native == js_math_max)
if (native == js::math_max)
return inlineMathMinMax(callInfo, true /* max */);
if (native == js_math_min)
if (native == js::math_min)
return inlineMathMinMax(callInfo, false /* max */);
if (native == js_math_pow)
if (native == js::math_pow)
return inlineMathPow(callInfo);
if (native == js_math_random)
if (native == js::math_random)
return inlineMathRandom(callInfo);
if (native == js::math_imul)
return inlineMathImul(callInfo);

8
js/src/jit/Recover.cpp
View File

@ -697,7 +697,7 @@ RPow::recover(JSContext *cx, SnapshotIterator &iter) const
RootedValue result(cx);
MOZ_ASSERT(base.isNumber() && power.isNumber());
if (!js_math_pow_handle(cx, base, power, &result))
if (!js::math_pow_handle(cx, base, power, &result))
return false;
iter.storeInstructionResult(result);
@ -724,7 +724,7 @@ RPowHalf::recover(JSContext *cx, SnapshotIterator &iter) const
power.setNumber(0.5);
MOZ_ASSERT(base.isNumber());
if (!js_math_pow_handle(cx, base, power, &result))
if (!js::math_pow_handle(cx, base, power, &result))
return false;
iter.storeInstructionResult(result);
@ -752,7 +752,7 @@ RMinMax::recover(JSContext *cx, SnapshotIterator &iter) const
RootedValue b(cx, iter.read());
RootedValue result(cx);
if (!js_minmax_impl(cx, isMax_, a, b, &result))
if (!js::minmax_impl(cx, isMax_, a, b, &result))
return false;
iter.storeInstructionResult(result);
@ -776,7 +776,7 @@ RAbs::recover(JSContext *cx, SnapshotIterator &iter) const
RootedValue v(cx, iter.read());
RootedValue result(cx);
if (!js_math_abs_handle(cx, v, &result))
if (!js::math_abs_handle(cx, v, &result))
return false;
iter.storeInstructionResult(result);

38
js/src/jsmath.cpp
View File

@ -89,7 +89,7 @@ const Class js::MathClass = {
};
bool
js_math_abs_handle(JSContext *cx, js::HandleValue v, js::MutableHandleValue r)
js::math_abs_handle(JSContext *cx, js::HandleValue v, js::MutableHandleValue r)
{
double x;
if (!ToNumber(cx, v, &x))
@ -102,7 +102,7 @@ js_math_abs_handle(JSContext *cx, js::HandleValue v, js::MutableHandleValue r)
}
bool
js_math_abs(JSContext *cx, unsigned argc, Value *vp)
js::math_abs(JSContext *cx, unsigned argc, Value *vp)
{
CallArgs args = CallArgsFromVp(argc, vp);
@ -111,7 +111,7 @@ js_math_abs(JSContext *cx, unsigned argc, Value *vp)
return true;
}
return js_math_abs_handle(cx, args[0], args.rval());
return math_abs_handle(cx, args[0], args.rval());
}
#if defined(SOLARIS) && defined(__GNUC__)
@ -575,7 +575,7 @@ max_double(double x, double y)
}
bool
js_math_max(JSContext *cx, unsigned argc, Value *vp)
js::math_max(JSContext *cx, unsigned argc, Value *vp)
{
CallArgs args = CallArgsFromVp(argc, vp);
@ -600,7 +600,7 @@ min_double(double x, double y)
}
bool
js_math_min(JSContext *cx, unsigned argc, Value *vp)
js::math_min(JSContext *cx, unsigned argc, Value *vp)
{
CallArgs args = CallArgsFromVp(argc, vp);
@ -616,7 +616,7 @@ js_math_min(JSContext *cx, unsigned argc, Value *vp)
}
bool
js_minmax_impl(JSContext *cx, bool max, HandleValue a, HandleValue b, MutableHandleValue res)
js::minmax_impl(JSContext *cx, bool max, HandleValue a, HandleValue b, MutableHandleValue res)
{
double x, y;
@ -715,7 +715,7 @@ js::ecmaPow(double x, double y)
# pragma optimize("g", off)
#endif
bool
js_math_pow_handle(JSContext *cx, HandleValue base, HandleValue power, MutableHandleValue result)
js::math_pow_handle(JSContext *cx, HandleValue base, HandleValue power, MutableHandleValue result)
{
double x;
if (!ToNumber(cx, base, &x))
@ -731,11 +731,11 @@ js_math_pow_handle(JSContext *cx, HandleValue base, HandleValue power, MutableHa
}
bool
js_math_pow(JSContext *cx, unsigned argc, Value *vp)
js::math_pow(JSContext *cx, unsigned argc, Value *vp)
{
CallArgs args = CallArgsFromVp(argc, vp);
return js_math_pow_handle(cx, args.get(0), args.get(1), args.rval());
return math_pow_handle(cx, args.get(0), args.get(1), args.rval());
}
#if defined(_MSC_VER)
# pragma optimize("", on)
@ -819,14 +819,14 @@ random_nextDouble(JSContext *cx)
}
double
math_random_no_outparam(JSContext *cx)
js::math_random_no_outparam(JSContext *cx)
{
/* Calculate random without memory traffic, for use in the JITs. */
return random_nextDouble(cx);
}
bool
js_math_random(JSContext *cx, unsigned argc, Value *vp)
js::math_random(JSContext *cx, unsigned argc, Value *vp)
{
CallArgs args = CallArgsFromVp(argc, vp);
double z = random_nextDouble(cx);
@ -884,7 +884,7 @@ js::math_round(JSContext *cx, unsigned argc, Value *vp)
return true;
}
return js::math_round_handle(cx, args[0], args.rval());
return math_round_handle(cx, args[0], args.rval());
}
double
@ -939,7 +939,7 @@ js::math_sqrt_handle(JSContext *cx, HandleValue number, MutableHandleValue resul
}
bool
js_math_sqrt(JSContext *cx, unsigned argc, Value *vp)
js::math_sqrt(JSContext *cx, unsigned argc, Value *vp)
{
CallArgs args = CallArgsFromVp(argc, vp);
@ -1525,7 +1525,7 @@ static const JSFunctionSpec math_static_methods[] = {
#if JS_HAS_TOSOURCE
JS_FN(js_toSource_str, math_toSource, 0, 0),
#endif
JS_FN("abs", js_math_abs, 1, 0),
JS_FN("abs", math_abs, 1, 0),
JS_FN("acos", math_acos, 1, 0),
JS_FN("asin", math_asin, 1, 0),
JS_FN("atan", math_atan, 1, 0),
@ -1538,13 +1538,13 @@ static const JSFunctionSpec math_static_methods[] = {
JS_FN("imul", math_imul, 2, 0),
JS_FN("fround", math_fround, 1, 0),
JS_FN("log", math_log, 1, 0),
JS_FN("max", js_math_max, 2, 0),
JS_FN("min", js_math_min, 2, 0),
JS_FN("pow", js_math_pow, 2, 0),
JS_FN("random", js_math_random, 0, 0),
JS_FN("max", math_max, 2, 0),
JS_FN("min", math_min, 2, 0),
JS_FN("pow", math_pow, 2, 0),
JS_FN("random", math_random, 0, 0),
JS_FN("round", math_round, 1, 0),
JS_FN("sin", math_sin, 1, 0),
JS_FN("sqrt", js_math_sqrt, 1, 0),
JS_FN("sqrt", math_sqrt, 1, 0),
JS_FN("tan", math_tan, 1, 0),
JS_FN("log10", math_log10, 1, 0),
JS_FN("log2", math_log2, 1, 0),

26
js/src/jsmath.h
View File

@ -92,39 +92,39 @@ class MathCache
extern JSObject *
js_InitMathClass(JSContext *cx, js::HandleObject obj);
namespace js {
extern double
math_random_no_outparam(JSContext *cx);
extern bool
js_math_random(JSContext *cx, unsigned argc, js::Value *vp);
math_random(JSContext *cx, unsigned argc, js::Value *vp);
extern bool
js_math_abs_handle(JSContext *cx, js::HandleValue v, js::MutableHandleValue r);
math_abs_handle(JSContext *cx, js::HandleValue v, js::MutableHandleValue r);
extern bool
js_math_abs(JSContext *cx, unsigned argc, js::Value *vp);
math_abs(JSContext *cx, unsigned argc, js::Value *vp);
extern bool
js_math_max(JSContext *cx, unsigned argc, js::Value *vp);
math_max(JSContext *cx, unsigned argc, js::Value *vp);
extern bool
js_math_min(JSContext *cx, unsigned argc, js::Value *vp);
math_min(JSContext *cx, unsigned argc, js::Value *vp);
extern bool
js_math_sqrt(JSContext *cx, unsigned argc, js::Value *vp);
math_sqrt(JSContext *cx, unsigned argc, js::Value *vp);
extern bool
js_math_pow_handle(JSContext *cx, js::HandleValue base, js::HandleValue power,
js::MutableHandleValue result);
math_pow_handle(JSContext *cx, js::HandleValue base, js::HandleValue power,
js::MutableHandleValue result);
extern bool
js_math_pow(JSContext *cx, unsigned argc, js::Value *vp);
math_pow(JSContext *cx, unsigned argc, js::Value *vp);
extern bool
js_minmax_impl(JSContext *cx, bool max, js::HandleValue a, js::HandleValue b,
js::MutableHandleValue res);
namespace js {
minmax_impl(JSContext *cx, bool max, js::HandleValue a, js::HandleValue b,
js::MutableHandleValue res);
extern bool
math_sqrt_handle(JSContext *cx, js::HandleValue number, js::MutableHandleValue result);