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


Ignore:
Timestamp:
Oct 18, 2008, 6:52:42 PM (17 years ago)
Author:
Darin Adler
Message:

JavaScriptCore:

2008-10-18 Darin Adler <Darin Adler>

Reviewed by Cameron Zwarich.

Use JSValuePtr everywhere instead of JSValue*. In the future, we'll be
changing JSValuePtr to be a class, and then eventually renaming it
to JSValue once that's done.

  • JavaScriptCore.exp: Update entry points, since some now take JSValue* instead of const JSValue*.
  • 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/DebuggerCallFrame.cpp:
  • kjs/DebuggerCallFrame.h:
  • kjs/ErrorConstructor.cpp:
  • kjs/ErrorPrototype.cpp:
  • kjs/ExecState.cpp:
  • kjs/ExecState.h:
  • kjs/FunctionConstructor.cpp:
  • kjs/FunctionPrototype.cpp:
  • 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/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: Replace JSValue* with JSValuePtr.

JavaScriptGlue:

2008-10-18 Darin Adler <Darin Adler>

Reviewed by Cameron Zwarich.

Use JSValuePtr everywhere instead of JSValue*. In the future, we'll be
changing JSValuePtr to be a class, and then eventually renaming it
to JSValue once that's done.

  • JSObject.cpp:
  • JSValueWrapper.cpp:
  • UserObjectImp.cpp:
  • UserObjectImp.h: Replace JSValue* with JSValuePtr.

WebCore:

2008-10-18 Darin Adler <Darin Adler>

Reviewed by Cameron Zwarich.

Use JSValuePtr everywhere instead of JSValue*. In the future, we'll be
changing JSValuePtr to be a class, and then eventually renaming it
to JSValue once that's done.

  • 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/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/JSDocumentCustom.cpp:
  • bindings/js/JSElementCustom.cpp:
  • bindings/js/JSEventCustom.cpp:
  • bindings/js/JSEventListener.cpp:
  • bindings/js/JSEventTarget.cpp:
  • 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/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/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/jni/jni_instance.cpp:
  • bridge/jni/jni_instance.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/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/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:
  • inspector/JavaScriptCallFrame.cpp:
  • inspector/JavaScriptCallFrame.h:
  • inspector/JavaScriptProfile.cpp:
  • inspector/JavaScriptProfileNode.cpp:
  • loader/FrameLoader.cpp:
  • loader/FrameLoader.h:
  • page/Console.cpp:
  • page/Console.h:
  • plugins/MimeTypeArray.h:
  • plugins/Plugin.h:
  • plugins/PluginArray.h:
  • xml/XMLHttpRequest.cpp: Replace JSValue* with JSValuePtr.
