Changeset 37845 in webkit for trunk/JavaScriptCore/VM/Machine.h

Timestamp:

Oct 24, 2008, 9:22:51 AM (17 years ago)

Author:

Darin Adler

Message:

JavaScriptCore:

2008-10-24 Darin Adler <Darin Adler>

• finish rolling out ​https://bugs.webkit.org/show_bug.cgi?id=21732

• API/APICast.h:
• API/JSCallbackConstructor.h:
• API/JSCallbackFunction.cpp:
• API/JSCallbackFunction.h:
• API/JSCallbackObject.h:
• API/JSCallbackObjectFunctions.h:
• API/JSContextRef.cpp:
• API/JSObjectRef.cpp:
• API/JSValueRef.cpp:
• VM/CTI.cpp:
• VM/CTI.h:
• VM/CodeBlock.cpp:
• VM/CodeBlock.h:
• VM/CodeGenerator.cpp:
• VM/CodeGenerator.h:
• VM/ExceptionHelpers.cpp:
• VM/ExceptionHelpers.h:
• VM/JSPropertyNameIterator.cpp:
• VM/JSPropertyNameIterator.h:
• VM/Machine.cpp:
• VM/Machine.h:
• VM/Register.h:
• kjs/ArgList.cpp:
• kjs/ArgList.h:
• kjs/Arguments.cpp:
• kjs/Arguments.h:
• kjs/ArrayConstructor.cpp:
• kjs/ArrayPrototype.cpp:
• kjs/BooleanConstructor.cpp:
• kjs/BooleanConstructor.h:
• kjs/BooleanObject.h:
• kjs/BooleanPrototype.cpp:
• kjs/CallData.cpp:
• kjs/CallData.h:
• kjs/ConstructData.cpp:
• kjs/ConstructData.h:
• kjs/DateConstructor.cpp:
• kjs/DateInstance.h:
• kjs/DatePrototype.cpp:
• kjs/DatePrototype.h:
• kjs/DebuggerCallFrame.cpp:
• kjs/DebuggerCallFrame.h:
• kjs/ErrorConstructor.cpp:
• kjs/ErrorPrototype.cpp:
• kjs/ExecState.cpp:
• kjs/ExecState.h:
• kjs/FunctionConstructor.cpp:
• kjs/FunctionPrototype.cpp:
• kjs/FunctionPrototype.h:
• kjs/GetterSetter.cpp:
• kjs/GetterSetter.h:
• kjs/InternalFunction.h:
• kjs/JSActivation.cpp:
• kjs/JSActivation.h:
• kjs/JSArray.cpp:
• kjs/JSArray.h:
• kjs/JSCell.cpp:
• kjs/JSCell.h:
• kjs/JSFunction.cpp:
• kjs/JSFunction.h:
• kjs/JSGlobalData.h:
• kjs/JSGlobalObject.cpp:
• kjs/JSGlobalObject.h:
• kjs/JSGlobalObjectFunctions.cpp:
• kjs/JSGlobalObjectFunctions.h:
• kjs/JSImmediate.cpp:
• kjs/JSImmediate.h:
• kjs/JSNotAnObject.cpp:
• kjs/JSNotAnObject.h:
• kjs/JSNumberCell.cpp:
• kjs/JSNumberCell.h:
• kjs/JSObject.cpp:
• kjs/JSObject.h:
• kjs/JSStaticScopeObject.cpp:
• kjs/JSStaticScopeObject.h:
• kjs/JSString.cpp:
• kjs/JSString.h:
• kjs/JSValue.h:
• kjs/JSVariableObject.h:
• kjs/JSWrapperObject.h:
• kjs/MathObject.cpp:
• kjs/MathObject.h:
• kjs/NativeErrorConstructor.cpp:
• kjs/NumberConstructor.cpp:
• kjs/NumberConstructor.h:
• kjs/NumberObject.cpp:
• kjs/NumberObject.h:
• kjs/NumberPrototype.cpp:
• kjs/ObjectConstructor.cpp:
• kjs/ObjectPrototype.cpp:
• kjs/ObjectPrototype.h:
• kjs/PropertyMap.h:
• kjs/PropertySlot.cpp:
• kjs/PropertySlot.h:
• kjs/RegExpConstructor.cpp:
• kjs/RegExpConstructor.h:
• kjs/RegExpMatchesArray.h:
• kjs/RegExpObject.cpp:
• kjs/RegExpObject.h:
• kjs/RegExpPrototype.cpp:
• kjs/Shell.cpp:
• kjs/StringConstructor.cpp:
• kjs/StringObject.cpp:
• kjs/StringObject.h:
• kjs/StringObjectThatMasqueradesAsUndefined.h:
• kjs/StringPrototype.cpp:
• kjs/StructureID.cpp:
• kjs/StructureID.h:
• kjs/collector.cpp:
• kjs/collector.h:
• kjs/completion.h:
• kjs/grammar.y:
• kjs/interpreter.cpp:
• kjs/interpreter.h:
• kjs/lookup.cpp:
• kjs/lookup.h:
• kjs/nodes.h:
• kjs/operations.cpp:
• kjs/operations.h:
• kjs/protect.h:
• profiler/ProfileGenerator.cpp:
• profiler/Profiler.cpp:
• profiler/Profiler.h: Use JSValue* instead of JSValuePtr.

