JavaScriptCore-903.tar.gz

[apple/javascriptcore.git] / runtime / MathObject.cpp

diff --git a/runtime/MathObject.cpp b/runtime/MathObject.cpp
index 98ff3ba8b3cb7f82f836ed0f7a1509aa773e87cb..9c85a697cda4038ab12058101071a856c8fccc43 100644 (file)
--- a/runtime/MathObject.cpp
+++ b/runtime/MathObject.cpp
@@ -21,6 +21,7 @@
 #include "config.h"
 #include "MathObject.h"
 
 #include "config.h"
 #include "MathObject.h"
 

+#include "Lookup.h"

 #include "ObjectPrototype.h"
 #include "Operations.h"
 #include <time.h>
 #include "ObjectPrototype.h"
 #include "Operations.h"
 #include <time.h>


@@ -33,24 +34,24 @@ namespace JSC {
 
 ASSERT_CLASS_FITS_IN_CELL(MathObject);
 
 
 ASSERT_CLASS_FITS_IN_CELL(MathObject);
 

-static JSValue JSC_HOST_CALL mathProtoFuncAbs(ExecState*, JSObject*, JSValue, const ArgList&);
-static JSValue JSC_HOST_CALL mathProtoFuncACos(ExecState*, JSObject*, JSValue, const ArgList&);
-static JSValue JSC_HOST_CALL mathProtoFuncASin(ExecState*, JSObject*, JSValue, const ArgList&);
-static JSValue JSC_HOST_CALL mathProtoFuncATan(ExecState*, JSObject*, JSValue, const ArgList&);
-static JSValue JSC_HOST_CALL mathProtoFuncATan2(ExecState*, JSObject*, JSValue, const ArgList&);
-static JSValue JSC_HOST_CALL mathProtoFuncCeil(ExecState*, JSObject*, JSValue, const ArgList&);
-static JSValue JSC_HOST_CALL mathProtoFuncCos(ExecState*, JSObject*, JSValue, const ArgList&);
-static JSValue JSC_HOST_CALL mathProtoFuncExp(ExecState*, JSObject*, JSValue, const ArgList&);
-static JSValue JSC_HOST_CALL mathProtoFuncFloor(ExecState*, JSObject*, JSValue, const ArgList&);
-static JSValue JSC_HOST_CALL mathProtoFuncLog(ExecState*, JSObject*, JSValue, const ArgList&);
-static JSValue JSC_HOST_CALL mathProtoFuncMax(ExecState*, JSObject*, JSValue, const ArgList&);
-static JSValue JSC_HOST_CALL mathProtoFuncMin(ExecState*, JSObject*, JSValue, const ArgList&);
-static JSValue JSC_HOST_CALL mathProtoFuncPow(ExecState*, JSObject*, JSValue, const ArgList&);
-static JSValue JSC_HOST_CALL mathProtoFuncRandom(ExecState*, JSObject*, JSValue, const ArgList&);
-static JSValue JSC_HOST_CALL mathProtoFuncRound(ExecState*, JSObject*, JSValue, const ArgList&);
-static JSValue JSC_HOST_CALL mathProtoFuncSin(ExecState*, JSObject*, JSValue, const ArgList&);
-static JSValue JSC_HOST_CALL mathProtoFuncSqrt(ExecState*, JSObject*, JSValue, const ArgList&);
-static JSValue JSC_HOST_CALL mathProtoFuncTan(ExecState*, JSObject*, JSValue, const ArgList&);
+static EncodedJSValue JSC_HOST_CALL mathProtoFuncAbs(ExecState*);
+static EncodedJSValue JSC_HOST_CALL mathProtoFuncACos(ExecState*);
+static EncodedJSValue JSC_HOST_CALL mathProtoFuncASin(ExecState*);
+static EncodedJSValue JSC_HOST_CALL mathProtoFuncATan(ExecState*);
+static EncodedJSValue JSC_HOST_CALL mathProtoFuncATan2(ExecState*);
+static EncodedJSValue JSC_HOST_CALL mathProtoFuncCeil(ExecState*);
+static EncodedJSValue JSC_HOST_CALL mathProtoFuncCos(ExecState*);
+static EncodedJSValue JSC_HOST_CALL mathProtoFuncExp(ExecState*);
+static EncodedJSValue JSC_HOST_CALL mathProtoFuncFloor(ExecState*);
+static EncodedJSValue JSC_HOST_CALL mathProtoFuncLog(ExecState*);
+static EncodedJSValue JSC_HOST_CALL mathProtoFuncMax(ExecState*);
+static EncodedJSValue JSC_HOST_CALL mathProtoFuncMin(ExecState*);
+static EncodedJSValue JSC_HOST_CALL mathProtoFuncPow(ExecState*);
+static EncodedJSValue JSC_HOST_CALL mathProtoFuncRandom(ExecState*);
+static EncodedJSValue JSC_HOST_CALL mathProtoFuncRound(ExecState*);
+static EncodedJSValue JSC_HOST_CALL mathProtoFuncSin(ExecState*);
+static EncodedJSValue JSC_HOST_CALL mathProtoFuncSqrt(ExecState*);
+static EncodedJSValue JSC_HOST_CALL mathProtoFuncTan(ExecState*);

 
 }
 
 
 }
 


