Changeset 157427 in webkit
- Timestamp:
- Oct 14, 2013 4:22:38 PM (10 years ago)
- Location:
- trunk/Source/JavaScriptCore
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/JavaScriptCore/ChangeLog
r157424 r157427 1 2013-10-14 Julien Brianceau <jbriance@cisco.com> 2 3 [sh4] Fixes after r157404 and r157411. 4 https://bugs.webkit.org/show_bug.cgi?id=122782 5 6 Reviewed by Michael Saboff. 7 8 * dfg/DFGSpeculativeJIT.h: 9 (JSC::DFG::SpeculativeJIT::callOperation): Add missing SH4_32BIT_DUMMY_ARG. 10 * jit/CCallHelpers.h: 11 (JSC::CCallHelpers::setupArgumentsWithExecState): 12 * jit/JITInlines.h: 13 (JSC::JIT::callOperation): Add missing SH4_32BIT_DUMMY_ARG. 14 * jit/JITPropertyAccess32_64.cpp: 15 (JSC::JIT::emit_op_put_by_id): Remove unwanted BEGIN_UNINTERRUPTED_SEQUENCE. 16 1 17 2013-10-14 Commit Queue <commit-queue@webkit.org> 2 18 -
trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.h
r157411 r157427 1623 1623 JITCompiler::Call callOperation(V_JITOperation_EJJI operation, GPRReg arg1Tag, GPRReg arg1Payload, GPRReg arg2Payload, StringImpl* uid) 1624 1624 { 1625 m_jit.setupArgumentsWithExecState(EABI_32BIT_DUMMY_ARG arg1Payload, arg1Tag, arg2Payload, TrustedImm32(JSValue::CellTag), TrustedImmPtr(uid));1625 m_jit.setupArgumentsWithExecState(EABI_32BIT_DUMMY_ARG arg1Payload, arg1Tag, SH4_32BIT_DUMMY_ARG arg2Payload, TrustedImm32(JSValue::CellTag), TrustedImmPtr(uid)); 1626 1626 return appendCallWithExceptionCheck(operation); 1627 1627 } -
trunk/Source/JavaScriptCore/jit/CCallHelpers.h
r157411 r157427 1158 1158 } 1159 1159 1160 ALWAYS_INLINE void setupArgumentsWithExecState(GPRReg arg1, GPRReg arg2, TrustedImm32 arg3, GPRReg arg4, GPRReg arg5, TrustedImm32 arg6) 1161 { 1162 poke(arg6, POKE_ARGUMENT_OFFSET + 2); 1163 poke(arg5, POKE_ARGUMENT_OFFSET + 1); 1164 poke(arg4, POKE_ARGUMENT_OFFSET); 1165 setupArgumentsWithExecState(arg1, arg2, arg3); 1166 } 1167 1168 ALWAYS_INLINE void setupArgumentsWithExecState(GPRReg arg1, GPRReg arg2, TrustedImm32 arg3, GPRReg arg4, GPRReg arg5, TrustedImmPtr arg6) 1169 { 1170 poke(arg6, POKE_ARGUMENT_OFFSET + 2); 1171 poke(arg5, POKE_ARGUMENT_OFFSET + 1); 1172 poke(arg4, POKE_ARGUMENT_OFFSET); 1173 setupArgumentsWithExecState(arg1, arg2, arg3); 1174 } 1175 1176 ALWAYS_INLINE void setupArgumentsWithExecState(GPRReg arg1, GPRReg arg2, TrustedImm32 arg3, GPRReg arg4, TrustedImm32 arg5, TrustedImmPtr arg6) 1177 { 1178 poke(arg6, POKE_ARGUMENT_OFFSET + 2); 1179 poke(arg5, POKE_ARGUMENT_OFFSET + 1); 1180 poke(arg4, POKE_ARGUMENT_OFFSET); 1181 setupArgumentsWithExecState(arg1, arg2, arg3); 1182 } 1183 1160 1184 #endif // NUMBER_OF_ARGUMENT_REGISTERS == 4 1161 1185 -
trunk/Source/JavaScriptCore/jit/JITInlines.h
r157411 r157427 429 429 ALWAYS_INLINE MacroAssembler::Call JIT::callOperation(V_JITOperation_EJJI operation, RegisterID regOp1Tag, RegisterID regOp1Payload, RegisterID regOp2Tag, RegisterID regOp2Payload, StringImpl* uid) 430 430 { 431 setupArgumentsWithExecState(EABI_32BIT_DUMMY_ARG regOp1Payload, regOp1Tag, regOp2Payload, regOp2Tag, TrustedImmPtr(uid));431 setupArgumentsWithExecState(EABI_32BIT_DUMMY_ARG regOp1Payload, regOp1Tag, SH4_32BIT_DUMMY_ARG regOp2Payload, regOp2Tag, TrustedImmPtr(uid)); 432 432 return appendCallWithExceptionCheck(operation); 433 433 } -
trunk/Source/JavaScriptCore/jit/JITPropertyAccess32_64.cpp
r157411 r157427 571 571 PropertyStubPutById, m_bytecodeOffset, structureToCompare, structureCheck, 572 572 propertyStorageLoad, storeWithPatch1, storeWithPatch2, done)); 573 BEGIN_UNINTERRUPTED_SEQUENCE(sequencePutById);574 573 } 575 574
Note: See TracChangeset
for help on using the changeset viewer.