JavaScriptGlue:

2008-10-24 Darin Adler <Darin Adler>

• finish rolling out ​https://bugs.webkit.org/show_bug.cgi?id=21732

• JSObject.cpp: (nativeCallFunction):
• JSUtils.cpp: (KJSValueToJSObject): (JSObjectKJSValue): (KJSValueToCFTypeInternal): (KJSValueToCFType):
• JSUtils.h:
• JSValueWrapper.cpp: (JSValueWrapper::JSValueWrapper): (JSValueWrapper::GetValue): (JSValueWrapper::JSObjectCopyProperty): (JSValueWrapper::JSObjectSetProperty): (JSValueWrapper::JSObjectCallFunction):
• JSValueWrapper.h:
• UserObjectImp.cpp: (UserObjectImp::callAsFunction): (UserObjectImp::userObjectGetter): (UserObjectImp::getOwnPropertySlot): (UserObjectImp::put): (UserObjectImp::toPrimitive):
• UserObjectImp.h: (UserObjectImp::createStructureID): Use JSValue* instead of JSValuePtr.

WebCore:

2008-10-24 Darin Adler <Darin Adler>

• finish rolling out ​https://bugs.webkit.org/show_bug.cgi?id=21732

• bindings/js/JSAttrCustom.cpp:
• bindings/js/JSCSSRuleCustom.cpp:
• bindings/js/JSCSSStyleDeclarationCustom.cpp:
• bindings/js/JSCSSValueCustom.cpp:
• bindings/js/JSCanvasPixelArrayCustom.h:
• bindings/js/JSCanvasRenderingContext2DCustom.cpp:
• bindings/js/JSClipboardCustom.cpp:
• bindings/js/JSConsoleCustom.cpp:
• bindings/js/JSCustomSQLStatementCallback.cpp:
• bindings/js/JSCustomSQLStatementErrorCallback.cpp:
• bindings/js/JSCustomSQLTransactionCallback.cpp:
• bindings/js/JSCustomSQLTransactionErrorCallback.cpp:
• bindings/js/JSCustomVoidCallback.cpp:
• bindings/js/JSCustomVoidCallback.h:
• bindings/js/JSCustomXPathNSResolver.cpp:
• bindings/js/JSCustomXPathNSResolver.h:
• bindings/js/JSDOMApplicationCacheCustom.cpp:
• bindings/js/JSDOMBinding.cpp:
• bindings/js/JSDOMBinding.h:
• bindings/js/JSDOMWindowBase.cpp:
• bindings/js/JSDOMWindowBase.h:
• bindings/js/JSDOMWindowCustom.cpp:
• bindings/js/JSDOMWindowCustom.h:
• bindings/js/JSDOMWindowShell.cpp:
• bindings/js/JSDOMWindowShell.h:
• bindings/js/JSDatabaseCustom.cpp:
• bindings/js/JSDedicatedWorkerCustom.cpp:
• bindings/js/JSDocumentCustom.cpp:
• bindings/js/JSElementCustom.cpp:
• bindings/js/JSEventCustom.cpp:
• bindings/js/JSEventListener.cpp:
• bindings/js/JSEventTarget.cpp:
• bindings/js/JSEventTarget.h:
• bindings/js/JSEventTargetBase.h:
• bindings/js/JSEventTargetNodeCustom.cpp:
• bindings/js/JSHTMLAllCollection.h:
• bindings/js/JSHTMLAppletElementCustom.cpp:
• bindings/js/JSHTMLCollectionCustom.cpp:
• bindings/js/JSHTMLDocumentCustom.cpp:
• bindings/js/JSHTMLEmbedElementCustom.cpp:
• bindings/js/JSHTMLFormElementCustom.cpp:
• bindings/js/JSHTMLFrameElementCustom.cpp:
• bindings/js/JSHTMLFrameSetElementCustom.cpp:
• bindings/js/JSHTMLIFrameElementCustom.cpp:
• bindings/js/JSHTMLInputElementCustom.cpp:
• bindings/js/JSHTMLObjectElementCustom.cpp:
• bindings/js/JSHTMLOptionsCollectionCustom.cpp:
• bindings/js/JSHTMLSelectElementCustom.cpp:
• bindings/js/JSHTMLSelectElementCustom.h:
• bindings/js/JSHistoryCustom.cpp:
• bindings/js/JSImageDataCustom.cpp:
• bindings/js/JSInspectedObjectWrapper.cpp:
• bindings/js/JSInspectedObjectWrapper.h:
• bindings/js/JSInspectorCallbackWrapper.cpp:
• bindings/js/JSInspectorCallbackWrapper.h:
• bindings/js/JSJavaScriptCallFrameCustom.cpp:
• bindings/js/JSLocationCustom.cpp:
• bindings/js/JSMessagePortCustom.cpp:
• bindings/js/JSMimeTypeArrayCustom.cpp:
• bindings/js/JSNamedNodeMapCustom.cpp:
• bindings/js/JSNamedNodesCollection.cpp:
• bindings/js/JSNamedNodesCollection.h:
• bindings/js/JSNavigatorCustom.cpp:
• bindings/js/JSNodeCustom.cpp:
• bindings/js/JSNodeFilterCondition.cpp:
• bindings/js/JSNodeFilterCondition.h:
• bindings/js/JSNodeFilterCustom.cpp:
• bindings/js/JSNodeIteratorCustom.cpp:
• bindings/js/JSNodeListCustom.cpp:
• bindings/js/JSPluginArrayCustom.cpp:
• bindings/js/JSPluginCustom.cpp:
• bindings/js/JSPluginElementFunctions.cpp:
• bindings/js/JSPluginElementFunctions.h:
• bindings/js/JSQuarantinedObjectWrapper.cpp:
• bindings/js/JSQuarantinedObjectWrapper.h:
• bindings/js/JSRGBColor.cpp:
• bindings/js/JSRGBColor.h:
• bindings/js/JSSQLResultSetRowListCustom.cpp:
• bindings/js/JSSQLTransactionCustom.cpp:
• bindings/js/JSSVGElementInstanceCustom.cpp:
• bindings/js/JSSVGLengthCustom.cpp:
• bindings/js/JSSVGMatrixCustom.cpp:
• bindings/js/JSSVGPathSegCustom.cpp:
• bindings/js/JSSVGPathSegListCustom.cpp:
• bindings/js/JSSVGPointListCustom.cpp:
• bindings/js/JSSVGTransformListCustom.cpp:
• bindings/js/JSStorageCustom.cpp:
• bindings/js/JSStyleSheetCustom.cpp:
• bindings/js/JSStyleSheetListCustom.cpp:
• bindings/js/JSTextCustom.cpp:
• bindings/js/JSTreeWalkerCustom.cpp:
• bindings/js/JSXMLHttpRequestCustom.cpp:
• bindings/js/JSXMLHttpRequestUploadCustom.cpp:
• bindings/js/JSXSLTProcessorCustom.cpp:
• bindings/js/ScheduledAction.cpp:
• bindings/js/ScheduledAction.h:
• bindings/js/ScriptController.cpp:
• bindings/js/ScriptController.h:
• bindings/objc/WebScriptObject.mm:
• bindings/objc/WebScriptObjectPrivate.h:
• bindings/scripts/CodeGeneratorJS.pm:
• bridge/NP_jsobject.cpp:
• bridge/c/c_instance.cpp:
• bridge/c/c_instance.h:
• bridge/c/c_runtime.cpp:
• bridge/c/c_runtime.h:
• bridge/c/c_utility.cpp:
• bridge/c/c_utility.h:
• bridge/jni/jni_instance.cpp:
• bridge/jni/jni_instance.h:
• bridge/jni/jni_jsobject.h:
• bridge/jni/jni_jsobject.mm:
• bridge/jni/jni_objc.mm:
• bridge/jni/jni_runtime.cpp:
• bridge/jni/jni_runtime.h:
• bridge/jni/jni_utility.cpp:
• bridge/jni/jni_utility.h:
• bridge/objc/WebScriptObject.h:
• bridge/objc/objc_class.h:
• bridge/objc/objc_class.mm:
• bridge/objc/objc_instance.h:
• bridge/objc/objc_instance.mm:
• bridge/objc/objc_runtime.h:
• bridge/objc/objc_runtime.mm:
• bridge/objc/objc_utility.h:
• bridge/objc/objc_utility.mm:
• bridge/qt/qt_class.cpp:
• bridge/qt/qt_class.h:
• bridge/qt/qt_instance.cpp:
• bridge/qt/qt_instance.h:
• bridge/qt/qt_runtime.cpp:
• bridge/qt/qt_runtime.h:
• bridge/runtime.cpp:
• bridge/runtime.h:
• bridge/runtime_array.cpp:
• bridge/runtime_array.h:
• bridge/runtime_method.cpp:
• bridge/runtime_method.h:
• bridge/runtime_object.cpp:
• bridge/runtime_object.h:
• bridge/testqtbindings.cpp:
• inspector/JavaScriptCallFrame.cpp:
• inspector/JavaScriptCallFrame.h:
• inspector/JavaScriptProfile.cpp:
• inspector/JavaScriptProfile.h:
• inspector/JavaScriptProfileNode.cpp:
• inspector/JavaScriptProfileNode.h:
• loader/FrameLoader.cpp:
• loader/FrameLoader.h:
• page/Console.cpp:
• page/Console.h:
• plugins/MimeTypeArray.h:
• plugins/Plugin.h:
• plugins/PluginArray.h:
• plugins/PluginView.cpp:
• xml/XMLHttpRequest.cpp: Use JSValue* instead of JSValuePtr.