File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/JavaScriptCore/VM/Machine.h

    r37681 r37684  
    125125        bool isOpcode(Opcode opcode);
    126126       
    127         JSValue* execute(ProgramNode*, CallFrame*, ScopeChainNode*, JSObject* thisObj, JSValue** exception);
    128         JSValue* execute(FunctionBodyNode*, CallFrame*, JSFunction*, JSObject* thisObj, const ArgList& args, ScopeChainNode*, JSValue** exception);
    129         JSValue* execute(EvalNode* evalNode, CallFrame* exec, JSObject* thisObj, ScopeChainNode* scopeChain, JSValue** exception);
    130 
    131         JSValue* retrieveArguments(CallFrame*, JSFunction*) const;
    132         JSValue* retrieveCaller(CallFrame*, InternalFunction*) const;
    133         void retrieveLastCaller(CallFrame*, int& lineNumber, intptr_t& sourceID, UString& sourceURL, JSValue*& function) const;
     127        JSValuePtr execute(ProgramNode*, CallFrame*, ScopeChainNode*, JSObject* thisObj, JSValuePtr* exception);
     128        JSValuePtr execute(FunctionBodyNode*, CallFrame*, JSFunction*, JSObject* thisObj, const ArgList& args, ScopeChainNode*, JSValuePtr* exception);
     129        JSValuePtr execute(EvalNode* evalNode, CallFrame* exec, JSObject* thisObj, ScopeChainNode* scopeChain, JSValuePtr* exception);
     130
     131        JSValuePtr retrieveArguments(CallFrame*, JSFunction*) const;
     132        JSValuePtr retrieveCaller(CallFrame*, InternalFunction*) const;
     133        void retrieveLastCaller(CallFrame*, int& lineNumber, intptr_t& sourceID, UString& sourceURL, JSValuePtr& function) const;
    134134       
    135135        void getArgumentsData(CallFrame*, JSFunction*&, ptrdiff_t& firstParameterIndex, Register*& argv, int& argc);
    … …  
    165165        static void SFX_CALL cti_register_file_check(CTI_ARGS);
    166166
    167         static JSValue* SFX_CALL cti_op_convert_this(CTI_ARGS);
     167        static JSValuePtr SFX_CALL cti_op_convert_this(CTI_ARGS);
    168168        static void SFX_CALL cti_op_end(CTI_ARGS);
    169         static JSValue* SFX_CALL cti_op_add(CTI_ARGS);
    170         static JSValue* SFX_CALL cti_op_pre_inc(CTI_ARGS);
     169        static JSValuePtr SFX_CALL cti_op_add(CTI_ARGS);
     170        static JSValuePtr SFX_CALL cti_op_pre_inc(CTI_ARGS);
    171171        static int SFX_CALL cti_op_loop_if_less(CTI_ARGS);
    172172        static int SFX_CALL cti_op_loop_if_lesseq(CTI_ARGS);
    173         static JSValue* SFX_CALL cti_op_new_object(CTI_ARGS);
     173        static JSValuePtr SFX_CALL cti_op_new_object(CTI_ARGS);
    174174        static void SFX_CALL cti_op_put_by_id(CTI_ARGS);
    175175        static void SFX_CALL cti_op_put_by_id_second(CTI_ARGS);
    176176        static void SFX_CALL cti_op_put_by_id_generic(CTI_ARGS);
    177177        static void SFX_CALL cti_op_put_by_id_fail(CTI_ARGS);
    178         static JSValue* SFX_CALL cti_op_get_by_id(CTI_ARGS);
    179         static JSValue* SFX_CALL cti_op_get_by_id_second(CTI_ARGS);
    180         static JSValue* SFX_CALL cti_op_get_by_id_generic(CTI_ARGS);
    181         static JSValue* SFX_CALL cti_op_get_by_id_fail(CTI_ARGS);
    182         static JSValue* SFX_CALL cti_op_del_by_id(CTI_ARGS);
    183         static JSValue* SFX_CALL cti_op_instanceof(CTI_ARGS);
    184         static JSValue* SFX_CALL cti_op_mul(CTI_ARGS);
    185         static JSValue* SFX_CALL cti_op_new_func(CTI_ARGS);
     178        static JSValuePtr SFX_CALL cti_op_get_by_id(CTI_ARGS);
     179        static JSValuePtr SFX_CALL cti_op_get_by_id_second(CTI_ARGS);
     180        static JSValuePtr SFX_CALL cti_op_get_by_id_generic(CTI_ARGS);
     181        static JSValuePtr SFX_CALL cti_op_get_by_id_fail(CTI_ARGS);
     182        static JSValuePtr SFX_CALL cti_op_del_by_id(CTI_ARGS);
     183        static JSValuePtr SFX_CALL cti_op_instanceof(CTI_ARGS);
     184        static JSValuePtr SFX_CALL cti_op_mul(CTI_ARGS);
     185        static JSValuePtr SFX_CALL cti_op_new_func(CTI_ARGS);
    186186        static VoidPtrPair SFX_CALL cti_op_call_JSFunction(CTI_ARGS);
    187         static JSValue* SFX_CALL cti_op_call_NotJSFunction(CTI_ARGS);
     187        static JSValuePtr SFX_CALL cti_op_call_NotJSFunction(CTI_ARGS);
    188188        static void SFX_CALL cti_op_create_arguments(CTI_ARGS);
    189189        static void SFX_CALL cti_op_create_arguments_no_params(CTI_ARGS);
    … …  
    191191        static void SFX_CALL cti_op_tear_off_arguments(CTI_ARGS);
    192192        static void SFX_CALL cti_op_ret_scopeChain(CTI_ARGS);
    193         static JSValue* SFX_CALL cti_op_new_array(CTI_ARGS);
    194         static JSValue* SFX_CALL cti_op_resolve(CTI_ARGS);
    195         static JSValue* SFX_CALL cti_op_resolve_global(CTI_ARGS);
    196         static JSValue* SFX_CALL cti_op_construct_JSConstructFast(CTI_ARGS);
     193        static JSValuePtr SFX_CALL cti_op_new_array(CTI_ARGS);
     194        static JSValuePtr SFX_CALL cti_op_resolve(CTI_ARGS);
     195        static JSValuePtr SFX_CALL cti_op_resolve_global(CTI_ARGS);
     196        static JSValuePtr SFX_CALL cti_op_construct_JSConstructFast(CTI_ARGS);
    197197        static VoidPtrPair SFX_CALL cti_op_construct_JSConstruct(CTI_ARGS);
    198         static JSValue* SFX_CALL cti_op_construct_NotJSConstruct(CTI_ARGS);
    199         static JSValue* SFX_CALL cti_op_get_by_val(CTI_ARGS);
     198        static JSValuePtr SFX_CALL cti_op_construct_NotJSConstruct(CTI_ARGS);
     199        static JSValuePtr SFX_CALL cti_op_get_by_val(CTI_ARGS);
    200200        static VoidPtrPair SFX_CALL cti_op_resolve_func(CTI_ARGS);
    201         static JSValue* SFX_CALL cti_op_sub(CTI_ARGS);
     201        static JSValuePtr SFX_CALL cti_op_sub(CTI_ARGS);
    202202        static void SFX_CALL cti_op_put_by_val(CTI_ARGS);
    203203        static void SFX_CALL cti_op_put_by_val_array(CTI_ARGS);
    204         static JSValue* SFX_CALL cti_op_lesseq(CTI_ARGS);
     204        static JSValuePtr SFX_CALL cti_op_lesseq(CTI_ARGS);
    205205        static int SFX_CALL cti_op_loop_if_true(CTI_ARGS);
    206         static JSValue* SFX_CALL cti_op_resolve_base(CTI_ARGS);
    207         static JSValue* SFX_CALL cti_op_negate(CTI_ARGS);
    208         static JSValue* SFX_CALL cti_op_resolve_skip(CTI_ARGS);
    209         static JSValue* SFX_CALL cti_op_div(CTI_ARGS);
    210         static JSValue* SFX_CALL cti_op_pre_dec(CTI_ARGS);
     206        static JSValuePtr SFX_CALL cti_op_resolve_base(CTI_ARGS);
     207        static JSValuePtr SFX_CALL cti_op_negate(CTI_ARGS);
     208        static JSValuePtr SFX_CALL cti_op_resolve_skip(CTI_ARGS);
     209        static JSValuePtr SFX_CALL cti_op_div(CTI_ARGS);
     210        static JSValuePtr SFX_CALL cti_op_pre_dec(CTI_ARGS);
    211211        static int SFX_CALL cti_op_jless(CTI_ARGS);
    212         static JSValue* SFX_CALL cti_op_not(CTI_ARGS);
     212        static JSValuePtr SFX_CALL cti_op_not(CTI_ARGS);
    213213        static int SFX_CALL cti_op_jtrue(CTI_ARGS);
    214214        static VoidPtrPair SFX_CALL cti_op_post_inc(CTI_ARGS);
    215         static JSValue* SFX_CALL cti_op_eq(CTI_ARGS);
    216         static JSValue* SFX_CALL cti_op_lshift(CTI_ARGS);
    217         static JSValue* SFX_CALL cti_op_bitand(CTI_ARGS);
    218         static JSValue* SFX_CALL cti_op_rshift(CTI_ARGS);
    219         static JSValue* SFX_CALL cti_op_bitnot(CTI_ARGS);
     215        static JSValuePtr SFX_CALL cti_op_eq(CTI_ARGS);
     216        static JSValuePtr SFX_CALL cti_op_lshift(CTI_ARGS);
     217        static JSValuePtr SFX_CALL cti_op_bitand(CTI_ARGS);
     218        static JSValuePtr SFX_CALL cti_op_rshift(CTI_ARGS);
     219        static JSValuePtr SFX_CALL cti_op_bitnot(CTI_ARGS);
    220220        static VoidPtrPair SFX_CALL cti_op_resolve_with_base(CTI_ARGS);
    221         static JSValue* SFX_CALL cti_op_new_func_exp(CTI_ARGS);
    222         static JSValue* SFX_CALL cti_op_mod(CTI_ARGS);
    223         static JSValue* SFX_CALL cti_op_less(CTI_ARGS);
    224         static JSValue* SFX_CALL cti_op_neq(CTI_ARGS);
     221        static JSValuePtr SFX_CALL cti_op_new_func_exp(CTI_ARGS);
     222        static JSValuePtr SFX_CALL cti_op_mod(CTI_ARGS);
     223        static JSValuePtr SFX_CALL cti_op_less(CTI_ARGS);
     224        static JSValuePtr SFX_CALL cti_op_neq(CTI_ARGS);
    225225        static VoidPtrPair SFX_CALL cti_op_post_dec(CTI_ARGS);
    226         static JSValue* SFX_CALL cti_op_urshift(CTI_ARGS);
    227         static JSValue* SFX_CALL cti_op_bitxor(CTI_ARGS);
    228         static JSValue* SFX_CALL cti_op_new_regexp(CTI_ARGS);
    229         static JSValue* SFX_CALL cti_op_bitor(CTI_ARGS);
    230         static JSValue* SFX_CALL cti_op_call_eval(CTI_ARGS);
    231         static JSValue* SFX_CALL cti_op_throw(CTI_ARGS);
     226        static JSValuePtr SFX_CALL cti_op_urshift(CTI_ARGS);
     227        static JSValuePtr SFX_CALL cti_op_bitxor(CTI_ARGS);
     228        static JSValuePtr SFX_CALL cti_op_new_regexp(CTI_ARGS);
     229        static JSValuePtr SFX_CALL cti_op_bitor(CTI_ARGS);
     230        static JSValuePtr SFX_CALL cti_op_call_eval(CTI_ARGS);
     231        static JSValuePtr SFX_CALL cti_op_throw(CTI_ARGS);
    232232        static JSPropertyNameIterator* SFX_CALL cti_op_get_pnames(CTI_ARGS);
    233         static JSValue* SFX_CALL cti_op_next_pname(CTI_ARGS);
     233        static JSValuePtr SFX_CALL cti_op_next_pname(CTI_ARGS);
    234234        static void SFX_CALL cti_op_push_scope(CTI_ARGS);
    235235        static void SFX_CALL cti_op_pop_scope(CTI_ARGS);
    236         static JSValue* SFX_CALL cti_op_typeof(CTI_ARGS);
    237         static JSValue* SFX_CALL cti_op_is_undefined(CTI_ARGS);
    238         static JSValue* SFX_CALL cti_op_is_boolean(CTI_ARGS);
    239         static JSValue* SFX_CALL cti_op_is_number(CTI_ARGS);
    240         static JSValue* SFX_CALL cti_op_is_string(CTI_ARGS);
    241         static JSValue* SFX_CALL cti_op_is_object(CTI_ARGS);
    242         static JSValue* SFX_CALL cti_op_is_function(CTI_ARGS);
    243         static JSValue* SFX_CALL cti_op_stricteq(CTI_ARGS);
    244         static JSValue* SFX_CALL cti_op_nstricteq(CTI_ARGS);
    245         static JSValue* SFX_CALL cti_op_to_jsnumber(CTI_ARGS);
    246         static JSValue* SFX_CALL cti_op_in(CTI_ARGS);
    247         static JSValue* SFX_CALL cti_op_push_new_scope(CTI_ARGS);
     236        static JSValuePtr SFX_CALL cti_op_typeof(CTI_ARGS);
     237        static JSValuePtr SFX_CALL cti_op_is_undefined(CTI_ARGS);
     238        static JSValuePtr SFX_CALL cti_op_is_boolean(CTI_ARGS);
     239        static JSValuePtr SFX_CALL cti_op_is_number(CTI_ARGS);
     240        static JSValuePtr SFX_CALL cti_op_is_string(CTI_ARGS);
     241        static JSValuePtr SFX_CALL cti_op_is_object(CTI_ARGS);
     242        static JSValuePtr SFX_CALL cti_op_is_function(CTI_ARGS);
     243        static JSValuePtr SFX_CALL cti_op_stricteq(CTI_ARGS);
     244        static JSValuePtr SFX_CALL cti_op_nstricteq(CTI_ARGS);
     245        static JSValuePtr SFX_CALL cti_op_to_jsnumber(CTI_ARGS);
     246        static JSValuePtr SFX_CALL cti_op_in(CTI_ARGS);
     247        static JSValuePtr SFX_CALL cti_op_push_new_scope(CTI_ARGS);
    248248        static void SFX_CALL cti_op_jmp_scopes(CTI_ARGS);
    249249        static void SFX_CALL cti_op_put_by_index(CTI_ARGS);
    … …  
    251251        static void* SFX_CALL cti_op_switch_char(CTI_ARGS);
    252252        static void* SFX_CALL cti_op_switch_string(CTI_ARGS);
    253         static JSValue* SFX_CALL cti_op_del_by_val(CTI_ARGS);
     253        static JSValuePtr SFX_CALL cti_op_del_by_val(CTI_ARGS);
    254254        static void SFX_CALL cti_op_put_getter(CTI_ARGS);
    255255        static void SFX_CALL cti_op_put_setter(CTI_ARGS);
    256         static JSValue* SFX_CALL cti_op_new_error(CTI_ARGS);
     256        static JSValuePtr SFX_CALL cti_op_new_error(CTI_ARGS);
    257257        static void SFX_CALL cti_op_debug(CTI_ARGS);
    258258
    … …  
    260260        static void SFX_CALL cti_op_ret_profiler(CTI_ARGS);
    261261
    262         static JSValue* SFX_CALL cti_vm_throw(CTI_ARGS);
     262        static JSValuePtr SFX_CALL cti_vm_throw(CTI_ARGS);
    263263        static void* SFX_CALL cti_vm_compile(CTI_ARGS);
    264264        static void* SFX_CALL cti_vm_lazyLinkCall(CTI_ARGS);
    265         static JSValue* SFX_CALL cti_op_push_activation(CTI_ARGS);
     265        static JSValuePtr SFX_CALL cti_op_push_activation(CTI_ARGS);
    266266       
    267267#endif // ENABLE(CTI)
    … …  
    270270        static const int initialTickCountThreshold = 1024;
    271271
    272         bool isJSArray(JSValue* v) { return !JSImmediate::isImmediate(v) && v->asCell()->vptr() == m_jsArrayVptr; }
    273         bool isJSString(JSValue* v) { return !JSImmediate::isImmediate(v) && v->asCell()->vptr() == m_jsStringVptr; }
     272        bool isJSArray(JSValuePtr v) { return !JSImmediate::isImmediate(v) && v->asCell()->vptr() == m_jsArrayVptr; }
     273        bool isJSString(JSValuePtr v) { return !JSImmediate::isImmediate(v) && v->asCell()->vptr() == m_jsStringVptr; }
    274274
    275275    private:
    276276        enum ExecutionFlag { Normal, InitializeAndReturn };
    277277
    278         NEVER_INLINE JSValue* callEval(CallFrame*, JSObject* thisObject, ScopeChainNode*, RegisterFile*, int argv, int argc, JSValue*& exceptionValue);
    279         JSValue* execute(EvalNode*, CallFrame*, JSObject* thisObject, int registerOffset, ScopeChainNode*, JSValue** exception);
     278        NEVER_INLINE JSValuePtr callEval(CallFrame*, JSObject* thisObject, ScopeChainNode*, RegisterFile*, int argv, int argc, JSValuePtr& exceptionValue);
     279        JSValuePtr execute(EvalNode*, CallFrame*, JSObject* thisObject, int registerOffset, ScopeChainNode*, JSValuePtr* exception);
    280280
    281281        NEVER_INLINE void debug(CallFrame*, DebugHookID, int firstLine, int lastLine);
    282282
    283         NEVER_INLINE bool resolve(CallFrame*, Instruction*, JSValue*& exceptionValue);
    284         NEVER_INLINE bool resolveSkip(CallFrame*, Instruction*, JSValue*& exceptionValue);
    285         NEVER_INLINE bool resolveGlobal(CallFrame*, Instruction*, JSValue*& exceptionValue);
     283        NEVER_INLINE bool resolve(CallFrame*, Instruction*, JSValuePtr& exceptionValue);
     284        NEVER_INLINE bool resolveSkip(CallFrame*, Instruction*, JSValuePtr& exceptionValue);
     285        NEVER_INLINE bool resolveGlobal(CallFrame*, Instruction*, JSValuePtr& exceptionValue);
    286286        NEVER_INLINE void resolveBase(CallFrame*, Instruction* vPC);
    287         NEVER_INLINE bool resolveBaseAndProperty(CallFrame*, Instruction*, JSValue*& exceptionValue);
     287        NEVER_INLINE bool resolveBaseAndProperty(CallFrame*, Instruction*, JSValuePtr& exceptionValue);
    288288        NEVER_INLINE ScopeChainNode* createExceptionScope(CallFrame*, const Instruction* vPC);
    289289
    290         NEVER_INLINE bool unwindCallFrame(CallFrame*&, JSValue*, const Instruction*&, CodeBlock*&);
    291         NEVER_INLINE Instruction* throwException(CallFrame*&, JSValue*&, const Instruction*, bool);
    292         NEVER_INLINE bool resolveBaseAndFunc(CallFrame*, Instruction*, JSValue*& exceptionValue);
     290        NEVER_INLINE bool unwindCallFrame(CallFrame*&, JSValuePtr, const Instruction*&, CodeBlock*&);
     291        NEVER_INLINE Instruction* throwException(CallFrame*&, JSValuePtr&, const Instruction*, bool);
     292        NEVER_INLINE bool resolveBaseAndFunc(CallFrame*, Instruction*, JSValuePtr& exceptionValue);
    293293
    294294        static ALWAYS_INLINE CallFrame* slideRegisterWindowForCall(CodeBlock*, RegisterFile*, CallFrame*, size_t registerOffset, int argc);
    … …  
    296296        static CallFrame* findFunctionCallFrame(CallFrame*, InternalFunction*);
    297297
    298         JSValue* privateExecute(ExecutionFlag, RegisterFile*, CallFrame*, JSValue** exception);
     298        JSValuePtr privateExecute(ExecutionFlag, RegisterFile*, CallFrame*, JSValuePtr* exception);
    299299
    300300        void dumpCallFrame(const RegisterFile*, CallFrame*);
    301301        void dumpRegisters(const RegisterFile*, CallFrame*);
    302302
    303         JSValue* checkTimeout(JSGlobalObject*);
     303        JSValuePtr checkTimeout(JSGlobalObject*);
    304304        void resetTimeoutCheck();
    305305
    306         void tryCacheGetByID(CallFrame*, CodeBlock*, Instruction*, JSValue* baseValue, const Identifier& propertyName, const PropertySlot&);
     306        void tryCacheGetByID(CallFrame*, CodeBlock*, Instruction*, JSValuePtr baseValue, const Identifier& propertyName, const PropertySlot&);
    307307        void uncacheGetByID(CodeBlock*, Instruction* vPC);
    308         void tryCachePutByID(CallFrame*, CodeBlock*, Instruction*, JSValue* baseValue, const PutPropertySlot&);
     308        void tryCachePutByID(CallFrame*, CodeBlock*, Instruction*, JSValuePtr baseValue, const PutPropertySlot&);
    309309        void uncachePutByID(CodeBlock*, Instruction* vPC);
    310310
    … …  
    312312        static void throwStackOverflowPreviousFrame(CallFrame*, JSGlobalData*, void*& returnAddress);
    313313
    314         void tryCTICacheGetByID(CallFrame*, CodeBlock*, void* returnAddress, JSValue* baseValue, const Identifier& propertyName, const PropertySlot&);
    315         void tryCTICachePutByID(CallFrame*, CodeBlock*, void* returnAddress, JSValue* baseValue, const PutPropertySlot&);
     314        void tryCTICacheGetByID(CallFrame*, CodeBlock*, void* returnAddress, JSValuePtr baseValue, const Identifier& propertyName, const PropertySlot&);
     315        void tryCTICachePutByID(CallFrame*, CodeBlock*, void* returnAddress, JSValuePtr baseValue, const PutPropertySlot&);
    316316
    317317        void* getCTIArrayLengthTrampoline(CallFrame*, CodeBlock*);
Note: See TracChangeset for help on using the changeset viewer.