Modified: trunk/Source/_javascript_Core/ChangeLog (134070 => 134071)
--- trunk/Source/_javascript_Core/ChangeLog 2012-11-09 15:59:10 UTC (rev 134070)
+++ trunk/Source/_javascript_Core/ChangeLog 2012-11-09 16:02:52 UTC (rev 134071)
@@ -1,3 +1,16 @@
+2012-11-09 Gabor Ballabas <gab...@inf.u-szeged.hu>
+
+ [Qt] r133953 broke the ARM_TRADITIONAL build
+ https://bugs.webkit.org/show_bug.cgi?id=101706
+
+ Reviewed by Csaba Osztrogonác.
+
+ Fix for both hardfp and softfp.
+
+ * dfg/DFGCCallHelpers.h:
+ (CCallHelpers):
+ (JSC::DFG::CCallHelpers::setupArgumentsWithExecState):
+
2012-11-09 Sheriff Bot <webkit.review....@gmail.com>
Unreviewed, rolling out r134051.
Modified: trunk/Source/_javascript_Core/dfg/DFGCCallHelpers.h (134070 => 134071)
--- trunk/Source/_javascript_Core/dfg/DFGCCallHelpers.h 2012-11-09 15:59:10 UTC (rev 134070)
+++ trunk/Source/_javascript_Core/dfg/DFGCCallHelpers.h 2012-11-09 16:02:52 UTC (rev 134071)
@@ -535,6 +535,20 @@
moveDouble(ARMRegisters::d2, FPRInfo::argumentFPR1);
}
}
+
+ ALWAYS_INLINE void setupArgumentsWithExecState(FPRReg arg1, GPRReg arg2)
+ {
+ moveDouble(arg1, FPRInfo::argumentFPR0);
+ move(arg2, GPRInfo::argumentGPR1);
+ move(GPRInfo::callFrameRegister, GPRInfo::argumentGPR0);
+ }
+
+ ALWAYS_INLINE void setupArgumentsWithExecState(GPRReg arg1, GPRReg arg2, FPRReg arg3)
+ {
+ moveDouble(arg3, FPRInfo::argumentFPR0);
+ setupStubArguments(arg1, arg2);
+ move(GPRInfo::callFrameRegister, GPRInfo::argumentGPR0);
+ }
#else
ALWAYS_INLINE void setupArguments(FPRReg arg1)
{
@@ -857,6 +871,12 @@
setupArgumentsWithExecState(arg1, arg2, arg3);
}
+ ALWAYS_INLINE void setupArgumentsWithExecState(TrustedImm32 arg1, GPRReg arg2, TrustedImm32 arg3, GPRReg arg4)
+ {
+ poke(arg4);
+ setupArgumentsWithExecState(arg1, arg2, arg3);
+ }
+
ALWAYS_INLINE void setupArgumentsWithExecState(GPRReg arg1, GPRReg arg2, TrustedImm32 arg3, GPRReg arg4, GPRReg arg5)
{
poke(arg5, 1);
@@ -864,6 +884,13 @@
setupArgumentsWithExecState(arg1, arg2, arg3);
}
+ ALWAYS_INLINE void setupArgumentsWithExecState(GPRReg arg1, GPRReg arg2, TrustedImm32 arg3, GPRReg arg4, TrustedImm32 arg5)
+ {
+ poke(arg5, 1);
+ poke(arg4);
+ setupArgumentsWithExecState(arg1, arg2, arg3);
+ }
+
ALWAYS_INLINE void setupArgumentsWithExecState(TrustedImm32 arg1, GPRReg arg2, GPRReg arg3, GPRReg arg4, TrustedImmPtr arg5)
{
poke(arg5, 1);