WebKit/mac:

2008-10-24 Darin Adler <Darin Adler>

• finish rolling out ​https://bugs.webkit.org/show_bug.cgi?id=21732

• WebView/WebFrame.mm: (-[WebFrame _stringByEvaluatingJavaScriptFromString:forceUserGesture:]):
• WebView/WebScriptDebugDelegate.mm: (-[WebScriptCallFrame _convertValueToObjcValue:]): (-[WebScriptCallFrame exception]): (-[WebScriptCallFrame evaluateWebScript:]):
• WebView/WebView.mm: (aeDescFromJSValue): (-[WebView aeDescByEvaluatingJavaScriptFromString:]): Use JSValue* instead of JSValuePtr.

WebKit/qt:

2008-10-24 Darin Adler <Darin Adler>

• finish rolling out ​https://bugs.webkit.org/show_bug.cgi?id=21732

• Api/qwebframe.cpp: (QWebFrame::evaluateJavaScript): Use JSValue* instead of JSValuePtr.

WebKit/win:

2008-10-24 Darin Adler <Darin Adler>

• finish rolling out ​https://bugs.webkit.org/show_bug.cgi?id=21732

• WebScriptCallFrame.cpp: (WebScriptCallFrame::jsValueToString): (WebScriptCallFrame::stringByEvaluatingJavaScriptFromString): (WebScriptCallFrame::valueForVariable): (WebScriptCallFrame::valueByEvaluatingJavaScriptFromString):
• WebScriptCallFrame.h:
• WebView.cpp: (WebView::stringByEvaluatingJavaScriptFromString): Use JSValue* instead of JSValuePtr.

