Changeset 43130 in webkit for trunk/JavaScriptCore/runtime

Timestamp:

May 1, 2009, 5:25:41 PM (16 years ago)

Author:

[email protected]

Message:

2009-05-01 Sam Weinig <​[email protected]>

Reviewed by Geoff "The Minneapolis" Garen.

Add mechanism to vend heap allocated JS numbers to JavaScriptCore API clients with a
representation that is independent of the number representation in the VM.

• Numbers leaving the interpreter are converted to a tagged JSNumberCell.
• The numbers coming into the interpreter (asserted to be the tagged JSNumberCell) are converted back to the VM's internal number representation.

• API/APICast.h: (toJS): (toRef):
• API/JSBase.cpp: (JSEvaluateScript): (JSCheckScriptSyntax):
• API/JSCallbackConstructor.cpp: (JSC::constructJSCallback):
• API/JSCallbackFunction.cpp: (JSC::JSCallbackFunction::call):
• API/JSCallbackObjectFunctions.h: (JSC::::getOwnPropertySlot): (JSC::::put): (JSC::::deleteProperty): (JSC::::construct): (JSC::::hasInstance): (JSC::::call): (JSC::::toNumber): (JSC::::toString): (JSC::::staticValueGetter): (JSC::::callbackGetter):
• API/JSObjectRef.cpp: (JSObjectMakeFunction): (JSObjectMakeArray): (JSObjectMakeDate): (JSObjectMakeError): (JSObjectMakeRegExp): (JSObjectGetPrototype): (JSObjectSetPrototype): (JSObjectGetProperty): (JSObjectSetProperty): (JSObjectGetPropertyAtIndex): (JSObjectSetPropertyAtIndex): (JSObjectDeleteProperty): (JSObjectCallAsFunction): (JSObjectCallAsConstructor):
• API/JSValueRef.cpp: (JSValueGetType): (JSValueIsUndefined): (JSValueIsNull): (JSValueIsBoolean): (JSValueIsNumber): (JSValueIsString): (JSValueIsObject): (JSValueIsObjectOfClass): (JSValueIsEqual): (JSValueIsStrictEqual): (JSValueIsInstanceOfConstructor): (JSValueMakeUndefined): (JSValueMakeNull): (JSValueMakeBoolean): (JSValueMakeNumber): (JSValueMakeString): (JSValueToBoolean): (JSValueToNumber): (JSValueToStringCopy): (JSValueToObject): (JSValueProtect): (JSValueUnprotect):
• runtime/JSNumberCell.cpp: (JSC::jsAPIMangledNumber):
• runtime/JSNumberCell.h: (JSC::JSNumberCell::isAPIMangledNumber): (JSC::JSNumberCell::): (JSC::JSNumberCell::JSNumberCell): (JSC::JSValue::isAPIMangledNumber):
• runtime/JSValue.h:

Location:

trunk/JavaScriptCore/runtime

Files:

• JSNumberCell.cpp (modified) (1 diff)
• JSNumberCell.h (modified) (4 diffs)
• JSValue.h (modified) (1 diff)

trunk/JavaScriptCore/runtime/JSNumberCell.cpp

@@ -114 +114 @@
 }
 
+JSValue jsAPIMangledNumber(ExecState* exec, double d)
+{
+    return new (exec) JSNumberCell(JSNumberCell::APIMangled, d);
+}
+
 #else
 

trunk/JavaScriptCore/runtime/JSNumberCell.h

@@ -53 +53 @@
         friend JSValue jsNumberCell(JSGlobalData*, double);
         friend JSValue jsNumberCell(ExecState*, double);
+        friend JSValue jsAPIMangledNumber(ExecState*, double);
     public:
         double value() const { return m_value; }
@@ -66 +67 @@
         virtual JSObject* toThisObject(ExecState*) const;
         virtual JSValue getJSNumber();
+
+        static const uintptr_t JSAPIMangledMagicNumber = 0xbbadbeef;
+        bool isAPIMangledNumber() const { return m_structure == reinterpret_cast<Structure*>(JSAPIMangledMagicNumber); }
 
         void* operator new(size_t size, ExecState* exec)
@@ -100 +104 @@
         }
 
+        enum APIMangledTag { APIMangled };
+        JSNumberCell(APIMangledTag, double value)
+            : JSCell(reinterpret_cast<Structure*>(JSAPIMangledMagicNumber))
+            , m_value(value)
+        {
+        }
+
         virtual bool getUInt32(uint32_t&) const;
         virtual bool getTruncatedInt32(int32_t&) const;
@@ -223 +234 @@
         ASSERT(isNumber());
         return JSImmediate::isImmediate(asValue()) ? JSImmediate::toDouble(asValue()) : getDoubleNumber();
+    }
+
+    JSValue jsAPIMangledNumber(ExecState* exec, double);
+
+    inline bool JSValue::isAPIMangledNumber()
+    {
+        ASSERT(isNumber());
+        return JSImmediate::isImmediate(asValue()) ? false : asNumberCell(asValue())->isAPIMangledNumber();
     }
 

trunk/JavaScriptCore/runtime/JSValue.h

@@ -151 +151 @@
         float toFloat(ExecState* exec) const { return static_cast<float>(toNumber(exec)); }
 
+        // API Mangled Numbers
+        bool isAPIMangledNumber();
+
         // Garbage collection.
         void mark();