Changeset 36015 in webkit for trunk/JavaScriptCore/kjs

Timestamp:

Sep 1, 2008, 12:51:33 PM (17 years ago)

Author:

[email protected]

Message:

2008-09-01 Geoffrey Garen <​[email protected]>

Reviewed by Sam Weinig.

Eagerly allocate the Math object's numeric constants. This avoids
constantly reallocating them in loops, and also ensures that the Math
object will not use the single property optimization, which makes
properties ineligible for caching.

SunSpider reports a small speedup, in combination with inline caching.

• kjs/MathObject.cpp: (KJS::MathObject::MathObject): (KJS::MathObject::getOwnPropertySlot):
• kjs/MathObject.h:

Location:

trunk/JavaScriptCore/kjs

Files:

• MathObject.cpp (modified) (3 diffs)
• MathObject.h (modified) (1 diff)

trunk/JavaScriptCore/kjs/MathObject.cpp

@@ -63 +63 @@
 /* Source for MathObject.lut.h
 @begin mathTable
-  E             MathObject::Euler           DontEnum|DontDelete|ReadOnly
-  LN2           MathObject::Ln2             DontEnum|DontDelete|ReadOnly
-  LN10          MathObject::Ln10            DontEnum|DontDelete|ReadOnly
-  LOG2E         MathObject::Log2E           DontEnum|DontDelete|ReadOnly
-  LOG10E        MathObject::Log10E          DontEnum|DontDelete|ReadOnly
-  PI            MathObject::Pi              DontEnum|DontDelete|ReadOnly
-  SQRT1_2       MathObject::Sqrt1_2         DontEnum|DontDelete|ReadOnly
-  SQRT2         MathObject::Sqrt2           DontEnum|DontDelete|ReadOnly
   abs           mathProtoFuncAbs               DontEnum|Function 1
   acos          mathProtoFuncACos              DontEnum|Function 1
@@ -92 +84 @@
 */
 
-MathObject::MathObject(ExecState*, ObjectPrototype* objectPrototype)
+MathObject::MathObject(ExecState* exec, ObjectPrototype* objectPrototype)
     : JSObject(objectPrototype)
 {
+    putDirect(Identifier(exec, "E"), jsNumber(exec, exp(1.0)), DontDelete | DontEnum | ReadOnly);
+    putDirect(Identifier(exec, "LN2"), jsNumber(exec, log(2.0)), DontDelete | DontEnum | ReadOnly);
+    putDirect(Identifier(exec, "LN10"), jsNumber(exec, log(10.0)), DontDelete | DontEnum | ReadOnly);
+    putDirect(Identifier(exec, "LOG2E"), jsNumber(exec, 1.0 / log(2.0)), DontDelete | DontEnum | ReadOnly);
+    putDirect(Identifier(exec, "LOG10E"), jsNumber(exec, 1.0 / log(10.0)), DontDelete | DontEnum | ReadOnly);
+    putDirect(Identifier(exec, "PI"), jsNumber(exec, piDouble), DontDelete | DontEnum | ReadOnly);
+    putDirect(Identifier(exec, "SQRT1_2"), jsNumber(exec, sqrt(0.5)), DontDelete | DontEnum | ReadOnly);
+    putDirect(Identifier(exec, "SQRT2"), jsNumber(exec, sqrt(2.0)), DontDelete | DontEnum | ReadOnly);
 }
 
@@ -101 +101 @@
 bool MathObject::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot &slot)
 {
-    return getStaticPropertySlot<MathObject, JSObject>(exec, ExecState::mathTable(exec), this, propertyName, slot);
-}
-
-JSValue* MathObject::getValueProperty(ExecState* exec, int token) const
-{
-    switch (token) {
-        case Euler:
-            return jsNumber(exec, exp(1.0));
-        case Ln2:
-            return jsNumber(exec, log(2.0));
-        case Ln10:
-            return jsNumber(exec, log(10.0));
-        case Log2E:
-            return jsNumber(exec, 1.0 / log(2.0));
-        case Log10E:
-            return jsNumber(exec, 1.0 / log(10.0));
-        case Pi:
-            return jsNumber(exec, piDouble);
-        case Sqrt1_2:
-            return jsNumber(exec, sqrt(0.5));
-        case Sqrt2:
-            return jsNumber(exec, sqrt(2.0));
-    }
-
-    ASSERT_NOT_REACHED();
-    return 0;
+    const HashEntry* entry = ExecState::mathTable(exec)->entry(exec, propertyName);
+
+    if (!entry)
+        return JSObject::getOwnPropertySlot(exec, propertyName, slot);
+
+    ASSERT(entry->attributes & Function);
+    slot.setStaticEntry(this, entry, staticFunctionGetter);
+    return true;
 }
 

trunk/JavaScriptCore/kjs/MathObject.h

@@ -31 +31 @@
 
         bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&);
-        JSValue* getValueProperty(ExecState*, int token) const;
 
         virtual const ClassInfo* classInfo() const { return &info; }
         static const ClassInfo info;
-
-        enum { Euler, Ln2, Ln10, Log2E, Log10E, Pi, Sqrt1_2, Sqrt2 };
     };