@@ -58,9 +59,7 @@ static JSValue JSC_HOST_CALL mathProtoFuncTan(ExecState*, JSObject*, JSValue, co
 
 namespace JSC {
 
 
 namespace JSC {
 

-// ------------------------------ MathObject --------------------------------
-
-const ClassInfo MathObject::info = { "Math", 0, 0, ExecState::mathTable };
+const ClassInfo MathObject::s_info = { "Math", &JSObjectWithGlobalObject::s_info, 0, ExecState::mathTable };

 
 /* Source for MathObject.lut.h
 @begin mathTable
 
 /* Source for MathObject.lut.h
 @begin mathTable


@@ -85,20 +84,20 @@ const ClassInfo MathObject::info = { "Math", 0, 0, ExecState::mathTable };
 @end
 */
 
 @end
 */
 

-MathObject::MathObject(ExecState* exec, NonNullPassRefPtr<Structure> structure)
-    : JSObject(structure)
+MathObject::MathObject(ExecState* exec, JSGlobalObject* globalObject, Structure* structure)
+    : JSObjectWithGlobalObject(globalObject, structure)

 {
 {

-    putDirectWithoutTransition(Identifier(exec, "E"), jsNumber(exec, exp(1.0)), DontDelete | DontEnum | ReadOnly);
-    putDirectWithoutTransition(Identifier(exec, "LN2"), jsNumber(exec, log(2.0)), DontDelete | DontEnum | ReadOnly);
-    putDirectWithoutTransition(Identifier(exec, "LN10"), jsNumber(exec, log(10.0)), DontDelete | DontEnum | ReadOnly);
-    putDirectWithoutTransition(Identifier(exec, "LOG2E"), jsNumber(exec, 1.0 / log(2.0)), DontDelete | DontEnum | ReadOnly);
-    putDirectWithoutTransition(Identifier(exec, "LOG10E"), jsNumber(exec, 1.0 / log(10.0)), DontDelete | DontEnum | ReadOnly);
-    putDirectWithoutTransition(Identifier(exec, "PI"), jsNumber(exec, piDouble), DontDelete | DontEnum | ReadOnly);
-    putDirectWithoutTransition(Identifier(exec, "SQRT1_2"), jsNumber(exec, sqrt(0.5)), DontDelete | DontEnum | ReadOnly);
-    putDirectWithoutTransition(Identifier(exec, "SQRT2"), jsNumber(exec, sqrt(2.0)), DontDelete | DontEnum | ReadOnly);
-}
+    ASSERT(inherits(&s_info));

 
 

-// ECMA 15.8
+    putDirectWithoutTransition(exec->globalData(), Identifier(exec, "E"), jsNumber(exp(1.0)), DontDelete | DontEnum | ReadOnly);
+    putDirectWithoutTransition(exec->globalData(), Identifier(exec, "LN2"), jsNumber(log(2.0)), DontDelete | DontEnum | ReadOnly);
+    putDirectWithoutTransition(exec->globalData(), Identifier(exec, "LN10"), jsNumber(log(10.0)), DontDelete | DontEnum | ReadOnly);
+    putDirectWithoutTransition(exec->globalData(), Identifier(exec, "LOG2E"), jsNumber(1.0 / log(2.0)), DontDelete | DontEnum | ReadOnly);
+    putDirectWithoutTransition(exec->globalData(), Identifier(exec, "LOG10E"), jsNumber(0.4342944819032518), DontDelete | DontEnum | ReadOnly); // See ECMA-262 15.8.1.5
+    putDirectWithoutTransition(exec->globalData(), Identifier(exec, "PI"), jsNumber(piDouble), DontDelete | DontEnum | ReadOnly);
+    putDirectWithoutTransition(exec->globalData(), Identifier(exec, "SQRT1_2"), jsNumber(sqrt(0.5)), DontDelete | DontEnum | ReadOnly);
+    putDirectWithoutTransition(exec->globalData(), Identifier(exec, "SQRT2"), jsNumber(sqrt(2.0)), DontDelete | DontEnum | ReadOnly);
+}

 
 bool MathObject::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot &slot)
 {
 
 bool MathObject::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot &slot)
 {


@@ -112,62 +111,64 @@ bool MathObject::getOwnPropertyDescriptor(ExecState* exec, const Identifier& pro
 
 // ------------------------------ Functions --------------------------------
 
 
 // ------------------------------ Functions --------------------------------
 

-JSValue JSC_HOST_CALL mathProtoFuncAbs(ExecState* exec, JSObject*, JSValue, const ArgList& args)
+EncodedJSValue JSC_HOST_CALL mathProtoFuncAbs(ExecState* exec)

 {
 {

-    return jsNumber(exec, fabs(args.at(0).toNumber(exec)));
+    return JSValue::encode(jsNumber(fabs(exec->argument(0).toNumber(exec))));

 }
 
 }
 

-JSValue JSC_HOST_CALL mathProtoFuncACos(ExecState* exec, JSObject*, JSValue, const ArgList& args)
+EncodedJSValue JSC_HOST_CALL mathProtoFuncACos(ExecState* exec)

 {
 {

-    return jsDoubleNumber(exec, acos(args.at(0).toNumber(exec)));
+    return JSValue::encode(jsDoubleNumber(acos(exec->argument(0).toNumber(exec))));

 }
 
 }
 

-JSValue JSC_HOST_CALL mathProtoFuncASin(ExecState* exec, JSObject*, JSValue, const ArgList& args)
+EncodedJSValue JSC_HOST_CALL mathProtoFuncASin(ExecState* exec)

 {
 {

-    return jsDoubleNumber(exec, asin(args.at(0).toNumber(exec)));
+    return JSValue::encode(jsDoubleNumber(asin(exec->argument(0).toNumber(exec))));

 }
 
 }
 

-JSValue JSC_HOST_CALL mathProtoFuncATan(ExecState* exec, JSObject*, JSValue, const ArgList& args)
+EncodedJSValue JSC_HOST_CALL mathProtoFuncATan(ExecState* exec)

 {
 {

-    return jsDoubleNumber(exec, atan(args.at(0).toNumber(exec)));
+    return JSValue::encode(jsDoubleNumber(atan(exec->argument(0).toNumber(exec))));

 }
 
 }
 

-JSValue JSC_HOST_CALL mathProtoFuncATan2(ExecState* exec, JSObject*, JSValue, const ArgList& args)
+EncodedJSValue JSC_HOST_CALL mathProtoFuncATan2(ExecState* exec)

 {
 {

-    return jsDoubleNumber(exec, atan2(args.at(0).toNumber(exec), args.at(1).toNumber(exec)));
+    double arg0 = exec->argument(0).toNumber(exec);
+    double arg1 = exec->argument(1).toNumber(exec);
+    return JSValue::encode(jsDoubleNumber(atan2(arg0, arg1)));

 }
 
 }
 

-JSValue JSC_HOST_CALL mathProtoFuncCeil(ExecState* exec, JSObject*, JSValue, const ArgList& args)
+EncodedJSValue JSC_HOST_CALL mathProtoFuncCeil(ExecState* exec)

 {
 {

-    return jsNumber(exec, ceil(args.at(0).toNumber(exec)));
+    return JSValue::encode(jsNumber(ceil(exec->argument(0).toNumber(exec))));

 }
 
 }
 

-JSValue JSC_HOST_CALL mathProtoFuncCos(ExecState* exec, JSObject*, JSValue, const ArgList& args)
+EncodedJSValue JSC_HOST_CALL mathProtoFuncCos(ExecState* exec)

 {
 {

-    return jsDoubleNumber(exec, cos(args.at(0).toNumber(exec)));
+    return JSValue::encode(jsDoubleNumber(cos(exec->argument(0).toNumber(exec))));

 }
 
 }
 

-JSValue JSC_HOST_CALL mathProtoFuncExp(ExecState* exec, JSObject*, JSValue, const ArgList& args)
+EncodedJSValue JSC_HOST_CALL mathProtoFuncExp(ExecState* exec)

 {
 {

-    return jsDoubleNumber(exec, exp(args.at(0).toNumber(exec)));
+    return JSValue::encode(jsDoubleNumber(exp(exec->argument(0).toNumber(exec))));

 }
 
 }
 

-JSValue JSC_HOST_CALL mathProtoFuncFloor(ExecState* exec, JSObject*, JSValue, const ArgList& args)
+EncodedJSValue JSC_HOST_CALL mathProtoFuncFloor(ExecState* exec)

 {
 {

-    return jsNumber(exec, floor(args.at(0).toNumber(exec)));
+    return JSValue::encode(jsNumber(floor(exec->argument(0).toNumber(exec))));

 }
 
 }
 

-JSValue JSC_HOST_CALL mathProtoFuncLog(ExecState* exec, JSObject*, JSValue, const ArgList& args)
+EncodedJSValue JSC_HOST_CALL mathProtoFuncLog(ExecState* exec)

 {
 {

-    return jsDoubleNumber(exec, log(args.at(0).toNumber(exec)));
+    return JSValue::encode(jsDoubleNumber(log(exec->argument(0).toNumber(exec))));

 }
 
 }
 

-JSValue JSC_HOST_CALL mathProtoFuncMax(ExecState* exec, JSObject*, JSValue, const ArgList& args)
+EncodedJSValue JSC_HOST_CALL mathProtoFuncMax(ExecState* exec)

 {
 {

-    unsigned argsCount = args.size();
+    unsigned argsCount = exec->argumentCount();

     double result = -Inf;
     for (unsigned k = 0; k < argsCount; ++k) {
     double result = -Inf;
     for (unsigned k = 0; k < argsCount; ++k) {

-        double val = args.at(k).toNumber(exec);
+        double val = exec->argument(k).toNumber(exec);

         if (isnan(val)) {
             result = NaN;
             break;
         if (isnan(val)) {
             result = NaN;
             break;


@@ -175,15 +176,15 @@ JSValue JSC_HOST_CALL mathProtoFuncMax(ExecState* exec, JSObject*, JSValue, cons
         if (val > result || (val == 0 && result == 0 && !signbit(val)))
             result = val;
     }
         if (val > result || (val == 0 && result == 0 && !signbit(val)))
             result = val;
     }

-    return jsNumber(exec, result);
+    return JSValue::encode(jsNumber(result));

 }
 
 }
 

-JSValue JSC_HOST_CALL mathProtoFuncMin(ExecState* exec, JSObject*, JSValue, const ArgList& args)
+EncodedJSValue JSC_HOST_CALL mathProtoFuncMin(ExecState* exec)

 {
 {

-    unsigned argsCount = args.size();
+    unsigned argsCount = exec->argumentCount();

     double result = +Inf;
     for (unsigned k = 0; k < argsCount; ++k) {
     double result = +Inf;
     for (unsigned k = 0; k < argsCount; ++k) {

-        double val = args.at(k).toNumber(exec);
+        double val = exec->argument(k).toNumber(exec);

         if (isnan(val)) {
             result = NaN;
             break;
         if (isnan(val)) {
             result = NaN;
             break;


@@ -191,49 +192,48 @@ JSValue JSC_HOST_CALL mathProtoFuncMin(ExecState* exec, JSObject*, JSValue, cons
         if (val < result || (val == 0 && result == 0 && signbit(val)))
             result = val;
     }
         if (val < result || (val == 0 && result == 0 && signbit(val)))
             result = val;
     }

-    return jsNumber(exec, result);
+    return JSValue::encode(jsNumber(result));

 }
 
 }
 

-JSValue JSC_HOST_CALL mathProtoFuncPow(ExecState* exec, JSObject*, JSValue, const ArgList& args)
+EncodedJSValue JSC_HOST_CALL mathProtoFuncPow(ExecState* exec)

 {
     // ECMA 15.8.2.1.13
 
 {
     // ECMA 15.8.2.1.13
 

-    double arg = args.at(0).toNumber(exec);
-    double arg2 = args.at(1).toNumber(exec);
+    double arg = exec->argument(0).toNumber(exec);
+    double arg2 = exec->argument(1).toNumber(exec);

 
     if (isnan(arg2))
 
     if (isnan(arg2))

-        return jsNaN(exec);
+        return JSValue::encode(jsNaN());

     if (isinf(arg2) && fabs(arg) == 1)
     if (isinf(arg2) && fabs(arg) == 1)

-        return jsNaN(exec);
-    return jsNumber(exec, pow(arg, arg2));
+        return JSValue::encode(jsNaN());
+    return JSValue::encode(jsNumber(pow(arg, arg2)));

 }
 
 }
 

-JSValue JSC_HOST_CALL mathProtoFuncRandom(ExecState* exec, JSObject*, JSValue, const ArgList&)
+EncodedJSValue JSC_HOST_CALL mathProtoFuncRandom(ExecState* exec)

 {
 {

-    return jsDoubleNumber(exec, exec->globalData().weakRandom.get());
+    return JSValue::encode(jsDoubleNumber(exec->lexicalGlobalObject()->weakRandomNumber()));

 }
 
 }
 

-JSValue JSC_HOST_CALL mathProtoFuncRound(ExecState* exec, JSObject*, JSValue, const ArgList& args)
+EncodedJSValue JSC_HOST_CALL mathProtoFuncRound(ExecState* exec)

 {
 {

-    double arg = args.at(0).toNumber(exec);
-    if (signbit(arg) && arg >= -0.5)
-         return jsNumber(exec, -0.0);
-    return jsNumber(exec, floor(arg + 0.5));
+    double arg = exec->argument(0).toNumber(exec);
+    double integer = ceil(arg);
+    return JSValue::encode(jsNumber(integer - (integer - arg > 0.5)));

 }
 
 }
 

-JSValue JSC_HOST_CALL mathProtoFuncSin(ExecState* exec, JSObject*, JSValue, const ArgList& args)
+EncodedJSValue JSC_HOST_CALL mathProtoFuncSin(ExecState* exec)

 {
 {

-    return jsDoubleNumber(exec, sin(args.at(0).toNumber(exec)));
+    return JSValue::encode(exec->globalData().cachedSin(exec->argument(0).toNumber(exec)));

 }
 
 }
 

-JSValue JSC_HOST_CALL mathProtoFuncSqrt(ExecState* exec, JSObject*, JSValue, const ArgList& args)
+EncodedJSValue JSC_HOST_CALL mathProtoFuncSqrt(ExecState* exec)

 {
 {

-    return jsDoubleNumber(exec, sqrt(args.at(0).toNumber(exec)));
+    return JSValue::encode(jsDoubleNumber(sqrt(exec->argument(0).toNumber(exec))));

 }
 
 }
 

-JSValue JSC_HOST_CALL mathProtoFuncTan(ExecState* exec, JSObject*, JSValue, const ArgList& args)
+EncodedJSValue JSC_HOST_CALL mathProtoFuncTan(ExecState* exec)

 {
 {

-    return jsDoubleNumber(exec, tan(args.at(0).toNumber(exec)));
+    return JSValue::encode(jsDoubleNumber(tan(exec->argument(0).toNumber(exec))));

 }
 
 } // namespace JSC
 }
 
 } // namespace JSC