Ignore:
Timestamp:
Dec 22, 2008, 1:21:18 PM (16 years ago)
Author:
[email protected]
Message:

2008-12-22 Sam Weinig <​[email protected]>

Reviewed by Gavin Barraclough.

Rename all uses of the term "repatch" to "patch".

  • assembler/MacroAssembler.h: (JSC::MacroAssembler::DataLabelPtr::patch): (JSC::MacroAssembler::DataLabel32::patch): (JSC::MacroAssembler::Jump::patch): (JSC::MacroAssembler::PatchBuffer::PatchBuffer): (JSC::MacroAssembler::PatchBuffer::setPtr): (JSC::MacroAssembler::loadPtrWithAddressOffsetPatch): (JSC::MacroAssembler::storePtrWithAddressOffsetPatch): (JSC::MacroAssembler::storePtrWithPatch): (JSC::MacroAssembler::jnePtrWithPatch):
  • assembler/X86Assembler.h: (JSC::X86Assembler::patchAddress): (JSC::X86Assembler::patchImmediate): (JSC::X86Assembler::patchPointer): (JSC::X86Assembler::patchBranchOffset):
  • interpreter/Interpreter.cpp: (JSC::Interpreter::tryCTICachePutByID): (JSC::Interpreter::tryCTICacheGetByID): (JSC::Interpreter::cti_op_put_by_id): (JSC::Interpreter::cti_op_get_by_id): (JSC::Interpreter::cti_op_get_by_id_self_fail): (JSC::Interpreter::cti_op_get_by_id_proto_list): (JSC::Interpreter::cti_vm_dontLazyLinkCall):
  • jit/JIT.cpp: (JSC::ctiPatchCallByReturnAddress): (JSC::JIT::privateCompileMainPass): (JSC::JIT::privateCompile): (JSC::JIT::privateCompileCTIMachineTrampolines):
  • jit/JIT.h:
  • jit/JITCall.cpp: (JSC::JIT::unlinkCall): (JSC::JIT::linkCall): (JSC::JIT::compileOpCall):
  • jit/JITPropertyAccess.cpp: (JSC::JIT::compileGetByIdHotPath): (JSC::JIT::compilePutByIdHotPath): (JSC::JIT::compileGetByIdSlowCase): (JSC::JIT::compilePutByIdSlowCase): (JSC::JIT::privateCompilePutByIdTransition): (JSC::JIT::patchGetByIdSelf): (JSC::JIT::patchPutByIdReplace): (JSC::JIT::privateCompilePatchGetArrayLength): (JSC::JIT::privateCompileGetByIdSelf): (JSC::JIT::privateCompileGetByIdProto): (JSC::JIT::privateCompileGetByIdSelfList): (JSC::JIT::privateCompileGetByIdProtoList): (JSC::JIT::privateCompileGetByIdChainList): (JSC::JIT::privateCompileGetByIdChain): (JSC::JIT::privateCompilePutByIdReplace):