WebKit/wx:

2008-10-24 Darin Adler <Darin Adler>

• finish rolling out ​https://bugs.webkit.org/show_bug.cgi?id=21732

• WebFrame.cpp: (wxWebFrame::RunScript): Use JSValue* instead of JSValuePtr.

File:

• trunk/JavaScriptCore/VM/Machine.h (modified) (4 diffs)

trunk/JavaScriptCore/VM/Machine.h

@@ -125 +125 @@
         bool isOpcode(Opcode opcode);
         
-        JSValuePtr execute(ProgramNode*, CallFrame*, ScopeChainNode*, JSObject* thisObj, JSValuePtr* exception);
-        JSValuePtr execute(FunctionBodyNode*, CallFrame*, JSFunction*, JSObject* thisObj, const ArgList& args, ScopeChainNode*, JSValuePtr* exception);
-        JSValuePtr execute(EvalNode* evalNode, CallFrame* exec, JSObject* thisObj, ScopeChainNode* scopeChain, JSValuePtr* exception);
-
-        JSValuePtr retrieveArguments(CallFrame*, JSFunction*) const;
-        JSValuePtr retrieveCaller(CallFrame*, InternalFunction*) const;
-        void retrieveLastCaller(CallFrame*, int& lineNumber, intptr_t& sourceID, UString& sourceURL, JSValuePtr& function) const;
+        JSValue* execute(ProgramNode*, CallFrame*, ScopeChainNode*, JSObject* thisObj, JSValue** exception);
+        JSValue* execute(FunctionBodyNode*, CallFrame*, JSFunction*, JSObject* thisObj, const ArgList& args, ScopeChainNode*, JSValue** exception);
+        JSValue* execute(EvalNode* evalNode, CallFrame* exec, JSObject* thisObj, ScopeChainNode* scopeChain, JSValue** exception);
+
+        JSValue* retrieveArguments(CallFrame*, JSFunction*) const;
+        JSValue* retrieveCaller(CallFrame*, InternalFunction*) const;
+        void retrieveLastCaller(CallFrame*, int& lineNumber, intptr_t& sourceID, UString& sourceURL, JSValue*& function) const;
         
         void getArgumentsData(CallFrame*, JSFunction*&, ptrdiff_t& firstParameterIndex, Register*& argv, int& argc);
