Changeset 174360 in webkit
- Timestamp:
- Oct 6, 2014 1:18:05 PM (9 years ago)
- Location:
- trunk/Source/JavaScriptCore
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/JavaScriptCore/ChangeLog
r174359 r174360 1 2014-10-06 Mark Lam <mark.lam@apple.com> 2 3 Unreviewed build fix. 4 <https://webkit.org/b/137279> 5 6 * jit/CCallHelpers.h: 7 (JSC::CCallHelpers::setupArgumentsWithExecState): 8 1 9 2014-10-06 Oliver Hunt <oliver@apple.com> 2 10 -
trunk/Source/JavaScriptCore/jit/CCallHelpers.h
r174216 r174360 1297 1297 } 1298 1298 1299 #if CPU(X86_64) || CPU(ARM64)1300 ALWAYS_INLINE void setupArgumentsWithExecState(TrustedImmPtr arg1, GPRReg arg2, TrustedImm32 arg3, TrustedImm32 arg4)1301 {1302 move(arg2, GPRInfo::argumentGPR2); // In case arg2 is argumentGPR1.1303 move(arg1, GPRInfo::argumentGPR1);1304 move(arg3, GPRInfo::argumentGPR3);1305 move(arg4, GPRInfo::argumentGPR4);1306 move(GPRInfo::callFrameRegister, GPRInfo::argumentGPR0);1307 }1308 #endif1309 1310 1299 ALWAYS_INLINE void setupArgumentsWithExecState(TrustedImmPtr arg1, GPRReg arg2, TrustedImmPtr arg3) 1311 1300 { … … 1381 1370 } 1382 1371 1372 ALWAYS_INLINE void setupArgumentsWithExecState(TrustedImmPtr arg1, GPRReg arg2, TrustedImm32 arg3, TrustedImm32 arg4) 1373 { 1374 poke(arg4, POKE_ARGUMENT_OFFSET); 1375 setupArgumentsWithExecState(arg1, arg2, arg3); 1376 } 1377 1383 1378 ALWAYS_INLINE void setupArgumentsWithExecState(TrustedImmPtr arg1, GPRReg arg2, TrustedImm32 arg3, TrustedImmPtr arg4) 1384 1379 { … … 1675 1670 } 1676 1671 1672 ALWAYS_INLINE void setupArgumentsWithExecState(TrustedImmPtr arg1, GPRReg arg2, TrustedImm32 arg3, TrustedImm32 arg4) 1673 { 1674 move(arg2, GPRInfo::argumentGPR2); // In case arg2 is argumentGPR1. 1675 move(arg1, GPRInfo::argumentGPR1); 1676 move(arg3, GPRInfo::argumentGPR3); 1677 move(arg4, GPRInfo::argumentGPR4); 1678 move(GPRInfo::callFrameRegister, GPRInfo::argumentGPR0); 1679 } 1680 1677 1681 ALWAYS_INLINE void setupArgumentsWithExecState(TrustedImmPtr arg1, GPRReg arg2, GPRReg arg3, TrustedImm32 arg4, TrustedImm32 arg5) 1678 1682 {
Note: See TracChangeset
for help on using the changeset viewer.