Changeset 37581 in webkit for trunk/JavaScriptCore/VM/Machine.cpp

Timestamp:

Oct 14, 2008, 1:21:19 AM (17 years ago)

Author:

[email protected]

Message:

2008-10-14 Maciej Stachowiak <​[email protected]>

Reviewed by Cameron Zwarich.

• always use CTI_ARGUMENTS and CTI_ARGUMENTS_FASTCALL

This is a small regression for GCC 4.0, but simplifies the code
for future improvements and lets us focus on GCC 4.2+ and MSVC.

• VM/CTI.cpp:
• VM/CTI.h:
• VM/Machine.cpp: (JSC::Machine::cti_op_convert_this): (JSC::Machine::cti_op_end): (JSC::Machine::cti_op_add): (JSC::Machine::cti_op_pre_inc): (JSC::Machine::cti_timeout_check): (JSC::Machine::cti_register_file_check): (JSC::Machine::cti_op_loop_if_less): (JSC::Machine::cti_op_loop_if_lesseq): (JSC::Machine::cti_op_new_object): (JSC::Machine::cti_op_put_by_id): (JSC::Machine::cti_op_put_by_id_second): (JSC::Machine::cti_op_put_by_id_generic): (JSC::Machine::cti_op_put_by_id_fail): (JSC::Machine::cti_op_get_by_id): (JSC::Machine::cti_op_get_by_id_second): (JSC::Machine::cti_op_get_by_id_generic): (JSC::Machine::cti_op_get_by_id_fail): (JSC::Machine::cti_op_instanceof): (JSC::Machine::cti_op_del_by_id): (JSC::Machine::cti_op_mul): (JSC::Machine::cti_op_new_func): (JSC::Machine::cti_op_call_JSFunction): (JSC::Machine::cti_vm_compile): (JSC::Machine::cti_op_push_activation): (JSC::Machine::cti_op_call_NotJSFunction): (JSC::Machine::cti_op_create_arguments): (JSC::Machine::cti_op_tear_off_activation): (JSC::Machine::cti_op_tear_off_arguments): (JSC::Machine::cti_op_ret_profiler): (JSC::Machine::cti_op_ret_scopeChain): (JSC::Machine::cti_op_new_array): (JSC::Machine::cti_op_resolve): (JSC::Machine::cti_op_construct_JSConstruct): (JSC::Machine::cti_op_construct_NotJSConstruct): (JSC::Machine::cti_op_get_by_val): (JSC::Machine::cti_op_resolve_func): (JSC::Machine::cti_op_sub): (JSC::Machine::cti_op_put_by_val): (JSC::Machine::cti_op_put_by_val_array): (JSC::Machine::cti_op_lesseq): (JSC::Machine::cti_op_loop_if_true): (JSC::Machine::cti_op_negate): (JSC::Machine::cti_op_resolve_base): (JSC::Machine::cti_op_resolve_skip): (JSC::Machine::cti_op_resolve_global): (JSC::Machine::cti_op_div): (JSC::Machine::cti_op_pre_dec): (JSC::Machine::cti_op_jless): (JSC::Machine::cti_op_not): (JSC::Machine::cti_op_jtrue): (JSC::Machine::cti_op_post_inc): (JSC::Machine::cti_op_eq): (JSC::Machine::cti_op_lshift): (JSC::Machine::cti_op_bitand): (JSC::Machine::cti_op_rshift): (JSC::Machine::cti_op_bitnot): (JSC::Machine::cti_op_resolve_with_base): (JSC::Machine::cti_op_new_func_exp): (JSC::Machine::cti_op_mod): (JSC::Machine::cti_op_less): (JSC::Machine::cti_op_neq): (JSC::Machine::cti_op_post_dec): (JSC::Machine::cti_op_urshift): (JSC::Machine::cti_op_bitxor): (JSC::Machine::cti_op_new_regexp): (JSC::Machine::cti_op_bitor): (JSC::Machine::cti_op_call_eval): (JSC::Machine::cti_op_throw): (JSC::Machine::cti_op_get_pnames): (JSC::Machine::cti_op_next_pname): (JSC::Machine::cti_op_push_scope): (JSC::Machine::cti_op_pop_scope): (JSC::Machine::cti_op_typeof): (JSC::Machine::cti_op_is_undefined): (JSC::Machine::cti_op_is_boolean): (JSC::Machine::cti_op_is_number): (JSC::Machine::cti_op_is_string): (JSC::Machine::cti_op_is_object): (JSC::Machine::cti_op_is_function): (JSC::Machine::cti_op_stricteq): (JSC::Machine::cti_op_nstricteq): (JSC::Machine::cti_op_to_jsnumber): (JSC::Machine::cti_op_in): (JSC::Machine::cti_op_push_new_scope): (JSC::Machine::cti_op_jmp_scopes): (JSC::Machine::cti_op_put_by_index): (JSC::Machine::cti_op_switch_imm): (JSC::Machine::cti_op_switch_char): (JSC::Machine::cti_op_switch_string): (JSC::Machine::cti_op_del_by_val): (JSC::Machine::cti_op_put_getter): (JSC::Machine::cti_op_put_setter): (JSC::Machine::cti_op_new_error): (JSC::Machine::cti_op_debug): (JSC::Machine::cti_vm_throw):
• VM/Machine.h:
• masm/X86Assembler.h: (JSC::X86Assembler::emitRestoreArgumentReference): (JSC::X86Assembler::emitRestoreArgumentReferenceForTrampoline):
• wtf/Platform.h:

File:

• trunk/JavaScriptCore/VM/Machine.cpp (modified) (82 diffs)

trunk/JavaScriptCore/VM/Machine.cpp

@@ -4242 +4242 @@
     } while (0)
 
-JSValue* Machine::cti_op_convert_this(CTI_ARGS)
+JSValue* Machine::cti_op_convert_this(void** args)
 {
     JSValue* v1 = ARG_src1;
@@ -4252 +4252 @@
 }
 
-void Machine::cti_op_end(CTI_ARGS)
+void Machine::cti_op_end(void** args)
 {
     ScopeChainNode* scopeChain = ARG_callFrame->scopeChain();
@@ -4259 +4259 @@
 }
 
-JSValue* Machine::cti_op_add(CTI_ARGS)
+JSValue* Machine::cti_op_add(void** args)
 {
     JSValue* v1 = ARG_src1;
@@ -4302 +4302 @@
 }
 
-JSValue* Machine::cti_op_pre_inc(CTI_ARGS)
+JSValue* Machine::cti_op_pre_inc(void** args)
 {
     JSValue* v = ARG_src1;
@@ -4312 +4312 @@
 }
 
-void Machine::cti_timeout_check(CTI_ARGS)
+void Machine::cti_timeout_check(void** args)
 {
     if (ARG_globalData->machine->checkTimeout(ARG_callFrame->dynamicGlobalObject())) {
@@ -4320 +4320 @@
 }
 
-void Machine::cti_register_file_check(CTI_ARGS)
+void Machine::cti_register_file_check(void** args)
 {
     CallFrame* callFrame = ARG_callFrame;
@@ -4336 +4336 @@
 }
 
-int Machine::cti_op_loop_if_less(CTI_ARGS)
+int Machine::cti_op_loop_if_less(void** args)
 {
     JSValue* src1 = ARG_src1;
@@ -4347 +4347 @@
 }
 
-int Machine::cti_op_loop_if_lesseq(CTI_ARGS)
+int Machine::cti_op_loop_if_lesseq(void** args)
 {
     JSValue* src1 = ARG_src1;
@@ -4358 +4358 @@
 }
 
-JSValue* Machine::cti_op_new_object(CTI_ARGS)
+JSValue* Machine::cti_op_new_object(void** args)
 {
     return constructEmptyObject(ARG_callFrame);;
 }
 
-void Machine::cti_op_put_by_id(CTI_ARGS)
+void Machine::cti_op_put_by_id(void** args)
 {
     CallFrame* callFrame = ARG_callFrame;
@@ -4376 +4376 @@
 }
 
-void Machine::cti_op_put_by_id_second(CTI_ARGS)
+void Machine::cti_op_put_by_id_second(void** args)
 {
     PutPropertySlot slot;
@@ -4384 +4384 @@
 }
 
-void Machine::cti_op_put_by_id_generic(CTI_ARGS)
+void Machine::cti_op_put_by_id_generic(void** args)
 {
     PutPropertySlot slot;
@@ -4391 +4391 @@
 }
 
-void Machine::cti_op_put_by_id_fail(CTI_ARGS)
+void Machine::cti_op_put_by_id_fail(void** args)
 {
     CallFrame* callFrame = ARG_callFrame;
@@ -4405 +4405 @@
 }
 
-JSValue* Machine::cti_op_get_by_id(CTI_ARGS)
+JSValue* Machine::cti_op_get_by_id(void** args)
 {
     CallFrame* callFrame = ARG_callFrame;
@@ -4420 +4420 @@
 }
 
-JSValue* Machine::cti_op_get_by_id_second(CTI_ARGS)
+JSValue* Machine::cti_op_get_by_id_second(void** args)
 {
     CallFrame* callFrame = ARG_callFrame;
@@ -4435 +4435 @@
 }
 
-JSValue* Machine::cti_op_get_by_id_generic(CTI_ARGS)
+JSValue* Machine::cti_op_get_by_id_generic(void** args)
 {
     CallFrame* callFrame = ARG_callFrame;
@@ -4448 +4448 @@
 }
 
-JSValue* Machine::cti_op_get_by_id_fail(CTI_ARGS)
+JSValue* Machine::cti_op_get_by_id_fail(void** args)
 {
     CallFrame* callFrame = ARG_callFrame;
@@ -4464 +4464 @@
 }
 
-JSValue* Machine::cti_op_instanceof(CTI_ARGS)
+JSValue* Machine::cti_op_instanceof(void** args)
 {
     CallFrame* callFrame = ARG_callFrame;
@@ -4505 +4505 @@
 }
 
-JSValue* Machine::cti_op_del_by_id(CTI_ARGS)
+JSValue* Machine::cti_op_del_by_id(void** args)
 {
     CallFrame* callFrame = ARG_callFrame;
@@ -4517 +4517 @@
 }
 
-JSValue* Machine::cti_op_mul(CTI_ARGS)
+JSValue* Machine::cti_op_mul(void** args)
 {
     JSValue* src1 = ARG_src1;
@@ -4533 +4533 @@
 }
 
-JSValue* Machine::cti_op_new_func(CTI_ARGS)
+JSValue* Machine::cti_op_new_func(void** args)
 {
     return ARG_func1->makeFunction(ARG_callFrame, ARG_callFrame->scopeChain());
 }
 
-VoidPtrPair Machine::cti_op_call_JSFunction(CTI_ARGS)
+VoidPtrPair Machine::cti_op_call_JSFunction(void** args)
 {
 #ifndef NDEBUG
@@ -4587 +4587 @@
 }
 
-void* Machine::cti_vm_compile(CTI_ARGS)
+void* Machine::cti_vm_compile(void** args)
 {
     CodeBlock* codeBlock = ARG_callFrame->codeBlock();
@@ -4595 +4595 @@
 }
 
-JSValue* Machine::cti_op_push_activation(CTI_ARGS)
+JSValue* Machine::cti_op_push_activation(void** args)
 {
     JSActivation* activation = new (ARG_globalData) JSActivation(ARG_callFrame, static_cast<FunctionBodyNode*>(ARG_callFrame->codeBlock()->ownerNode));
@@ -4602 +4602 @@
 }
 
-JSValue* Machine::cti_op_call_NotJSFunction(CTI_ARGS)
+JSValue* Machine::cti_op_call_NotJSFunction(void** args)
 {
     JSValue* funcVal = ARG_src1;
@@ -4644 +4644 @@
 }
 
-void Machine::cti_op_create_arguments(CTI_ARGS)
+void Machine::cti_op_create_arguments(void** args)
 {
     Arguments* arguments = new (ARG_globalData) Arguments(ARG_callFrame);
@@ -4651 +4651 @@
 }
 
-void Machine::cti_op_tear_off_activation(CTI_ARGS)
+void Machine::cti_op_tear_off_activation(void** args)
 {
     ASSERT(ARG_callFrame->codeBlock()->needsFullScopeChain);
@@ -4658 +4658 @@
 }
 
-void Machine::cti_op_tear_off_arguments(CTI_ARGS)
+void Machine::cti_op_tear_off_arguments(void** args)
 {
     ASSERT(ARG_callFrame->codeBlock()->usesArguments && !ARG_callFrame->codeBlock()->needsFullScopeChain);
@@ -4664 +4664 @@
 }
 
-void Machine::cti_op_ret_profiler(CTI_ARGS)
+void Machine::cti_op_ret_profiler(void** args)
 {
     ASSERT(*ARG_profilerReference);
@@ -4670 +4670 @@
 }
 
-void Machine::cti_op_ret_scopeChain(CTI_ARGS)
+void Machine::cti_op_ret_scopeChain(void** args)
 {
     ASSERT(ARG_callFrame->codeBlock()->needsFullScopeChain);
@@ -4676 +4676 @@
 }
 
-JSValue* Machine::cti_op_new_array(CTI_ARGS)
+JSValue* Machine::cti_op_new_array(void** args)
 {
     ArgList argList(ARG_registers1, ARG_int2);
@@ -4682 +4682 @@
 }
 
-JSValue* Machine::cti_op_resolve(CTI_ARGS)
+JSValue* Machine::cti_op_resolve(void** args)
 {
     CallFrame* callFrame = ARG_callFrame;
@@ -4709 +4709 @@
 }
 
-VoidPtrPair Machine::cti_op_construct_JSConstruct(CTI_ARGS)
+VoidPtrPair Machine::cti_op_construct_JSConstruct(void** args)
 {
     CallFrame* callFrame = ARG_callFrame;
@@ -4772 +4772 @@
 }
 
-JSValue* Machine::cti_op_construct_NotJSConstruct(CTI_ARGS)
+JSValue* Machine::cti_op_construct_NotJSConstruct(void** args)
 {
     CallFrame* callFrame = ARG_callFrame;
@@ -4808 +4808 @@
 }
 
-JSValue* Machine::cti_op_get_by_val(CTI_ARGS)
+JSValue* Machine::cti_op_get_by_val(void** args)
 {
     CallFrame* callFrame = ARG_callFrame;
@@ -4840 +4840 @@
 }
 
-VoidPtrPair Machine::cti_op_resolve_func(CTI_ARGS)
+VoidPtrPair Machine::cti_op_resolve_func(void** args)
 {
     CallFrame* callFrame = ARG_callFrame;
@@ -4882 +4882 @@
 }
 
-JSValue* Machine::cti_op_sub(CTI_ARGS)
+JSValue* Machine::cti_op_sub(void** args)
 {
     JSValue* src1 = ARG_src1;
@@ -4898 +4898 @@
 }
 
-void Machine::cti_op_put_by_val(CTI_ARGS)
+void Machine::cti_op_put_by_val(void** args)
 {
     CallFrame* callFrame = ARG_callFrame;
@@ -4930 +4930 @@
 }
 
-void Machine::cti_op_put_by_val_array(CTI_ARGS)
+void Machine::cti_op_put_by_val_array(void** args)
 {
     CallFrame* callFrame = ARG_callFrame;
@@ -4954 +4954 @@
 }
 
-JSValue* Machine::cti_op_lesseq(CTI_ARGS)
+JSValue* Machine::cti_op_lesseq(void** args)
 {
     CallFrame* callFrame = ARG_callFrame;
@@ -4962 +4962 @@
 }
 
-int Machine::cti_op_loop_if_true(CTI_ARGS)
+int Machine::cti_op_loop_if_true(void** args)
 {
     JSValue* src1 = ARG_src1;
@@ -4973 +4973 @@
 }
 
-JSValue* Machine::cti_op_negate(CTI_ARGS)
+JSValue* Machine::cti_op_negate(void** args)
 {
     JSValue* src = ARG_src1;
@@ -4987 +4987 @@
 }
 
-JSValue* Machine::cti_op_resolve_base(CTI_ARGS)
+JSValue* Machine::cti_op_resolve_base(void** args)
 {
     return inlineResolveBase(ARG_callFrame, *ARG_id1, ARG_callFrame->scopeChain());
 }
 
-JSValue* Machine::cti_op_resolve_skip(CTI_ARGS)
+JSValue* Machine::cti_op_resolve_skip(void** args)
 {
     CallFrame* callFrame = ARG_callFrame;
@@ -5024 +5024 @@
 }
 
-JSValue* Machine::cti_op_resolve_global(CTI_ARGS)
+JSValue* Machine::cti_op_resolve_global(void** args)
 {
     CallFrame* callFrame = ARG_callFrame;
@@ -5052 +5052 @@
 }
 
-JSValue* Machine::cti_op_div(CTI_ARGS)
+JSValue* Machine::cti_op_div(void** args)
 {
     JSValue* src1 = ARG_src1;
@@ -5068 +5068 @@
 }
 
-JSValue* Machine::cti_op_pre_dec(CTI_ARGS)
+JSValue* Machine::cti_op_pre_dec(void** args)
 {
     JSValue* v = ARG_src1;
@@ -5078 +5078 @@
 }
 
-int Machine::cti_op_jless(CTI_ARGS)
+int Machine::cti_op_jless(void** args)
 {
     JSValue* src1 = ARG_src1;
@@ -5089 +5089 @@
 }
 
-JSValue* Machine::cti_op_not(CTI_ARGS)
+JSValue* Machine::cti_op_not(void** args)
 {
     JSValue* src = ARG_src1;
@@ -5100 +5100 @@
 }
 
-int SFX_CALL Machine::cti_op_jtrue(CTI_ARGS)
+int SFX_CALL Machine::cti_op_jtrue(void** args)
 {
     JSValue* src1 = ARG_src1;
@@ -5111 +5111 @@
 }
 
-VoidPtrPair Machine::cti_op_post_inc(CTI_ARGS)
+VoidPtrPair Machine::cti_op_post_inc(void** args)
 {
     JSValue* v = ARG_src1;
@@ -5124 +5124 @@
 }
 
-JSValue* Machine::cti_op_eq(CTI_ARGS)
+JSValue* Machine::cti_op_eq(void** args)
 {
     JSValue* src1 = ARG_src1;
@@ -5137 +5137 @@
 }
 
-JSValue* Machine::cti_op_lshift(CTI_ARGS)
+JSValue* Machine::cti_op_lshift(void** args)
 {
     JSValue* val = ARG_src1;
@@ -5155 +5155 @@
 }
 
-JSValue* Machine::cti_op_bitand(CTI_ARGS)
+JSValue* Machine::cti_op_bitand(void** args)
 {
     JSValue* src1 = ARG_src1;
@@ -5171 +5171 @@
 }
 
-JSValue* Machine::cti_op_rshift(CTI_ARGS)
+JSValue* Machine::cti_op_rshift(void** args)
 {
     JSValue* val = ARG_src1;
@@ -5189 +5189 @@
 }
 
-JSValue* Machine::cti_op_bitnot(CTI_ARGS)
+JSValue* Machine::cti_op_bitnot(void** args)
 {
     JSValue* src = ARG_src1;
@@ -5203 +5203 @@
 }
 
-VoidPtrPair Machine::cti_op_resolve_with_base(CTI_ARGS)
+VoidPtrPair Machine::cti_op_resolve_with_base(void** args)
 {
     CallFrame* callFrame = ARG_callFrame;
@@ -5237 +5237 @@
 }
 
-JSValue* Machine::cti_op_new_func_exp(CTI_ARGS)
+JSValue* Machine::cti_op_new_func_exp(void** args)
 {
     return ARG_funcexp1->makeFunction(ARG_callFrame, ARG_callFrame->scopeChain());
 }
 
-JSValue* Machine::cti_op_mod(CTI_ARGS)
+JSValue* Machine::cti_op_mod(void** args)
 {
     JSValue* dividendValue = ARG_src1;
@@ -5254 +5254 @@
 }
 
-JSValue* Machine::cti_op_less(CTI_ARGS)
+JSValue* Machine::cti_op_less(void** args)
 {
     CallFrame* callFrame = ARG_callFrame;
@@ -5262 +5262 @@
 }
 
-JSValue* Machine::cti_op_neq(CTI_ARGS)
+JSValue* Machine::cti_op_neq(void** args)
 {
     JSValue* src1 = ARG_src1;
@@ -5275 +5275 @@
 }
 
-VoidPtrPair Machine::cti_op_post_dec(CTI_ARGS)
+VoidPtrPair Machine::cti_op_post_dec(void** args)
 {
     JSValue* v = ARG_src1;
@@ -5288 +5288 @@
 }
 
-JSValue* Machine::cti_op_urshift(CTI_ARGS)
+JSValue* Machine::cti_op_urshift(void** args)
 {
     JSValue* val = ARG_src1;
@@ -5304 +5304 @@
 }
 
-JSValue* Machine::cti_op_bitxor(CTI_ARGS)
+JSValue* Machine::cti_op_bitxor(void** args)
 {
     JSValue* src1 = ARG_src1;
@@ -5316 +5316 @@
 }
 
-JSValue* Machine::cti_op_new_regexp(CTI_ARGS)
+JSValue* Machine::cti_op_new_regexp(void** args)
 {
     return new (ARG_globalData) RegExpObject(ARG_callFrame->lexicalGlobalObject()->regExpStructure(), ARG_regexp1);
 }
 
-JSValue* Machine::cti_op_bitor(CTI_ARGS)
+JSValue* Machine::cti_op_bitor(void** args)
 {
     JSValue* src1 = ARG_src1;
@@ -5333 +5333 @@
 }
 
-JSValue* Machine::cti_op_call_eval(CTI_ARGS)
+JSValue* Machine::cti_op_call_eval(void** args)
 {
     CallFrame* callFrame = ARG_callFrame;
@@ -5358 +5358 @@
 }
 
-void* Machine::cti_op_throw(CTI_ARGS)
+void* Machine::cti_op_throw(void** args)
 {
     CallFrame* callFrame = ARG_callFrame;
@@ -5383 +5383 @@
 }
 
-JSPropertyNameIterator* Machine::cti_op_get_pnames(CTI_ARGS)
+JSPropertyNameIterator* Machine::cti_op_get_pnames(void** args)
 {
     return JSPropertyNameIterator::create(ARG_callFrame, ARG_src1);
 }
 
-JSValue* Machine::cti_op_next_pname(CTI_ARGS)
+JSValue* Machine::cti_op_next_pname(void** args)
 {
     JSPropertyNameIterator* it = ARG_pni1;
@@ -5397 +5397 @@
 }
 
-void Machine::cti_op_push_scope(CTI_ARGS)
+void Machine::cti_op_push_scope(void** args)
 {
     JSObject* o = ARG_src1->toObject(ARG_callFrame);
@@ -5404 +5404 @@
 }
 
-void Machine::cti_op_pop_scope(CTI_ARGS)
+void Machine::cti_op_pop_scope(void** args)
 {
     ARG_callFrame->setScopeChain(ARG_callFrame->scopeChain()->pop());
 }
 
-JSValue* Machine::cti_op_typeof(CTI_ARGS)
+JSValue* Machine::cti_op_typeof(void** args)
 {
     return jsTypeStringForValue(ARG_callFrame, ARG_src1);
 }
 
-JSValue* Machine::cti_op_is_undefined(CTI_ARGS)
+JSValue* Machine::cti_op_is_undefined(void** args)
 {
     JSValue* v = ARG_src1;
@@ -5420 +5420 @@
 }
 
-JSValue* Machine::cti_op_is_boolean(CTI_ARGS)
+JSValue* Machine::cti_op_is_boolean(void** args)
 {
     return jsBoolean(ARG_src1->isBoolean());
 }
 
-JSValue* Machine::cti_op_is_number(CTI_ARGS)
+JSValue* Machine::cti_op_is_number(void** args)
 {
     return jsBoolean(ARG_src1->isNumber());
 }
 
-JSValue* Machine::cti_op_is_string(CTI_ARGS)
+JSValue* Machine::cti_op_is_string(void** args)
 {
     return jsBoolean(ARG_globalData->machine->isJSString(ARG_src1));
 }
 
-JSValue* Machine::cti_op_is_object(CTI_ARGS)
+JSValue* Machine::cti_op_is_object(void** args)
 {
     return jsBoolean(jsIsObjectType(ARG_src1));
 }
 
-JSValue* Machine::cti_op_is_function(CTI_ARGS)
+JSValue* Machine::cti_op_is_function(void** args)
 {
     return jsBoolean(jsIsFunctionType(ARG_src1));
 }
 
-JSValue* Machine::cti_op_stricteq(CTI_ARGS)
+JSValue* Machine::cti_op_stricteq(void** args)
 {
     JSValue* src1 = ARG_src1;
@@ -5457 +5457 @@
 }
 
-JSValue* Machine::cti_op_nstricteq(CTI_ARGS)
+JSValue* Machine::cti_op_nstricteq(void** args)
 {
     JSValue* src1 = ARG_src1;
@@ -5469 +5469 @@
 }
 
-JSValue* Machine::cti_op_to_jsnumber(CTI_ARGS)
+JSValue* Machine::cti_op_to_jsnumber(void** args)
 {
     JSValue* src = ARG_src1;
@@ -5479 +5479 @@
 }
 
-JSValue* Machine::cti_op_in(CTI_ARGS)
+JSValue* Machine::cti_op_in(void** args)
 {
     CallFrame* callFrame = ARG_callFrame;
@@ -5505 +5505 @@
 }
 
-JSValue* Machine::cti_op_push_new_scope(CTI_ARGS)
+JSValue* Machine::cti_op_push_new_scope(void** args)
 {
     JSObject* scope = new (ARG_globalData) JSStaticScopeObject(ARG_callFrame, *ARG_id1, ARG_src2, DontDelete);
@@ -5514 +5514 @@
 }
 
-void Machine::cti_op_jmp_scopes(CTI_ARGS)
+void Machine::cti_op_jmp_scopes(void** args)
 {
     unsigned count = ARG_int1;
@@ -5525 +5525 @@
 }
 
-void Machine::cti_op_put_by_index(CTI_ARGS)
+void Machine::cti_op_put_by_index(void** args)
 {
     CallFrame* callFrame = ARG_callFrame;
@@ -5533 +5533 @@
 }
 
-void* Machine::cti_op_switch_imm(CTI_ARGS)
+void* Machine::cti_op_switch_imm(void** args)
 {
     JSValue* scrutinee = ARG_src1;
@@ -5548 +5548 @@
 }
 
-void* Machine::cti_op_switch_char(CTI_ARGS)
+void* Machine::cti_op_switch_char(void** args)
 {
     JSValue* scrutinee = ARG_src1;
@@ -5566 +5566 @@
 }
 
-void* Machine::cti_op_switch_string(CTI_ARGS)
+void* Machine::cti_op_switch_string(void** args)
 {
     JSValue* scrutinee = ARG_src1;
@@ -5583 +5583 @@
 }
 
-JSValue* Machine::cti_op_del_by_val(CTI_ARGS)
+JSValue* Machine::cti_op_del_by_val(void** args)
 {
     CallFrame* callFrame = ARG_callFrame;
@@ -5606 +5606 @@
 }
 
-void Machine::cti_op_put_getter(CTI_ARGS)
+void Machine::cti_op_put_getter(void** args)
 {
     CallFrame* callFrame = ARG_callFrame;
@@ -5617 +5617 @@
 }
 
-void Machine::cti_op_put_setter(CTI_ARGS)
+void Machine::cti_op_put_setter(void** args)
 {
     CallFrame* callFrame = ARG_callFrame;
@@ -5628 +5628 @@
 }
 
-JSValue* Machine::cti_op_new_error(CTI_ARGS)
+JSValue* Machine::cti_op_new_error(void** args)
 {
     CallFrame* callFrame = ARG_callFrame;
@@ -5639 +5639 @@
 }
 
-void Machine::cti_op_debug(CTI_ARGS)
+void Machine::cti_op_debug(void** args)
 {
     CallFrame* callFrame = ARG_callFrame;
@@ -5650 +5650 @@
 }
 
-void* Machine::cti_vm_throw(CTI_ARGS)
+void* Machine::cti_vm_throw(void** args)
 {
     CallFrame* callFrame = ARG_callFrame;