Changeset 269349 in webkit for trunk/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp
- Timestamp:
- Nov 3, 2020, 6:31:56 PM (5 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp
r268656 r269349 156 156 157 157 #define LLINT_CALL_END_IMPL(callFrame, callTarget, callTargetTag) \ 158 LLINT_RETURN_TWO((retagCodePtr<callTargetTag, SlowPathPtrTag>(callTarget)), (callFrame))158 LLINT_RETURN_TWO((retagCodePtr<callTargetTag, JSEntrySlowPathPtrTag>(callTarget)), (callFrame)) 159 159 160 160 #define LLINT_CALL_THROW(globalObject, exceptionToThrow) do { \ … … 468 468 *ptr += codeBlock->llintExecuteCounter().m_activeThreshold; 469 469 if (*ptr >= Options::earlyReturnFromInfiniteLoopsLimit()) 470 LLINT_RETURN_TWO(LLInt:: getCodePtr<JSEntryPtrTag>(fuzzer_return_early_from_loop_hint).executableAddress(), callFrame->topOfFrame());470 LLINT_RETURN_TWO(LLInt::fuzzerReturnEarlyFromLoopHintEntrypoint().code().executableAddress(), callFrame->topOfFrame()); 471 471 } 472 472 … … 1946 1946 } 1947 1947 1948 inline SlowPathReturnType commonCallEval(CallFrame* callFrame, const Instruction* pc, MacroAssemblerCode Ptr<JSEntryPtrTag> returnPoint)1948 inline SlowPathReturnType commonCallEval(CallFrame* callFrame, const Instruction* pc, MacroAssemblerCodeRef<JSEntryPtrTag> returnPoint) 1949 1949 { 1950 1950 LLINT_BEGIN_NO_SET_PC(); … … 1957 1957 calleeFrame->setCallerFrame(callFrame); 1958 1958 calleeFrame->uncheckedR(VirtualRegister(CallFrameSlot::callee)) = calleeAsValue; 1959 calleeFrame->setReturnPC(returnPoint. executableAddress());1959 calleeFrame->setReturnPC(returnPoint.code().executableAddress()); 1960 1960 calleeFrame->setCodeBlock(nullptr); 1961 1961 callFrame->setCurrentVPC(pc); … … 1971 1971 LLINT_SLOW_PATH_DECL(slow_path_call_eval) 1972 1972 { 1973 return commonCallEval(callFrame, pc, LLInt::ge tCodePtr<JSEntryPtrTag>(llint_generic_return_point));1973 return commonCallEval(callFrame, pc, LLInt::genericReturnPointEntrypoint(OpcodeSize::Narrow)); 1974 1974 } 1975 1975 1976 1976 LLINT_SLOW_PATH_DECL(slow_path_call_eval_wide16) 1977 1977 { 1978 return commonCallEval(callFrame, pc, LLInt::ge tWide16CodePtr<JSEntryPtrTag>(llint_generic_return_point));1978 return commonCallEval(callFrame, pc, LLInt::genericReturnPointEntrypoint(OpcodeSize::Wide16)); 1979 1979 } 1980 1980 1981 1981 LLINT_SLOW_PATH_DECL(slow_path_call_eval_wide32) 1982 1982 { 1983 return commonCallEval(callFrame, pc, LLInt::ge tWide32CodePtr<JSEntryPtrTag>(llint_generic_return_point));1983 return commonCallEval(callFrame, pc, LLInt::genericReturnPointEntrypoint(OpcodeSize::Wide32)); 1984 1984 } 1985 1985 … … 2266 2266 if (Options::forceOSRExitToLLInt() || codeBlock->jitType() == JITType::InterpreterThunk) { 2267 2267 const Instruction* nextPC = pc.next().ptr(); 2268 auto nextBytecode = LLInt::getCodePtr<JSEntryPtrTag>(*pc.next().ptr()); 2269 return encodeResult(nextPC, nextBytecode.executableAddress()); 2268 #if ENABLE(JIT) 2269 return encodeResult(nextPC, LLInt::normalOSRExitTrampolineThunk().code().executableAddress()); 2270 #else 2271 return encodeResult(nextPC, LLInt::getCodeRef<JSEntryPtrTag>(normal_osr_exit_trampoline).code().executableAddress()); 2272 #endif 2270 2273 } 2271 2274
Note:
See TracChangeset
for help on using the changeset viewer.