File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/JavaScriptCore/interpreter/Interpreter.cpp

    r39380 r39440  
    40484048    // Uncacheable: give up.
    40494049    if (!slot.isCacheable()) {
    4050         ctiRepatchCallByReturnAddress(returnAddress, reinterpret_cast<void*>(cti_op_put_by_id_generic));
     4050        ctiPatchCallByReturnAddress(returnAddress, reinterpret_cast<void*>(cti_op_put_by_id_generic));
    40514051        return;
    40524052    }
    … …  
    40564056
    40574057    if (structure->isDictionary()) {
    4058         ctiRepatchCallByReturnAddress(returnAddress, reinterpret_cast<void*>(cti_op_put_by_id_generic));
     4058        ctiPatchCallByReturnAddress(returnAddress, reinterpret_cast<void*>(cti_op_put_by_id_generic));
    40594059        return;
    40604060    }
    … …  
    40624062    // If baseCell != base, then baseCell must be a proxy for another object.
    40634063    if (baseCell != slot.base()) {
    4064         ctiRepatchCallByReturnAddress(returnAddress, reinterpret_cast<void*>(cti_op_put_by_id_generic));
     4064        ctiPatchCallByReturnAddress(returnAddress, reinterpret_cast<void*>(cti_op_put_by_id_generic));
    40654065        return;
    40664066    }
    … …  
    41034103    // FIXME: Cache property access for immediates.
    41044104    if (JSImmediate::isImmediate(baseValue)) {
    4105         ctiRepatchCallByReturnAddress(returnAddress, reinterpret_cast<void*>(cti_op_get_by_id_generic));
     4105        ctiPatchCallByReturnAddress(returnAddress, reinterpret_cast<void*>(cti_op_get_by_id_generic));
    41064106        return;
    41074107    }
    … …  
    41114111        JIT::compilePatchGetArrayLength(callFrame->scopeChain()->globalData, codeBlock, returnAddress);
    41124112#else
    4113         ctiRepatchCallByReturnAddress(returnAddress, m_ctiArrayLengthTrampoline);
     4113        ctiPatchCallByReturnAddress(returnAddress, m_ctiArrayLengthTrampoline);
    41144114#endif
    41154115        return;
    41164116    }
    41174117    if (isJSString(baseValue) && propertyName == callFrame->propertyNames().length) {
    4118         // The tradeoff of compiling an repatched inline string length access routine does not seem
     4118        // The tradeoff of compiling an patched inline string length access routine does not seem
    41194119        // to pay off, so we currently only do this for arrays.
    4120         ctiRepatchCallByReturnAddress(returnAddress, m_ctiStringLengthTrampoline);
     4120        ctiPatchCallByReturnAddress(returnAddress, m_ctiStringLengthTrampoline);
    41214121        return;
    41224122    }
    … …  
    41244124    // Uncacheable: give up.
    41254125    if (!slot.isCacheable()) {
    4126         ctiRepatchCallByReturnAddress(returnAddress, reinterpret_cast<void*>(cti_op_get_by_id_generic));
     4126        ctiPatchCallByReturnAddress(returnAddress, reinterpret_cast<void*>(cti_op_get_by_id_generic));
    41274127        return;
    41284128    }
    … …  
    41324132
    41334133    if (structure->isDictionary()) {
    4134         ctiRepatchCallByReturnAddress(returnAddress, reinterpret_cast<void*>(cti_op_get_by_id_generic));
     4134        ctiPatchCallByReturnAddress(returnAddress, reinterpret_cast<void*>(cti_op_get_by_id_generic));
    41354135        return;
    41364136    }
    … …  
    44614461    ARG_src1->put(callFrame, ident, ARG_src3, slot);
    44624462
    4463     ctiRepatchCallByReturnAddress(STUB_RETURN_ADDRESS, reinterpret_cast<void*>(cti_op_put_by_id_second));
     4463    ctiPatchCallByReturnAddress(STUB_RETURN_ADDRESS, reinterpret_cast<void*>(cti_op_put_by_id_second));
    44644464
    44654465    CHECK_FOR_EXCEPTION_AT_END();
    … …  
    45004500    JSValue* result = baseValue->get(callFrame, ident, slot);
    45014501
    4502     ctiRepatchCallByReturnAddress(STUB_RETURN_ADDRESS, reinterpret_cast<void*>(cti_op_get_by_id_second));
     4502    ctiPatchCallByReturnAddress(STUB_RETURN_ADDRESS, reinterpret_cast<void*>(cti_op_get_by_id_second));
    45034503
    45044504    CHECK_FOR_EXCEPTION_AT_END();
    … …  
    45624562
    45634563        if (listIndex == (POLYMORPHIC_LIST_CACHE_SIZE - 1))
    4564             ctiRepatchCallByReturnAddress(STUB_RETURN_ADDRESS, reinterpret_cast<void*>(cti_op_get_by_id_generic));
     4564            ctiPatchCallByReturnAddress(STUB_RETURN_ADDRESS, reinterpret_cast<void*>(cti_op_get_by_id_generic));
    45654565    } else {
    4566         ctiRepatchCallByReturnAddress(STUB_RETURN_ADDRESS, reinterpret_cast<void*>(cti_op_get_by_id_generic));
     4566        ctiPatchCallByReturnAddress(STUB_RETURN_ADDRESS, reinterpret_cast<void*>(cti_op_get_by_id_generic));
    45674567    }
    45684568    return result;
    … …  
    46114611
    46124612    if (JSImmediate::isImmediate(baseValue) || !slot.isCacheable() || asCell(baseValue)->structure()->isDictionary()) {
    4613         ctiRepatchCallByReturnAddress(STUB_RETURN_ADDRESS, reinterpret_cast<void*>(cti_op_get_by_id_proto_fail));
     4613        ctiPatchCallByReturnAddress(STUB_RETURN_ADDRESS, reinterpret_cast<void*>(cti_op_get_by_id_proto_fail));
    46144614        return result;
    46154615    }
    … …  
    46234623
    46244624    if (slot.slotBase() == baseValue)
    4625         ctiRepatchCallByReturnAddress(STUB_RETURN_ADDRESS, reinterpret_cast<void*>(cti_op_get_by_id_proto_fail));
     4625        ctiPatchCallByReturnAddress(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(STUB_RETURN_ADDRESS, reinterpret_cast<void*>(cti_op_get_by_id_proto_list_full));
     4641            ctiPatchCallByReturnAddress(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(STUB_RETURN_ADDRESS, reinterpret_cast<void*>(cti_op_get_by_id_proto_list_full));
     4654            ctiPatchCallByReturnAddress(STUB_RETURN_ADDRESS, reinterpret_cast<void*>(cti_op_get_by_id_proto_list_full));
    46554655    } else
    4656         ctiRepatchCallByReturnAddress(STUB_RETURN_ADDRESS, reinterpret_cast<void*>(cti_op_get_by_id_proto_fail));
     4656        ctiPatchCallByReturnAddress(STUB_RETURN_ADDRESS, reinterpret_cast<void*>(cti_op_get_by_id_proto_fail));
    46574657
    46584658    return result;
    … …  
    48584858        JIT::compile(ARG_globalData, codeBlock);
    48594859
    4860     ctiRepatchCallByReturnAddress(ARG_returnAddress2, ARG_globalData->interpreter->m_ctiVirtualCallLink);
     4860    ctiPatchCallByReturnAddress(ARG_returnAddress2, ARG_globalData->interpreter->m_ctiVirtualCallLink);
    48614861
    48624862    return codeBlock->jitCode();
Note: See TracChangeset for help on using the changeset viewer.