Changeset 43130 in webkit for trunk/JavaScriptCore/API/APICast.h

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:

File:

• trunk/JavaScriptCore/API/APICast.h (modified) (3 diffs)

trunk/JavaScriptCore/API/APICast.h

@@ -27 +27 @@
 #define APICast_h
 
+#include "JSNumberCell.h"
 #include "JSValue.h"
+#include <wtf/Platform.h>
 
 namespace JSC {
@@ -56 +58 @@
 }
 
-inline JSC::JSValue toJS(JSValueRef v)
+inline JSC::JSValue toJS(JSC::ExecState* exec, JSValueRef v)
 {
-    return JSC::JSValue::decode(reinterpret_cast<JSC::EncodedJSValue>(const_cast<OpaqueJSValue*>(v)));
+    JSC::JSValue jsValue = JSC::JSValue::decode(reinterpret_cast<JSC::EncodedJSValue>(const_cast<OpaqueJSValue*>(v)));
+#if !USE(ALTERNATE_JSIMMEDIATE)
+    if (jsValue && jsValue.isNumber()) {
+        ASSERT(jsValue.isAPIMangledNumber());
+        return JSC::jsNumber(exec, jsValue.uncheckedGetNumber());
+    }
+#endif
+    return jsValue;
 }
 
@@ -76 +85 @@
 }
 
-inline JSValueRef toRef(JSC::JSValue v)
+inline JSValueRef toRef(JSC::ExecState* exec, JSC::JSValue v)
 {
+#if !USE(ALTERNATE_JSIMMEDIATE)
+    if (v && v.isNumber()) {
+        ASSERT(!v.isAPIMangledNumber());
+        return reinterpret_cast<JSValueRef>(JSC::JSValue::encode(JSC::jsAPIMangledNumber(exec, v.uncheckedGetNumber())));
+    }
+#endif
     return reinterpret_cast<JSValueRef>(JSC::JSValue::encode(v));
-}
-
-inline JSValueRef* toRef(JSC::JSValue* v)
-{
-    return reinterpret_cast<JSValueRef*>(v);
 }