Ignore:
Timestamp:
Dec 18, 2008, 2:14:53 PM (16 years ago)
Author:
[email protected]
Message:

2008-12-18 Gavin Barraclough <​[email protected]>

Reviewed by Sam Weinig.

Just a tidy up - rename & refactor some the #defines configuring the JIT.

  • interpreter/Interpreter.cpp: (JSC::Interpreter::cti_op_convert_this): (JSC::Interpreter::cti_op_end): (JSC::Interpreter::cti_op_add): (JSC::Interpreter::cti_op_pre_inc): (JSC::Interpreter::cti_timeout_check): (JSC::Interpreter::cti_register_file_check): (JSC::Interpreter::cti_op_loop_if_less): (JSC::Interpreter::cti_op_loop_if_lesseq): (JSC::Interpreter::cti_op_new_object): (JSC::Interpreter::cti_op_put_by_id_generic): (JSC::Interpreter::cti_op_get_by_id_generic): (JSC::Interpreter::cti_op_put_by_id): (JSC::Interpreter::cti_op_put_by_id_second): (JSC::Interpreter::cti_op_put_by_id_fail): (JSC::Interpreter::cti_op_get_by_id): (JSC::Interpreter::cti_op_get_by_id_second): (JSC::Interpreter::cti_op_get_by_id_self_fail): (JSC::Interpreter::cti_op_get_by_id_proto_list): (JSC::Interpreter::cti_op_get_by_id_proto_list_full): (JSC::Interpreter::cti_op_get_by_id_proto_fail): (JSC::Interpreter::cti_op_get_by_id_array_fail): (JSC::Interpreter::cti_op_get_by_id_string_fail): (JSC::Interpreter::cti_op_instanceof): (JSC::Interpreter::cti_op_del_by_id): (JSC::Interpreter::cti_op_mul): (JSC::Interpreter::cti_op_new_func): (JSC::Interpreter::cti_op_call_JSFunction): (JSC::Interpreter::cti_op_call_arityCheck): (JSC::Interpreter::cti_vm_dontLazyLinkCall): (JSC::Interpreter::cti_vm_lazyLinkCall): (JSC::Interpreter::cti_op_push_activation): (JSC::Interpreter::cti_op_call_NotJSFunction): (JSC::Interpreter::cti_op_create_arguments): (JSC::Interpreter::cti_op_create_arguments_no_params): (JSC::Interpreter::cti_op_tear_off_activation): (JSC::Interpreter::cti_op_tear_off_arguments): (JSC::Interpreter::cti_op_profile_will_call): (JSC::Interpreter::cti_op_profile_did_call): (JSC::Interpreter::cti_op_ret_scopeChain): (JSC::Interpreter::cti_op_new_array): (JSC::Interpreter::cti_op_resolve): (JSC::Interpreter::cti_op_construct_JSConstruct): (JSC::Interpreter::cti_op_construct_NotJSConstruct): (JSC::Interpreter::cti_op_get_by_val): (JSC::Interpreter::cti_op_resolve_func): (JSC::Interpreter::cti_op_sub): (JSC::Interpreter::cti_op_put_by_val): (JSC::Interpreter::cti_op_put_by_val_array): (JSC::Interpreter::cti_op_lesseq): (JSC::Interpreter::cti_op_loop_if_true): (JSC::Interpreter::cti_op_negate): (JSC::Interpreter::cti_op_resolve_base): (JSC::Interpreter::cti_op_resolve_skip): (JSC::Interpreter::cti_op_resolve_global): (JSC::Interpreter::cti_op_div): (JSC::Interpreter::cti_op_pre_dec): (JSC::Interpreter::cti_op_jless): (JSC::Interpreter::cti_op_not): (JSC::Interpreter::cti_op_jtrue): (JSC::Interpreter::cti_op_post_inc): (JSC::Interpreter::cti_op_eq): (JSC::Interpreter::cti_op_lshift): (JSC::Interpreter::cti_op_bitand): (JSC::Interpreter::cti_op_rshift): (JSC::Interpreter::cti_op_bitnot): (JSC::Interpreter::cti_op_resolve_with_base): (JSC::Interpreter::cti_op_new_func_exp): (JSC::Interpreter::cti_op_mod): (JSC::Interpreter::cti_op_less): (JSC::Interpreter::cti_op_neq): (JSC::Interpreter::cti_op_post_dec): (JSC::Interpreter::cti_op_urshift): (JSC::Interpreter::cti_op_bitxor): (JSC::Interpreter::cti_op_new_regexp): (JSC::Interpreter::cti_op_bitor): (JSC::Interpreter::cti_op_call_eval): (JSC::Interpreter::cti_op_throw): (JSC::Interpreter::cti_op_get_pnames): (JSC::Interpreter::cti_op_next_pname): (JSC::Interpreter::cti_op_push_scope): (JSC::Interpreter::cti_op_pop_scope): (JSC::Interpreter::cti_op_typeof): (JSC::Interpreter::cti_op_is_undefined): (JSC::Interpreter::cti_op_is_boolean): (JSC::Interpreter::cti_op_is_number): (JSC::Interpreter::cti_op_is_string): (JSC::Interpreter::cti_op_is_object): (JSC::Interpreter::cti_op_is_function): (JSC::Interpreter::cti_op_stricteq): (JSC::Interpreter::cti_op_nstricteq): (JSC::Interpreter::cti_op_to_jsnumber): (JSC::Interpreter::cti_op_in): (JSC::Interpreter::cti_op_push_new_scope): (JSC::Interpreter::cti_op_jmp_scopes): (JSC::Interpreter::cti_op_put_by_index): (JSC::Interpreter::cti_op_switch_imm): (JSC::Interpreter::cti_op_switch_char): (JSC::Interpreter::cti_op_switch_string): (JSC::Interpreter::cti_op_del_by_val): (JSC::Interpreter::cti_op_put_getter): (JSC::Interpreter::cti_op_put_setter): (JSC::Interpreter::cti_op_new_error): (JSC::Interpreter::cti_op_debug): (JSC::Interpreter::cti_vm_throw):
  • interpreter/Interpreter.h:
  • jit/JIT.cpp: (JSC::): (JSC::JIT::privateCompileMainPass): (JSC::JIT::privateCompile):
  • jit/JIT.h:
  • jit/JITInlineMethods.h: (JSC::JIT::restoreArgumentReference): (JSC::JIT::restoreArgumentReferenceForTrampoline):
  • wtf/Platform.h:
File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/JavaScriptCore/interpreter/Interpreter.cpp

    r39377 r39380  
    41924192#endif
    41934193
    4194 #if USE(CTI_ARGUMENT)
    4195 #define SETUP_VL_ARGS
    4196 #else
    4197 #define SETUP_VL_ARGS va_list vl_args; va_start(vl_args, args)
     4194#if USE(JIT_STUB_ARGUMENT_VA_LIST)
     4195#define SETUP_VA_LISTL_ARGS va_list vl_args; va_start(vl_args, args)
     4196#else // JIT_STUB_ARGUMENT_REGISTER or JIT_STUB_ARGUMENT_STACK
     4197#define SETUP_VA_LISTL_ARGS
    41984198#endif
    41994199
    … …  
    42274227};
    42284228
    4229 #define CTI_STACK_HACK() SETUP_VL_ARGS; StackHack stackHack(&CTI_RETURN_ADDRESS_SLOT)
    4230 #define CTI_SET_RETURN_ADDRESS(address) stackHack.savedReturnAddress = address
    4231 #define CTI_RETURN_ADDRESS stackHack.savedReturnAddress
     4229#define BEGIN_STUB_FUNCTION() SETUP_VA_LISTL_ARGS; StackHack stackHack(&STUB_RETURN_ADDRESS_SLOT)
     4230#define STUB_SET_RETURN_ADDRESS(address) stackHack.savedReturnAddress = address
     4231#define STUB_RETURN_ADDRESS stackHack.savedReturnAddress
    42324232
    42334233#else
    42344234
    4235 #define CTI_STACK_HACK() SETUP_VL_ARGS
    4236 #define CTI_SET_RETURN_ADDRESS(address) ctiSetReturnAddress(&CTI_RETURN_ADDRESS_SLOT, address);
    4237 #define CTI_RETURN_ADDRESS CTI_RETURN_ADDRESS_SLOT
     4235#define BEGIN_STUB_FUNCTION() SETUP_VA_LISTL_ARGS
     4236#define STUB_SET_RETURN_ADDRESS(address) ctiSetReturnAddress(&STUB_RETURN_ADDRESS_SLOT, address);
     4237#define STUB_RETURN_ADDRESS STUB_RETURN_ADDRESS_SLOT
    42384238
    42394239#endif
    … …  
    42674267    } while (0)
    42684268#define VM_THROW_EXCEPTION_AT_END() \
    4269     returnToThrowTrampoline(ARG_globalData, CTI_RETURN_ADDRESS, CTI_RETURN_ADDRESS)
     4269    returnToThrowTrampoline(ARG_globalData, STUB_RETURN_ADDRESS, STUB_RETURN_ADDRESS)
    42704270
    42714271#define CHECK_FOR_EXCEPTION() \
    … …  
    42874287    } while (0)
    42884288
    4289 JSObject* Interpreter::cti_op_convert_this(CTI_ARGS)
    4290 {
    4291     CTI_STACK_HACK();
     4289JSObject* Interpreter::cti_op_convert_this(STUB_ARGS)
     4290{
     4291    BEGIN_STUB_FUNCTION();
    42924292
    42934293    JSValue* v1 = ARG_src1;
    … …  
    42994299}
    43004300
    4301 void Interpreter::cti_op_end(CTI_ARGS)
    4302 {
    4303     CTI_STACK_HACK();
     4301void Interpreter::cti_op_end(STUB_ARGS)
     4302{
     4303    BEGIN_STUB_FUNCTION();
    43044304
    43054305    ScopeChainNode* scopeChain = ARG_callFrame->scopeChain();
    … …  
    43084308}
    43094309
    4310 JSValue* Interpreter::cti_op_add(CTI_ARGS)
    4311 {
    4312     CTI_STACK_HACK();
     4310JSValue* Interpreter::cti_op_add(STUB_ARGS)
     4311{
     4312    BEGIN_STUB_FUNCTION();
    43134313
    43144314    JSValue* v1 = ARG_src1;
    … …  
    43534353}
    43544354
    4355 JSValue* Interpreter::cti_op_pre_inc(CTI_ARGS)
    4356 {
    4357     CTI_STACK_HACK();
     4355JSValue* Interpreter::cti_op_pre_inc(STUB_ARGS)
     4356{
     4357    BEGIN_STUB_FUNCTION();
    43584358
    43594359    JSValue* v = ARG_src1;
    … …  
    43654365}
    43664366
    4367 int Interpreter::cti_timeout_check(CTI_ARGS)
    4368 {
    4369     CTI_STACK_HACK();
     4367int Interpreter::cti_timeout_check(STUB_ARGS)
     4368{
     4369    BEGIN_STUB_FUNCTION();
    43704370    Interpreter* interpreter = ARG_globalData->interpreter;
    43714371
    … …  
    43784378}
    43794379
    4380 void Interpreter::cti_register_file_check(CTI_ARGS)
    4381 {
    4382     CTI_STACK_HACK();
     4380void Interpreter::cti_register_file_check(STUB_ARGS)
     4381{
     4382    BEGIN_STUB_FUNCTION();
    43834383
    43844384    if (LIKELY(ARG_registerFile->grow(ARG_callFrame + ARG_callFrame->codeBlock()->m_numCalleeRegisters)))
    … …  
    43894389    CallFrame* oldCallFrame = ARG_callFrame->callerFrame();
    43904390    ARG_setCallFrame(oldCallFrame);
    4391     throwStackOverflowError(oldCallFrame, ARG_globalData, oldCallFrame->returnPC(), CTI_RETURN_ADDRESS);
    4392 }
    4393 
    4394 int Interpreter::cti_op_loop_if_less(CTI_ARGS)
    4395 {
    4396     CTI_STACK_HACK();
     4391    throwStackOverflowError(oldCallFrame, ARG_globalData, oldCallFrame->returnPC(), STUB_RETURN_ADDRESS);
     4392}
     4393
     4394int Interpreter::cti_op_loop_if_less(STUB_ARGS)
     4395{
     4396    BEGIN_STUB_FUNCTION();
    43974397
    43984398    JSValue* src1 = ARG_src1;
    … …  
    44054405}
    44064406
    4407 int Interpreter::cti_op_loop_if_lesseq(CTI_ARGS)
    4408 {
    4409     CTI_STACK_HACK();
     4407int Interpreter::cti_op_loop_if_lesseq(STUB_ARGS)
     4408{
     4409    BEGIN_STUB_FUNCTION();
    44104410
    44114411    JSValue* src1 = ARG_src1;
    … …  
    44184418}
    44194419
    4420 JSObject* Interpreter::cti_op_new_object(CTI_ARGS)
    4421 {
    4422     CTI_STACK_HACK();
     4420JSObject* Interpreter::cti_op_new_object(STUB_ARGS)
     4421{
     4422    BEGIN_STUB_FUNCTION();
    44234423
    44244424    return constructEmptyObject(ARG_callFrame);
    44254425}
    44264426
    4427 void Interpreter::cti_op_put_by_id_generic(CTI_ARGS)
    4428 {
    4429     CTI_STACK_HACK();
     4427void Interpreter::cti_op_put_by_id_generic(STUB_ARGS)
     4428{
     4429    BEGIN_STUB_FUNCTION();
    44304430
    44314431    PutPropertySlot slot;
    … …  
    44344434}
    44354435
    4436 JSValue* Interpreter::cti_op_get_by_id_generic(CTI_ARGS)
    4437 {
    4438     CTI_STACK_HACK();
     4436JSValue* Interpreter::cti_op_get_by_id_generic(STUB_ARGS)
     4437{
     4438    BEGIN_STUB_FUNCTION();
    44394439
    44404440    CallFrame* callFrame = ARG_callFrame;
    … …  
    44514451#if ENABLE(JIT_OPTIMIZE_PROPERTY_ACCESS)
    44524452
    4453 void Interpreter::cti_op_put_by_id(CTI_ARGS)
    4454 {
    4455     CTI_STACK_HACK();
     4453void Interpreter::cti_op_put_by_id(STUB_ARGS)
     4454{
     4455    BEGIN_STUB_FUNCTION();
    44564456
    44574457    CallFrame* callFrame = ARG_callFrame;
    … …  
    44614461    ARG_src1->put(callFrame, ident, ARG_src3, slot);
    44624462
    4463     ctiRepatchCallByReturnAddress(CTI_RETURN_ADDRESS, reinterpret_cast<void*>(cti_op_put_by_id_second));
     4463    ctiRepatchCallByReturnAddress(STUB_RETURN_ADDRESS, reinterpret_cast<void*>(cti_op_put_by_id_second));
    44644464
    44654465    CHECK_FOR_EXCEPTION_AT_END();
    44664466}
    44674467
    4468 void Interpreter::cti_op_put_by_id_second(CTI_ARGS)
    4469 {
    4470     CTI_STACK_HACK();
     4468void Interpreter::cti_op_put_by_id_second(STUB_ARGS)
     4469{
     4470    BEGIN_STUB_FUNCTION();
    44714471
    44724472    PutPropertySlot slot;
    44734473    ARG_src1->put(ARG_callFrame, *ARG_id2, ARG_src3, slot);
    4474     ARG_globalData->interpreter->tryCTICachePutByID(ARG_callFrame, ARG_callFrame->codeBlock(), CTI_RETURN_ADDRESS, ARG_src1, slot);
     4474    ARG_globalData->interpreter->tryCTICachePutByID(ARG_callFrame, ARG_callFrame->codeBlock(), STUB_RETURN_ADDRESS, ARG_src1, slot);
    44754475    CHECK_FOR_EXCEPTION_AT_END();
    44764476}
    44774477
    4478 void Interpreter::cti_op_put_by_id_fail(CTI_ARGS)
    4479 {
    4480     CTI_STACK_HACK();
     4478void Interpreter::cti_op_put_by_id_fail(STUB_ARGS)
     4479{
     4480    BEGIN_STUB_FUNCTION();
    44814481
    44824482    CallFrame* callFrame = ARG_callFrame;
    … …  
    44894489}
    44904490
    4491 JSValue* Interpreter::cti_op_get_by_id(CTI_ARGS)
    4492 {
    4493     CTI_STACK_HACK();
     4491JSValue* Interpreter::cti_op_get_by_id(STUB_ARGS)
     4492{
     4493    BEGIN_STUB_FUNCTION();
    44944494
    44954495    CallFrame* callFrame = ARG_callFrame;
    … …  
    45004500    JSValue* result = baseValue->get(callFrame, ident, slot);
    45014501
    4502     ctiRepatchCallByReturnAddress(CTI_RETURN_ADDRESS, reinterpret_cast<void*>(cti_op_get_by_id_second));
     4502    ctiRepatchCallByReturnAddress(STUB_RETURN_ADDRESS, reinterpret_cast<void*>(cti_op_get_by_id_second));
    45034503
    45044504    CHECK_FOR_EXCEPTION_AT_END();
    … …  
    45064506}
    45074507
    4508 JSValue* Interpreter::cti_op_get_by_id_second(CTI_ARGS)
    4509 {
    4510     CTI_STACK_HACK();
     4508JSValue* Interpreter::cti_op_get_by_id_second(STUB_ARGS)
     4509{
     4510    BEGIN_STUB_FUNCTION();
    45114511
    45124512    CallFrame* callFrame = ARG_callFrame;
    … …  
    45174517    JSValue* result = baseValue->get(callFrame, ident, slot);
    45184518
    4519     ARG_globalData->interpreter->tryCTICacheGetByID(callFrame, callFrame->codeBlock(), CTI_RETURN_ADDRESS, baseValue, ident, slot);
     4519    ARG_globalData->interpreter->tryCTICacheGetByID(callFrame, callFrame->codeBlock(), STUB_RETURN_ADDRESS, baseValue, ident, slot);
    45204520
    45214521    CHECK_FOR_EXCEPTION_AT_END();
    … …  
    45234523}
    45244524
    4525 JSValue* Interpreter::cti_op_get_by_id_self_fail(CTI_ARGS)
    4526 {
    4527     CTI_STACK_HACK();
     4525JSValue* Interpreter::cti_op_get_by_id_self_fail(STUB_ARGS)
     4526{
     4527    BEGIN_STUB_FUNCTION();
    45284528
    45294529    CallFrame* callFrame = ARG_callFrame;
    … …  
    45424542
    45434543        CodeBlock* codeBlock = callFrame->codeBlock();
    4544         StructureStubInfo* stubInfo = &codeBlock->getStubInfo(CTI_RETURN_ADDRESS);
     4544        StructureStubInfo* stubInfo = &codeBlock->getStubInfo(STUB_RETURN_ADDRESS);
    45454545
    45464546        ASSERT(slot.slotBase()->isObject());
    … …  
    45624562
    45634563        if (listIndex == (POLYMORPHIC_LIST_CACHE_SIZE - 1))
    4564             ctiRepatchCallByReturnAddress(CTI_RETURN_ADDRESS, reinterpret_cast<void*>(cti_op_get_by_id_generic));
     4564            ctiRepatchCallByReturnAddress(STUB_RETURN_ADDRESS, reinterpret_cast<void*>(cti_op_get_by_id_generic));
    45654565    } else {
    4566         ctiRepatchCallByReturnAddress(CTI_RETURN_ADDRESS, reinterpret_cast<void*>(cti_op_get_by_id_generic));
     4566        ctiRepatchCallByReturnAddress(STUB_RETURN_ADDRESS, reinterpret_cast<void*>(cti_op_get_by_id_generic));
    45674567    }
    45684568    return result;
    … …  
    45984598}
    45994599
    4600 JSValue* Interpreter::cti_op_get_by_id_proto_list(CTI_ARGS)
    4601 {
    4602     CTI_STACK_HACK();
     4600JSValue* Interpreter::cti_op_get_by_id_proto_list(STUB_ARGS)
     4601{
     4602    BEGIN_STUB_FUNCTION();
    46034603
    46044604    CallFrame* callFrame = ARG_callFrame;
    … …  
    46114611
    46124612    if (JSImmediate::isImmediate(baseValue) || !slot.isCacheable() || asCell(baseValue)->structure()->isDictionary()) {
    4613         ctiRepatchCallByReturnAddress(CTI_RETURN_ADDRESS, reinterpret_cast<void*>(cti_op_get_by_id_proto_fail));
     4613        ctiRepatchCallByReturnAddress(STUB_RETURN_ADDRESS, reinterpret_cast<void*>(cti_op_get_by_id_proto_fail));
    46144614        return result;
    46154615    }
    … …  
    46174617    Structure* structure = asCell(baseValue)->structure();
    46184618    CodeBlock* codeBlock = callFrame->codeBlock();
    4619     StructureStubInfo* stubInfo = &codeBlock->getStubInfo(CTI_RETURN_ADDRESS);
     4619    StructureStubInfo* stubInfo = &codeBlock->getStubInfo(STUB_RETURN_ADDRESS);
    46204620
    46214621    ASSERT(slot.slotBase()->isObject());
    … …  
    46234623
    46244624    if (slot.slotBase() == baseValue)
    4625         ctiRepatchCallByReturnAddress(CTI_RETURN_ADDRESS, reinterpret_cast<void*>(cti_op_get_by_id_proto_fail));
     4625        ctiRepatchCallByReturnAddress(STUB_RETURN_ADDRESS, reinterpret_cast<void*>(cti_op_get_by_id_proto_fail));
    46264626    else if (slot.slotBase() == asCell(baseValue)->structure()->prototypeForLookup(callFrame)) {
    46274627        // Since we're accessing a prototype in a loop, it's a good bet that it
    … …  
    46394639
    46404640        if (listIndex == (POLYMORPHIC_LIST_CACHE_SIZE - 1))
    4641             ctiRepatchCallByReturnAddress(CTI_RETURN_ADDRESS, reinterpret_cast<void*>(cti_op_get_by_id_proto_list_full));
     4641            ctiRepatchCallByReturnAddress(STUB_RETURN_ADDRESS, reinterpret_cast<void*>(cti_op_get_by_id_proto_list_full));
    46424642    } else if (size_t count = countPrototypeChainEntriesAndCheckForProxies(callFrame, baseValue, slot)) {
    46434643        StructureChain* chain = structure->cachedPrototypeChain();
    … …  
    46524652
    46534653        if (listIndex == (POLYMORPHIC_LIST_CACHE_SIZE - 1))
    4654             ctiRepatchCallByReturnAddress(CTI_RETURN_ADDRESS, reinterpret_cast<void*>(cti_op_get_by_id_proto_list_full));
     4654            ctiRepatchCallByReturnAddress(STUB_RETURN_ADDRESS, reinterpret_cast<void*>(cti_op_get_by_id_proto_list_full));
    46554655    } else
    4656         ctiRepatchCallByReturnAddress(CTI_RETURN_ADDRESS, reinterpret_cast<void*>(cti_op_get_by_id_proto_fail));
     4656        ctiRepatchCallByReturnAddress(STUB_RETURN_ADDRESS, reinterpret_cast<void*>(cti_op_get_by_id_proto_fail));
    46574657
    46584658    return result;
    46594659}
    46604660
    4661 JSValue* Interpreter::cti_op_get_by_id_proto_list_full(CTI_ARGS)
    4662 {
    4663     CTI_STACK_HACK();
     4661JSValue* Interpreter::cti_op_get_by_id_proto_list_full(STUB_ARGS)
     4662{
     4663    BEGIN_STUB_FUNCTION();
    46644664
    46654665    JSValue* baseValue = ARG_src1;
    … …  
    46714671}
    46724672
    4673 JSValue* Interpreter::cti_op_get_by_id_proto_fail(CTI_ARGS)
    4674 {
    4675     CTI_STACK_HACK();
     4673JSValue* Interpreter::cti_op_get_by_id_proto_fail(STUB_ARGS)
     4674{
     4675    BEGIN_STUB_FUNCTION();
    46764676
    46774677    JSValue* baseValue = ARG_src1;
    … …  
    46834683}
    46844684
    4685 JSValue* Interpreter::cti_op_get_by_id_array_fail(CTI_ARGS)
    4686 {
    4687     CTI_STACK_HACK();
     4685JSValue* Interpreter::cti_op_get_by_id_array_fail(STUB_ARGS)
     4686{
     4687    BEGIN_STUB_FUNCTION();
    46884688
    46894689    JSValue* baseValue = ARG_src1;
    … …  
    46954695}
    46964696
    4697 JSValue* Interpreter::cti_op_get_by_id_string_fail(CTI_ARGS)
    4698 {
    4699     CTI_STACK_HACK();
     4697JSValue* Interpreter::cti_op_get_by_id_string_fail(STUB_ARGS)
     4698{
     4699    BEGIN_STUB_FUNCTION();
    47004700
    47014701    JSValue* baseValue = ARG_src1;
    … …  
    47094709#endif
    47104710
    4711 JSValue* Interpreter::cti_op_instanceof(CTI_ARGS)
    4712 {
    4713     CTI_STACK_HACK();
     4711JSValue* Interpreter::cti_op_instanceof(STUB_ARGS)
     4712{
     4713    BEGIN_STUB_FUNCTION();
    47144714
    47154715    CallFrame* callFrame = ARG_callFrame;
    … …  
    47264726        CallFrame* callFrame = ARG_callFrame;
    47274727        CodeBlock* codeBlock = callFrame->codeBlock();
    4728         unsigned vPCIndex = codeBlock->getBytecodeIndex(CTI_RETURN_ADDRESS);
     4728        unsigned vPCIndex = codeBlock->getBytecodeIndex(STUB_RETURN_ADDRESS);
    47294729        ARG_globalData->exception = createInvalidParamError(callFrame, "instanceof", baseVal, vPCIndex, codeBlock);
    47304730        VM_THROW_EXCEPTION();
    … …  
    47484748}
    47494749
    4750 JSValue* Interpreter::cti_op_del_by_id(CTI_ARGS)
    4751 {
    4752     CTI_STACK_HACK();
     4750JSValue* Interpreter::cti_op_del_by_id(STUB_ARGS)
     4751{
     4752    BEGIN_STUB_FUNCTION();
    47534753
    47544754    CallFrame* callFrame = ARG_callFrame;
    … …  
    47614761}
    47624762
    4763 JSValue* Interpreter::cti_op_mul(CTI_ARGS)
    4764 {
    4765     CTI_STACK_HACK();
     4763JSValue* Interpreter::cti_op_mul(STUB_ARGS)
     4764{
     4765    BEGIN_STUB_FUNCTION();
    47664766
    47674767    JSValue* src1 = ARG_src1;
    … …  
    47794779}
    47804780
    4781 JSObject* Interpreter::cti_op_new_func(CTI_ARGS)
    4782 {
    4783     CTI_STACK_HACK();
     4781JSObject* Interpreter::cti_op_new_func(STUB_ARGS)
     4782{
     4783    BEGIN_STUB_FUNCTION();
    47844784
    47854785    return ARG_func1->makeFunction(ARG_callFrame, ARG_callFrame->scopeChain());
    47864786}
    47874787
    4788 void* Interpreter::cti_op_call_JSFunction(CTI_ARGS)
    4789 {
    4790     CTI_STACK_HACK();
     4788void* Interpreter::cti_op_call_JSFunction(STUB_ARGS)
     4789{
     4790    BEGIN_STUB_FUNCTION();
    47914791
    47924792#ifndef NDEBUG
    … …  
    48044804}
    48054805
    4806 VoidPtrPair Interpreter::cti_op_call_arityCheck(CTI_ARGS)
    4807 {
    4808     CTI_STACK_HACK();
     4806VoidPtrPair Interpreter::cti_op_call_arityCheck(STUB_ARGS)
     4807{
     4808    BEGIN_STUB_FUNCTION();
    48094809
    48104810    CallFrame* callFrame = ARG_callFrame;
    … …  
    48344834            // moved the call frame forward.
    48354835            ARG_setCallFrame(oldCallFrame);
    4836             throwStackOverflowError(oldCallFrame, ARG_globalData, ARG_returnAddress2, CTI_RETURN_ADDRESS);
     4836            throwStackOverflowError(oldCallFrame, ARG_globalData, ARG_returnAddress2, STUB_RETURN_ADDRESS);
    48374837            RETURN_PAIR(0, 0);
    48384838        }
    … …  
    48494849}
    48504850
    4851 void* Interpreter::cti_vm_dontLazyLinkCall(CTI_ARGS)
    4852 {
    4853     CTI_STACK_HACK();
     4851void* Interpreter::cti_vm_dontLazyLinkCall(STUB_ARGS)
     4852{
     4853    BEGIN_STUB_FUNCTION();
    48544854
    48554855    JSFunction* callee = asFunction(ARG_src1);
    … …  
    48634863}
    48644864
    4865 void* Interpreter::cti_vm_lazyLinkCall(CTI_ARGS)
    4866 {
    4867     CTI_STACK_HACK();
     4865void* Interpreter::cti_vm_lazyLinkCall(STUB_ARGS)
     4866{
     4867    BEGIN_STUB_FUNCTION();
    48684868
    48694869    JSFunction* callee = asFunction(ARG_src1);
    … …  
    48784878}
    48794879
    4880 JSObject* Interpreter::cti_op_push_activation(CTI_ARGS)
    4881 {
    4882     CTI_STACK_HACK();
     4880JSObject* Interpreter::cti_op_push_activation(STUB_ARGS)
     4881{
     4882    BEGIN_STUB_FUNCTION();
    48834883
    48844884    JSActivation* activation = new (ARG_globalData) JSActivation(ARG_callFrame, static_cast<FunctionBodyNode*>(ARG_callFrame->codeBlock()->ownerNode()));
    … …  
    48874887}
    48884888
    4889 JSValue* Interpreter::cti_op_call_NotJSFunction(CTI_ARGS)
    4890 {
    4891     CTI_STACK_HACK();
     4889JSValue* Interpreter::cti_op_call_NotJSFunction(STUB_ARGS)
     4890{
     4891    BEGIN_STUB_FUNCTION();
    48924892
    48934893    JSValue* funcVal = ARG_src1;
    … …  
    49044904        CallFrame* callFrame = CallFrame::create(previousCallFrame->registers() + registerOffset);
    49054905
    4906         callFrame->init(0, static_cast<Instruction*>(CTI_RETURN_ADDRESS), previousCallFrame->scopeChain(), previousCallFrame, 0, argCount, 0);
     4906        callFrame->init(0, static_cast<Instruction*>(STUB_RETURN_ADDRESS), previousCallFrame->scopeChain(), previousCallFrame, 0, argCount, 0);
    49074907        ARG_setCallFrame(callFrame);
    49084908
    … …  
    49304930
    49314931    CodeBlock* codeBlock = ARG_callFrame->codeBlock();
    4932     unsigned vPCIndex = codeBlock->getBytecodeIndex(CTI_RETURN_ADDRESS);
     4932    unsigned vPCIndex = codeBlock->getBytecodeIndex(STUB_RETURN_ADDRESS);
    49334933    ARG_globalData->exception = createNotAFunctionError(ARG_callFrame, funcVal, vPCIndex, codeBlock);
    49344934    VM_THROW_EXCEPTION();
    49354935}
    49364936
    4937 void Interpreter::cti_op_create_arguments(CTI_ARGS)
    4938 {
    4939     CTI_STACK_HACK();
     4937void Interpreter::cti_op_create_arguments(STUB_ARGS)
     4938{
     4939    BEGIN_STUB_FUNCTION();
    49404940
    49414941    Arguments* arguments = new (ARG_globalData) Arguments(ARG_callFrame);
    … …  
    49444944}
    49454945
    4946 void Interpreter::cti_op_create_arguments_no_params(CTI_ARGS)
    4947 {
    4948     CTI_STACK_HACK();
     4946void Interpreter::cti_op_create_arguments_no_params(STUB_ARGS)
     4947{
     4948    BEGIN_STUB_FUNCTION();
    49494949
    49504950    Arguments* arguments = new (ARG_globalData) Arguments(ARG_callFrame, Arguments::NoParameters);
    … …  
    49534953}
    49544954
    4955 void Interpreter::cti_op_tear_off_activation(CTI_ARGS)
    4956 {
    4957     CTI_STACK_HACK();
     4955void Interpreter::cti_op_tear_off_activation(STUB_ARGS)
     4956{
     4957    BEGIN_STUB_FUNCTION();
    49584958
    49594959    ASSERT(ARG_callFrame->codeBlock()->needsFullScopeChain());
    … …  
    49614961}
    49624962
    4963 void Interpreter::cti_op_tear_off_arguments(CTI_ARGS)
    4964 {
    4965     CTI_STACK_HACK();
     4963void Interpreter::cti_op_tear_off_arguments(STUB_ARGS)
     4964{
     4965    BEGIN_STUB_FUNCTION();
    49664966
    49674967    ASSERT(ARG_callFrame->codeBlock()->usesArguments() && !ARG_callFrame->codeBlock()->needsFullScopeChain());
    … …  
    49694969}
    49704970
    4971 void Interpreter::cti_op_profile_will_call(CTI_ARGS)
    4972 {
    4973     CTI_STACK_HACK();
     4971void Interpreter::cti_op_profile_will_call(STUB_ARGS)
     4972{
     4973    BEGIN_STUB_FUNCTION();
    49744974
    49754975    ASSERT(*ARG_profilerReference);
    … …  
    49774977}
    49784978
    4979 void Interpreter::cti_op_profile_did_call(CTI_ARGS)
    4980 {
    4981     CTI_STACK_HACK();
     4979void Interpreter::cti_op_profile_did_call(STUB_ARGS)
     4980{
     4981    BEGIN_STUB_FUNCTION();
    49824982
    49834983    ASSERT(*ARG_profilerReference);
    … …  
    49854985}
    49864986
    4987 void Interpreter::cti_op_ret_scopeChain(CTI_ARGS)
    4988 {
    4989     CTI_STACK_HACK();
     4987void Interpreter::cti_op_ret_scopeChain(STUB_ARGS)
     4988{
     4989    BEGIN_STUB_FUNCTION();
    49904990
    49914991    ASSERT(ARG_callFrame->codeBlock()->needsFullScopeChain());
    … …  
    49934993}
    49944994
    4995 JSObject* Interpreter::cti_op_new_array(CTI_ARGS)
    4996 {
    4997     CTI_STACK_HACK();
     4995JSObject* Interpreter::cti_op_new_array(STUB_ARGS)
     4996{
     4997    BEGIN_STUB_FUNCTION();
    49984998
    49994999    ArgList argList(&ARG_callFrame->registers()[ARG_int1], ARG_int2);
    … …  
    50015001}
    50025002
    5003 JSValue* Interpreter::cti_op_resolve(CTI_ARGS)
    5004 {
    5005     CTI_STACK_HACK();
     5003JSValue* Interpreter::cti_op_resolve(STUB_ARGS)
     5004{
     5005    BEGIN_STUB_FUNCTION();
    50065006
    50075007    CallFrame* callFrame = ARG_callFrame;
    … …  
    50245024
    50255025    CodeBlock* codeBlock = callFrame->codeBlock();
    5026     unsigned vPCIndex = codeBlock->getBytecodeIndex(CTI_RETURN_ADDRESS);
     5026    unsigned vPCIndex = codeBlock->getBytecodeIndex(STUB_RETURN_ADDRESS);
    50275027    ARG_globalData->exception = createUndefinedVariableError(callFrame, ident, vPCIndex, codeBlock);
    50285028    VM_THROW_EXCEPTION();
    50295029}
    50305030
    5031 JSObject* Interpreter::cti_op_construct_JSConstruct(CTI_ARGS)
    5032 {
    5033     CTI_STACK_HACK();
     5031JSObject* Interpreter::cti_op_construct_JSConstruct(STUB_ARGS)
     5032{
     5033    BEGIN_STUB_FUNCTION();
    50345034
    50355035#ifndef NDEBUG
    … …  
    50465046}
    50475047
    5048 JSValue* Interpreter::cti_op_construct_NotJSConstruct(CTI_ARGS)
    5049 {
    5050     CTI_STACK_HACK();
     5048JSValue* Interpreter::cti_op_construct_NotJSConstruct(STUB_ARGS)
     5049{
     5050    BEGIN_STUB_FUNCTION();
    50515051
    50525052    CallFrame* callFrame = ARG_callFrame;
    … …  
    50755075
    50765076    CodeBlock* codeBlock = callFrame->codeBlock();
    5077     unsigned vPCIndex = codeBlock->getBytecodeIndex(CTI_RETURN_ADDRESS);
     5077    unsigned vPCIndex = codeBlock->getBytecodeIndex(STUB_RETURN_ADDRESS);
    50785078    ARG_globalData->exception = createNotAConstructorError(callFrame, constrVal, vPCIndex, codeBlock);
    50795079    VM_THROW_EXCEPTION();
    50805080}
    50815081
    5082 JSValue* Interpreter::cti_op_get_by_val(CTI_ARGS)
    5083 {
    5084     CTI_STACK_HACK();
     5082JSValue* Interpreter::cti_op_get_by_val(STUB_ARGS)
     5083{
     5084    BEGIN_STUB_FUNCTION();
    50855085
    50865086    CallFrame* callFrame = ARG_callFrame;
    … …  
    51145114}
    51155115
    5116 VoidPtrPair Interpreter::cti_op_resolve_func(CTI_ARGS)
    5117 {
    5118     CTI_STACK_HACK();
     5116VoidPtrPair Interpreter::cti_op_resolve_func(STUB_ARGS)
     5117{
     5118    BEGIN_STUB_FUNCTION();
    51195119
    51205120    CallFrame* callFrame = ARG_callFrame;
    … …  
    51515151
    51525152    CodeBlock* codeBlock = callFrame->codeBlock();
    5153     unsigned vPCIndex = codeBlock->getBytecodeIndex(CTI_RETURN_ADDRESS);
     5153    unsigned vPCIndex = codeBlock->getBytecodeIndex(STUB_RETURN_ADDRESS);
    51545154    ARG_globalData->exception = createUndefinedVariableError(callFrame, ident, vPCIndex, codeBlock);
    51555155    VM_THROW_EXCEPTION_2();
    51565156}
    51575157
    5158 JSValue* Interpreter::cti_op_sub(CTI_ARGS)
    5159 {
    5160     CTI_STACK_HACK();
     5158JSValue* Interpreter::cti_op_sub(STUB_ARGS)
     5159{
     5160    BEGIN_STUB_FUNCTION();
    51615161
    51625162    JSValue* src1 = ARG_src1;
    … …  
    51745174}
    51755175
    5176 void Interpreter::cti_op_put_by_val(CTI_ARGS)
    5177 {
    5178     CTI_STACK_HACK();
     5176void Interpreter::cti_op_put_by_val(STUB_ARGS)
     5177{
     5178    BEGIN_STUB_FUNCTION();
    51795179
    51805180    CallFrame* callFrame = ARG_callFrame;
    … …  
    52085208}
    52095209
    5210 void Interpreter::cti_op_put_by_val_array(CTI_ARGS)
    5211 {
    5212     CTI_STACK_HACK();
     5210void Interpreter::cti_op_put_by_val_array(STUB_ARGS)
     5211{
     5212    BEGIN_STUB_FUNCTION();
    52135213
    52145214    CallFrame* callFrame = ARG_callFrame;
    … …  
    52345234}
    52355235
    5236 JSValue* Interpreter::cti_op_lesseq(CTI_ARGS)
    5237 {
    5238     CTI_STACK_HACK();
     5236JSValue* Interpreter::cti_op_lesseq(STUB_ARGS)
     5237{
     5238    BEGIN_STUB_FUNCTION();
    52395239
    52405240    CallFrame* callFrame = ARG_callFrame;
    … …  
    52445244}
    52455245
    5246 int Interpreter::cti_op_loop_if_true(CTI_ARGS)
    5247 {
    5248     CTI_STACK_HACK();
     5246int Interpreter::cti_op_loop_if_true(STUB_ARGS)
     5247{
     5248    BEGIN_STUB_FUNCTION();
    52495249
    52505250    JSValue* src1 = ARG_src1;
    … …  
    52575257}
    52585258
    5259 JSValue* Interpreter::cti_op_negate(CTI_ARGS)
    5260 {
    5261     CTI_STACK_HACK();
     5259JSValue* Interpreter::cti_op_negate(STUB_ARGS)
     5260{
     5261    BEGIN_STUB_FUNCTION();
    52625262
    52635263    JSValue* src = ARG_src1;
    … …  
    52735273}
    52745274
    5275 JSValue* Interpreter::cti_op_resolve_base(CTI_ARGS)
    5276 {
    5277     CTI_STACK_HACK();
     5275JSValue* Interpreter::cti_op_resolve_base(STUB_ARGS)
     5276{
     5277    BEGIN_STUB_FUNCTION();
    52785278
    52795279    return inlineResolveBase(ARG_callFrame, *ARG_id1, ARG_callFrame->scopeChain());
    52805280}
    52815281
    5282 JSValue* Interpreter::cti_op_resolve_skip(CTI_ARGS)
    5283 {
    5284     CTI_STACK_HACK();
     5282JSValue* Interpreter::cti_op_resolve_skip(STUB_ARGS)
     5283{
     5284    BEGIN_STUB_FUNCTION();
    52855285
    52865286    CallFrame* callFrame = ARG_callFrame;
    … …  
    53085308
    53095309    CodeBlock* codeBlock = callFrame->codeBlock();
    5310     unsigned vPCIndex = codeBlock->getBytecodeIndex(CTI_RETURN_ADDRESS);
     5310    unsigned vPCIndex = codeBlock->getBytecodeIndex(STUB_RETURN_ADDRESS);
    53115311    ARG_globalData->exception = createUndefinedVariableError(callFrame, ident, vPCIndex, codeBlock);
    53125312    VM_THROW_EXCEPTION();
    53135313}
    53145314
    5315 JSValue* Interpreter::cti_op_resolve_global(CTI_ARGS)
    5316 {
    5317     CTI_STACK_HACK();
     5315JSValue* Interpreter::cti_op_resolve_global(STUB_ARGS)
     5316{
     5317    BEGIN_STUB_FUNCTION();
    53185318
    53195319    CallFrame* callFrame = ARG_callFrame;
    … …  
    53405340    }
    53415341
    5342     unsigned vPCIndex = ARG_callFrame->codeBlock()->getBytecodeIndex(CTI_RETURN_ADDRESS);
     5342    unsigned vPCIndex = ARG_callFrame->codeBlock()->getBytecodeIndex(STUB_RETURN_ADDRESS);
    53435343    ARG_globalData->exception = createUndefinedVariableError(callFrame, ident, vPCIndex, callFrame->codeBlock());
    53445344    VM_THROW_EXCEPTION();
    53455345}
    53465346
    5347 JSValue* Interpreter::cti_op_div(CTI_ARGS)
    5348 {
    5349     CTI_STACK_HACK();
     5347JSValue* Interpreter::cti_op_div(STUB_ARGS)
     5348{
     5349    BEGIN_STUB_FUNCTION();
    53505350
    53515351    JSValue* src1 = ARG_src1;
    … …  
    53635363}
    53645364
    5365 JSValue* Interpreter::cti_op_pre_dec(CTI_ARGS)
    5366 {
    5367     CTI_STACK_HACK();
     5365JSValue* Interpreter::cti_op_pre_dec(STUB_ARGS)
     5366{
     5367    BEGIN_STUB_FUNCTION();
    53685368
    53695369    JSValue* v = ARG_src1;
    … …  
    53755375}
    53765376
    5377 int Interpreter::cti_op_jless(CTI_ARGS)
    5378 {
    5379     CTI_STACK_HACK();
     5377int Interpreter::cti_op_jless(STUB_ARGS)
     5378{
     5379    BEGIN_STUB_FUNCTION();
    53805380
    53815381    JSValue* src1 = ARG_src1;
    … …  
    53885388}
    53895389
    5390 JSValue* Interpreter::cti_op_not(CTI_ARGS)
    5391 {
    5392     CTI_STACK_HACK();
     5390JSValue* Interpreter::cti_op_not(STUB_ARGS)
     5391{
     5392    BEGIN_STUB_FUNCTION();
    53935393
    53945394    JSValue* src = ARG_src1;
    … …  
    54015401}
    54025402
    5403 int SFX_CALL Interpreter::cti_op_jtrue(CTI_ARGS)
    5404 {
    5405     CTI_STACK_HACK();
     5403int Interpreter::cti_op_jtrue(STUB_ARGS)
     5404{
     5405    BEGIN_STUB_FUNCTION();
    54065406
    54075407    JSValue* src1 = ARG_src1;
    … …  
    54145414}
    54155415
    5416 VoidPtrPair Interpreter::cti_op_post_inc(CTI_ARGS)
    5417 {
    5418     CTI_STACK_HACK();
     5416VoidPtrPair Interpreter::cti_op_post_inc(STUB_ARGS)
     5417{
     5418    BEGIN_STUB_FUNCTION();
    54195419
    54205420    JSValue* v = ARG_src1;
    … …  
    54285428}
    54295429
    5430 JSValue* Interpreter::cti_op_eq(CTI_ARGS)
    5431 {
    5432     CTI_STACK_HACK();
     5430JSValue* Interpreter::cti_op_eq(STUB_ARGS)
     5431{
     5432    BEGIN_STUB_FUNCTION();
    54335433
    54345434    JSValue* src1 = ARG_src1;
    … …  
    54435443}
    54445444
    5445 JSValue* Interpreter::cti_op_lshift(CTI_ARGS)
    5446 {
    5447     CTI_STACK_HACK();
     5445JSValue* Interpreter::cti_op_lshift(STUB_ARGS)
     5446{
     5447    BEGIN_STUB_FUNCTION();
    54485448
    54495449    JSValue* val = ARG_src1;
    … …  
    54635463}
    54645464
    5465 JSValue* Interpreter::cti_op_bitand(CTI_ARGS)
    5466 {
    5467     CTI_STACK_HACK();
     5465JSValue* Interpreter::cti_op_bitand(STUB_ARGS)
     5466{
     5467    BEGIN_STUB_FUNCTION();
    54685468
    54695469    JSValue* src1 = ARG_src1;
    … …  
    54815481}
    54825482
    5483 JSValue* Interpreter::cti_op_rshift(CTI_ARGS)
    5484 {
    5485     CTI_STACK_HACK();
     5483JSValue* Interpreter::cti_op_rshift(STUB_ARGS)
     5484{
     5485    BEGIN_STUB_FUNCTION();
    54865486
    54875487    JSValue* val = ARG_src1;
    … …  
    55015501}
    55025502
    5503 JSValue* Interpreter::cti_op_bitnot(CTI_ARGS)
    5504 {
    5505     CTI_STACK_HACK();
     5503JSValue* Interpreter::cti_op_bitnot(STUB_ARGS)
     5504{
     5505    BEGIN_STUB_FUNCTION();
    55065506
    55075507    JSValue* src = ARG_src1;
    … …  
    55175517}
    55185518
    5519 VoidPtrPair Interpreter::cti_op_resolve_with_base(CTI_ARGS)
    5520 {
    5521     CTI_STACK_HACK();
     5519VoidPtrPair Interpreter::cti_op_resolve_with_base(STUB_ARGS)
     5520{
     5521    BEGIN_STUB_FUNCTION();
    55225522
    55235523    CallFrame* callFrame = ARG_callFrame;
    … …  
    55465546
    55475547    CodeBlock* codeBlock = callFrame->codeBlock();
    5548     unsigned vPCIndex = codeBlock->getBytecodeIndex(CTI_RETURN_ADDRESS);
     5548    unsigned vPCIndex = codeBlock->getBytecodeIndex(STUB_RETURN_ADDRESS);
    55495549    ARG_globalData->exception = createUndefinedVariableError(callFrame, ident, vPCIndex, codeBlock);
    55505550    VM_THROW_EXCEPTION_2();
    55515551}
    55525552
    5553 JSObject* Interpreter::cti_op_new_func_exp(CTI_ARGS)
    5554 {
    5555     CTI_STACK_HACK();
     5553JSObject* Interpreter::cti_op_new_func_exp(STUB_ARGS)
     5554{
     5555    BEGIN_STUB_FUNCTION();
    55565556
    55575557    return ARG_funcexp1->makeFunction(ARG_callFrame, ARG_callFrame->scopeChain());
    55585558}
    55595559
    5560 JSValue* Interpreter::cti_op_mod(CTI_ARGS)
    5561 {
    5562     CTI_STACK_HACK();
     5560JSValue* Interpreter::cti_op_mod(STUB_ARGS)
     5561{
     5562    BEGIN_STUB_FUNCTION();
    55635563
    55645564    JSValue* dividendValue = ARG_src1;
    … …  
    55725572}
    55735573
    5574 JSValue* Interpreter::cti_op_less(CTI_ARGS)
    5575 {
    5576     CTI_STACK_HACK();
     5574JSValue* Interpreter::cti_op_less(STUB_ARGS)
     5575{
     5576    BEGIN_STUB_FUNCTION();
    55775577
    55785578    CallFrame* callFrame = ARG_callFrame;
    … …  
    55825582}
    55835583
    5584 JSValue* Interpreter::cti_op_neq(CTI_ARGS)
    5585 {
    5586     CTI_STACK_HACK();
     5584JSValue* Interpreter::cti_op_neq(STUB_ARGS)
     5585{
     5586    BEGIN_STUB_FUNCTION();
    55875587
    55885588    JSValue* src1 = ARG_src1;
    … …  
    55975597}
    55985598
    5599 VoidPtrPair Interpreter::cti_op_post_dec(CTI_ARGS)
    5600 {
    5601     CTI_STACK_HACK();
     5599VoidPtrPair Interpreter::cti_op_post_dec(STUB_ARGS)
     5600{
     5601    BEGIN_STUB_FUNCTION();
    56025602
    56035603    JSValue* v = ARG_src1;
    … …  
    56115611}
    56125612
    5613 JSValue* Interpreter::cti_op_urshift(CTI_ARGS)
    5614 {
    5615     CTI_STACK_HACK();
     5613JSValue* Interpreter::cti_op_urshift(STUB_ARGS)
     5614{
     5615    BEGIN_STUB_FUNCTION();
    56165616
    56175617    JSValue* val = ARG_src1;
    … …  
    56295629}
    56305630
    5631 JSValue* Interpreter::cti_op_bitxor(CTI_ARGS)
    5632 {
    5633     CTI_STACK_HACK();
     5631JSValue* Interpreter::cti_op_bitxor(STUB_ARGS)
     5632{
     5633    BEGIN_STUB_FUNCTION();
    56345634
    56355635    JSValue* src1 = ARG_src1;
    … …  
    56435643}
    56445644
    5645 JSObject* Interpreter::cti_op_new_regexp(CTI_ARGS)
    5646 {
    5647     CTI_STACK_HACK();
     5645JSObject* Interpreter::cti_op_new_regexp(STUB_ARGS)
     5646{
     5647    BEGIN_STUB_FUNCTION();
    56485648
    56495649    return new (ARG_globalData) RegExpObject(ARG_callFrame->lexicalGlobalObject()->regExpStructure(), ARG_regexp1);
    56505650}
    56515651
    5652 JSValue* Interpreter::cti_op_bitor(CTI_ARGS)
    5653 {
    5654     CTI_STACK_HACK();
     5652JSValue* Interpreter::cti_op_bitor(STUB_ARGS)
     5653{
     5654    BEGIN_STUB_FUNCTION();
    56555655
    56565656    JSValue* src1 = ARG_src1;
    … …  
    56645664}
    56655665
    5666 JSValue* Interpreter::cti_op_call_eval(CTI_ARGS)
    5667 {
    5668     CTI_STACK_HACK();
     5666JSValue* Interpreter::cti_op_call_eval(STUB_ARGS)
     5667{
     5668    BEGIN_STUB_FUNCTION();
    56695669
    56705670    CallFrame* callFrame = ARG_callFrame;
    … …  
    56955695}
    56965696
    5697 JSValue* Interpreter::cti_op_throw(CTI_ARGS)
    5698 {
    5699     CTI_STACK_HACK();
     5697JSValue* Interpreter::cti_op_throw(STUB_ARGS)
     5698{
     5699    BEGIN_STUB_FUNCTION();
    57005700
    57015701    CallFrame* callFrame = ARG_callFrame;
    57025702    CodeBlock* codeBlock = callFrame->codeBlock();
    57035703
    5704     unsigned vPCIndex = codeBlock->getBytecodeIndex(CTI_RETURN_ADDRESS);
     5704    unsigned vPCIndex = codeBlock->getBytecodeIndex(STUB_RETURN_ADDRESS);
    57055705
    57065706    JSValue* exceptionValue = ARG_src1;
    … …  
    57175717    void* catchRoutine = handler->nativeCode;
    57185718    ASSERT(catchRoutine);
    5719     CTI_SET_RETURN_ADDRESS(catchRoutine);
     5719    STUB_SET_RETURN_ADDRESS(catchRoutine);
    57205720    return exceptionValue;
    57215721}
    57225722
    5723 JSPropertyNameIterator* Interpreter::cti_op_get_pnames(CTI_ARGS)
    5724 {
    5725     CTI_STACK_HACK();
     5723JSPropertyNameIterator* Interpreter::cti_op_get_pnames(STUB_ARGS)
     5724{
     5725    BEGIN_STUB_FUNCTION();
    57265726
    57275727    return JSPropertyNameIterator::create(ARG_callFrame, ARG_src1);
    57285728}
    57295729
    5730 JSValue* Interpreter::cti_op_next_pname(CTI_ARGS)
    5731 {
    5732     CTI_STACK_HACK();
     5730JSValue* Interpreter::cti_op_next_pname(STUB_ARGS)
     5731{
     5732    BEGIN_STUB_FUNCTION();
    57335733
    57345734    JSPropertyNameIterator* it = ARG_pni1;
    … …  
    57395739}
    57405740
    5741 void Interpreter::cti_op_push_scope(CTI_ARGS)
    5742 {
    5743     CTI_STACK_HACK();
     5741void Interpreter::cti_op_push_scope(STUB_ARGS)
     5742{
     5743    BEGIN_STUB_FUNCTION();
    57445744
    57455745    JSObject* o = ARG_src1->toObject(ARG_callFrame);
    … …  
    57485748}
    57495749
    5750 void Interpreter::cti_op_pop_scope(CTI_ARGS)
    5751 {
    5752     CTI_STACK_HACK();
     5750void Interpreter::cti_op_pop_scope(STUB_ARGS)
     5751{
     5752    BEGIN_STUB_FUNCTION();
    57535753
    57545754    ARG_callFrame->setScopeChain(ARG_callFrame->scopeChain()->pop());
    57555755}
    57565756
    5757 JSValue* Interpreter::cti_op_typeof(CTI_ARGS)
    5758 {
    5759     CTI_STACK_HACK();
     5757JSValue* Interpreter::cti_op_typeof(STUB_ARGS)
     5758{
     5759    BEGIN_STUB_FUNCTION();
    57605760
    57615761    return jsTypeStringForValue(ARG_callFrame, ARG_src1);
    57625762}
    57635763
    5764 JSValue* Interpreter::cti_op_is_undefined(CTI_ARGS)
    5765 {
    5766     CTI_STACK_HACK();
     5764JSValue* Interpreter::cti_op_is_undefined(STUB_ARGS)
     5765{
     5766    BEGIN_STUB_FUNCTION();
    57675767
    57685768    JSValue* v = ARG_src1;
    … …  
    57705770}
    57715771
    5772 JSValue* Interpreter::cti_op_is_boolean(CTI_ARGS)
    5773 {
    5774     CTI_STACK_HACK();
     5772JSValue* Interpreter::cti_op_is_boolean(STUB_ARGS)
     5773{
     5774    BEGIN_STUB_FUNCTION();
    57755775
    57765776    return jsBoolean(ARG_src1->isBoolean());
    57775777}
    57785778
    5779 JSValue* Interpreter::cti_op_is_number(CTI_ARGS)
    5780 {
    5781     CTI_STACK_HACK();
     5779JSValue* Interpreter::cti_op_is_number(STUB_ARGS)
     5780{
     5781    BEGIN_STUB_FUNCTION();
    57825782
    57835783    return jsBoolean(ARG_src1->isNumber());
    57845784}
    57855785
    5786 JSValue* Interpreter::cti_op_is_string(CTI_ARGS)
    5787 {
    5788     CTI_STACK_HACK();
     5786JSValue* Interpreter::cti_op_is_string(STUB_ARGS)
     5787{
     5788    BEGIN_STUB_FUNCTION();
    57895789
    57905790    return jsBoolean(ARG_globalData->interpreter->isJSString(ARG_src1));
    57915791}
    57925792
    5793 JSValue* Interpreter::cti_op_is_object(CTI_ARGS)
    5794 {
    5795     CTI_STACK_HACK();
     5793JSValue* Interpreter::cti_op_is_object(STUB_ARGS)
     5794{
     5795    BEGIN_STUB_FUNCTION();
    57965796
    57975797    return jsBoolean(jsIsObjectType(ARG_src1));
    57985798}
    57995799
    5800 JSValue* Interpreter::cti_op_is_function(CTI_ARGS)
    5801 {
    5802     CTI_STACK_HACK();
     5800JSValue* Interpreter::cti_op_is_function(STUB_ARGS)
     5801{
     5802    BEGIN_STUB_FUNCTION();
    58035803
    58045804    return jsBoolean(jsIsFunctionType(ARG_src1));
    58055805}
    58065806
    5807 JSValue* Interpreter::cti_op_stricteq(CTI_ARGS)
    5808 {
    5809     CTI_STACK_HACK();
     5807JSValue* Interpreter::cti_op_stricteq(STUB_ARGS)
     5808{
     5809    BEGIN_STUB_FUNCTION();
    58105810
    58115811    JSValue* src1 = ARG_src1;
    … …  
    58195819}
    58205820
    5821 JSValue* Interpreter::cti_op_nstricteq(CTI_ARGS)
    5822 {
    5823     CTI_STACK_HACK();
     5821JSValue* Interpreter::cti_op_nstricteq(STUB_ARGS)
     5822{
     5823    BEGIN_STUB_FUNCTION();
    58245824
    58255825    JSValue* src1 = ARG_src1;
    … …  
    58335833}
    58345834
    5835 JSValue* Interpreter::cti_op_to_jsnumber(CTI_ARGS)
    5836 {
    5837     CTI_STACK_HACK();
     5835JSValue* Interpreter::cti_op_to_jsnumber(STUB_ARGS)
     5836{
     5837    BEGIN_STUB_FUNCTION();
    58385838
    58395839    JSValue* src = ARG_src1;
    … …  
    58455845}
    58465846
    5847 JSValue* Interpreter::cti_op_in(CTI_ARGS)
    5848 {
    5849     CTI_STACK_HACK();
     5847JSValue* Interpreter::cti_op_in(STUB_ARGS)
     5848{
     5849    BEGIN_STUB_FUNCTION();
    58505850
    58515851    CallFrame* callFrame = ARG_callFrame;
    … …  
    58555855        CallFrame* callFrame = ARG_callFrame;
    58565856        CodeBlock* codeBlock = callFrame->codeBlock();
    5857         unsigned vPCIndex = codeBlock->getBytecodeIndex(CTI_RETURN_ADDRESS);
     5857        unsigned vPCIndex = codeBlock->getBytecodeIndex(STUB_RETURN_ADDRESS);
    58585858        ARG_globalData->exception = createInvalidParamError(callFrame, "in", baseVal, vPCIndex, codeBlock);
    58595859        VM_THROW_EXCEPTION();
    … …  
    58725872}
    58735873
    5874 JSObject* Interpreter::cti_op_push_new_scope(CTI_ARGS)
    5875 {
    5876     CTI_STACK_HACK();
     5874JSObject* Interpreter::cti_op_push_new_scope(STUB_ARGS)
     5875{
     5876    BEGIN_STUB_FUNCTION();
    58775877
    58785878    JSObject* scope = new (ARG_globalData) JSStaticScopeObject(ARG_callFrame, *ARG_id1, ARG_src2, DontDelete);
    … …  
    58835883}
    58845884
    5885 void Interpreter::cti_op_jmp_scopes(CTI_ARGS)
    5886 {
    5887     CTI_STACK_HACK();
     5885void Interpreter::cti_op_jmp_scopes(STUB_ARGS)
     5886{
     5887    BEGIN_STUB_FUNCTION();
    58885888
    58895889    unsigned count = ARG_int1;
    … …  
    58965896}
    58975897
    5898 void Interpreter::cti_op_put_by_index(CTI_ARGS)
    5899 {
    5900     CTI_STACK_HACK();
     5898void Interpreter::cti_op_put_by_index(STUB_ARGS)
     5899{
     5900    BEGIN_STUB_FUNCTION();
    59015901
    59025902    CallFrame* callFrame = ARG_callFrame;
    … …  
    59065906}
    59075907
    5908 void* Interpreter::cti_op_switch_imm(CTI_ARGS)
    5909 {
    5910     CTI_STACK_HACK();
     5908void* Interpreter::cti_op_switch_imm(STUB_ARGS)
     5909{
     5910    BEGIN_STUB_FUNCTION();
    59115911
    59125912    JSValue* scrutinee = ARG_src1;
    … …  
    59235923}
    59245924
    5925 void* Interpreter::cti_op_switch_char(CTI_ARGS)
    5926 {
    5927     CTI_STACK_HACK();
     5925void* Interpreter::cti_op_switch_char(STUB_ARGS)
     5926{
     5927    BEGIN_STUB_FUNCTION();
    59285928
    59295929    JSValue* scrutinee = ARG_src1;
    … …  
    59435943}
    59445944
    5945 void* Interpreter::cti_op_switch_string(CTI_ARGS)
    5946 {
    5947     CTI_STACK_HACK();
     5945void* Interpreter::cti_op_switch_string(STUB_ARGS)
     5946{
     5947    BEGIN_STUB_FUNCTION();
    59485948
    59495949    JSValue* scrutinee = ARG_src1;
    … …  
    59625962}
    59635963
    5964 JSValue* Interpreter::cti_op_del_by_val(CTI_ARGS)
    5965 {
    5966     CTI_STACK_HACK();
     5964JSValue* Interpreter::cti_op_del_by_val(STUB_ARGS)
     5965{
     5966    BEGIN_STUB_FUNCTION();
    59675967
    59685968    CallFrame* callFrame = ARG_callFrame;
    … …  
    59875987}
    59885988
    5989 void Interpreter::cti_op_put_getter(CTI_ARGS)
    5990 {
    5991     CTI_STACK_HACK();
     5989void Interpreter::cti_op_put_getter(STUB_ARGS)
     5990{
     5991    BEGIN_STUB_FUNCTION();
    59925992
    59935993    CallFrame* callFrame = ARG_callFrame;
    … …  
    59995999}
    60006000
    6001 void Interpreter::cti_op_put_setter(CTI_ARGS)
    6002 {
    6003     CTI_STACK_HACK();
     6001void Interpreter::cti_op_put_setter(STUB_ARGS)
     6002{
     6003    BEGIN_STUB_FUNCTION();
    60046004
    60056005    CallFrame* callFrame = ARG_callFrame;
    … …  
    60116011}
    60126012
    6013 JSObject* Interpreter::cti_op_new_error(CTI_ARGS)
    6014 {
    6015     CTI_STACK_HACK();
     6013JSObject* Interpreter::cti_op_new_error(STUB_ARGS)
     6014{
     6015    BEGIN_STUB_FUNCTION();
    60166016
    60176017    CallFrame* callFrame = ARG_callFrame;
    … …  
    60246024}
    60256025
    6026 void Interpreter::cti_op_debug(CTI_ARGS)
    6027 {
    6028     CTI_STACK_HACK();
     6026void Interpreter::cti_op_debug(STUB_ARGS)
     6027{
     6028    BEGIN_STUB_FUNCTION();
    60296029
    60306030    CallFrame* callFrame = ARG_callFrame;
    … …  
    60376037}
    60386038
    6039 JSValue* Interpreter::cti_vm_throw(CTI_ARGS)
    6040 {
    6041     CTI_STACK_HACK();
     6039JSValue* Interpreter::cti_vm_throw(STUB_ARGS)
     6040{
     6041    BEGIN_STUB_FUNCTION();
    60426042
    60436043    CallFrame* callFrame = ARG_callFrame;
    … …  
    60616061    void* catchRoutine = handler->nativeCode;
    60626062    ASSERT(catchRoutine);
    6063     CTI_SET_RETURN_ADDRESS(catchRoutine);
     6063    STUB_SET_RETURN_ADDRESS(catchRoutine);
    60646064    return exceptionValue;
    60656065}
    60666066
    6067 #undef CTI_RETURN_ADDRESS
    6068 #undef CTI_SET_RETURN_ADDRESS
    6069 #undef CTI_STACK_HACK
     6067#undef STUB_RETURN_ADDRESS
     6068#undef STUB_SET_RETURN_ADDRESS
     6069#undef BEGIN_STUB_FUNCTION
    60706070#undef CHECK_FOR_EXCEPTION
    60716071#undef CHECK_FOR_EXCEPTION_AT_END
Note: See TracChangeset for help on using the changeset viewer.