@@ -269 +269 @@
         static const int initialTickCountThreshold = 1024;
 
-        bool isJSArray(JSValuePtr v) { return !JSImmediate::isImmediate(v) && v->asCell()->vptr() == m_jsArrayVptr; }
-        bool isJSString(JSValuePtr v) { return !JSImmediate::isImmediate(v) && v->asCell()->vptr() == m_jsStringVptr; }
+        bool isJSArray(JSValue* v) { return !JSImmediate::isImmediate(v) && v->asCell()->vptr() == m_jsArrayVptr; }
+        bool isJSString(JSValue* v) { return !JSImmediate::isImmediate(v) && v->asCell()->vptr() == m_jsStringVptr; }
 
     private:
         enum ExecutionFlag { Normal, InitializeAndReturn };
 
-        NEVER_INLINE JSValuePtr callEval(CallFrame*, JSObject* thisObject, ScopeChainNode*, RegisterFile*, int argv, int argc, JSValuePtr& exceptionValue);
-        JSValuePtr execute(EvalNode*, CallFrame*, JSObject* thisObject, int registerOffset, ScopeChainNode*, JSValuePtr* exception);
+        NEVER_INLINE JSValue* callEval(CallFrame*, JSObject* thisObject, ScopeChainNode*, RegisterFile*, int argv, int argc, JSValue*& exceptionValue);
+        JSValue* execute(EvalNode*, CallFrame*, JSObject* thisObject, int registerOffset, ScopeChainNode*, JSValue** exception);
 
         NEVER_INLINE void debug(CallFrame*, DebugHookID, int firstLine, int lastLine);
 
-        NEVER_INLINE bool resolve(CallFrame*, Instruction*, JSValuePtr& exceptionValue);
-        NEVER_INLINE bool resolveSkip(CallFrame*, Instruction*, JSValuePtr& exceptionValue);
-        NEVER_INLINE bool resolveGlobal(CallFrame*, Instruction*, JSValuePtr& exceptionValue);
+        NEVER_INLINE bool resolve(CallFrame*, Instruction*, JSValue*& exceptionValue);
+        NEVER_INLINE bool resolveSkip(CallFrame*, Instruction*, JSValue*& exceptionValue);
+        NEVER_INLINE bool resolveGlobal(CallFrame*, Instruction*, JSValue*& exceptionValue);
         NEVER_INLINE void resolveBase(CallFrame*, Instruction* vPC);
-        NEVER_INLINE bool resolveBaseAndProperty(CallFrame*, Instruction*, JSValuePtr& exceptionValue);
+        NEVER_INLINE bool resolveBaseAndProperty(CallFrame*, Instruction*, JSValue*& exceptionValue);
         NEVER_INLINE ScopeChainNode* createExceptionScope(CallFrame*, const Instruction* vPC);
 
-        NEVER_INLINE bool unwindCallFrame(CallFrame*&, JSValuePtr, const Instruction*&, CodeBlock*&);
-        NEVER_INLINE Instruction* throwException(CallFrame*&, JSValuePtr&, const Instruction*, bool);
-        NEVER_INLINE bool resolveBaseAndFunc(CallFrame*, Instruction*, JSValuePtr& exceptionValue);
+        NEVER_INLINE bool unwindCallFrame(CallFrame*&, JSValue*, const Instruction*&, CodeBlock*&);
+        NEVER_INLINE Instruction* throwException(CallFrame*&, JSValue*&, const Instruction*, bool);
+        NEVER_INLINE bool resolveBaseAndFunc(CallFrame*, Instruction*, JSValue*& exceptionValue);
 
         static ALWAYS_INLINE CallFrame* slideRegisterWindowForCall(CodeBlock*, RegisterFile*, CallFrame*, size_t registerOffset, int argc);
@@ -295 +295 @@
         static CallFrame* findFunctionCallFrame(CallFrame*, InternalFunction*);
 
-        JSValuePtr privateExecute(ExecutionFlag, RegisterFile*, CallFrame*, JSValuePtr* exception);
+        JSValue* privateExecute(ExecutionFlag, RegisterFile*, CallFrame*, JSValue** exception);
 
         void dumpCallFrame(const RegisterFile*, CallFrame*);
         void dumpRegisters(const RegisterFile*, CallFrame*);
 
-        JSValuePtr checkTimeout(JSGlobalObject*);
+        JSValue* checkTimeout(JSGlobalObject*);
         void resetTimeoutCheck();
 
-        void tryCacheGetByID(CallFrame*, CodeBlock*, Instruction*, JSValuePtr baseValue, const Identifier& propertyName, const PropertySlot&);
+        void tryCacheGetByID(CallFrame*, CodeBlock*, Instruction*, JSValue* baseValue, const Identifier& propertyName, const PropertySlot&);
         void uncacheGetByID(CodeBlock*, Instruction* vPC);
-        void tryCachePutByID(CallFrame*, CodeBlock*, Instruction*, JSValuePtr baseValue, const PutPropertySlot&);
+        void tryCachePutByID(CallFrame*, CodeBlock*, Instruction*, JSValue* baseValue, const PutPropertySlot&);
         void uncachePutByID(CodeBlock*, Instruction* vPC);
         
@@ -313 +313 @@
         static void throwStackOverflowPreviousFrame(CallFrame*, JSGlobalData*, void*& returnAddress);
 
-        void tryCTICacheGetByID(CallFrame*, CodeBlock*, void* returnAddress, JSValuePtr baseValue, const Identifier& propertyName, const PropertySlot&);
-        void tryCTICachePutByID(CallFrame*, CodeBlock*, void* returnAddress, JSValuePtr baseValue, const PutPropertySlot&);
+        void tryCTICacheGetByID(CallFrame*, CodeBlock*, void* returnAddress, JSValue* baseValue, const Identifier& propertyName, const PropertySlot&);
+        void tryCTICachePutByID(CallFrame*, CodeBlock*, void* returnAddress, JSValue* baseValue, const PutPropertySlot&);
 
         void* getCTIArrayLengthTrampoline(CallFrame*, CodeBlock*);