[webkit-changes] [157467] trunk/Source/JavaScriptCore

[commit-queue]

Title: [157467] trunk/Source/_javascript_Core

Revision

157467

Author

commit-qu...@webkit.org

Date

2013-10-15 14:03:57 -0700 (Tue, 15 Oct 2013)

Log Message

Fix build after r157457 for architecture with 4 argument registers.
https://bugs.webkit.org/show_bug.cgi?id=122860

Patch by Julien Brianceau <jbria...@cisco.com> on 2013-10-15
Reviewed by Michael Saboff.

* jit/CCallHelpers.h:
(JSC::CCallHelpers::setupStubArguments134):

Modified Paths

• trunk/Source/_javascript_Core/ChangeLog
• trunk/Source/_javascript_Core/jit/CCallHelpers.h

Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (157466 => 157467)

--- trunk/Source/_javascript_Core/ChangeLog	2013-10-15 20:47:23 UTC (rev 157466)
+++ trunk/Source/_javascript_Core/ChangeLog	2013-10-15 21:03:57 UTC (rev 157467)
@@ -1,3 +1,13 @@
+2013-10-15  Julien Brianceau  <jbria...@cisco.com>
+
+        Fix build after r157457 for architecture with 4 argument registers.
+        https://bugs.webkit.org/show_bug.cgi?id=122860
+
+        Reviewed by Michael Saboff.
+
+        * jit/CCallHelpers.h:
+        (JSC::CCallHelpers::setupStubArguments134):
+
 2013-10-14  Michael Saboff  <msab...@apple.com>
 
         transition void cti_op_* methods to JIT operations.

Modified: trunk/Source/_javascript_Core/jit/CCallHelpers.h (157466 => 157467)

--- trunk/Source/_javascript_Core/jit/CCallHelpers.h	2013-10-15 20:47:23 UTC (rev 157466)
+++ trunk/Source/_javascript_Core/jit/CCallHelpers.h	2013-10-15 21:03:57 UTC (rev 157467)
@@ -616,10 +616,6 @@
         setupThreeStubArgsGPR<GPRInfo::argumentGPR1, GPRInfo::argumentGPR2, GPRInfo::argumentGPR3>(arg1, arg2, arg3);
     }
 
-    void setupStubArguments134(GPRReg arg1, GPRReg arg3, GPRReg arg4)
-    {
-        setupThreeStubArgsGPR<GPRInfo::argumentGPR1, GPRInfo::argumentGPR3, GPRInfo::argumentGPR4>(arg1, arg3, arg4);
-    }
 #if CPU(MIPS)
 #define POKE_ARGUMENT_OFFSET 4
 #else
@@ -1242,6 +1238,11 @@
 #endif // NUMBER_OF_ARGUMENT_REGISTERS == 4
 
 #if NUMBER_OF_ARGUMENT_REGISTERS >= 5
+    void setupStubArguments134(GPRReg arg1, GPRReg arg3, GPRReg arg4)
+    {
+        setupThreeStubArgsGPR<GPRInfo::argumentGPR1, GPRInfo::argumentGPR3, GPRInfo::argumentGPR4>(arg1, arg3, arg4);
+    }
+
     ALWAYS_INLINE void setupArgumentsWithExecState(GPRReg arg1, TrustedImmPtr arg2, TrustedImm32 arg3, GPRReg arg4)
     {
         setupTwoStubArgsGPR<GPRInfo::argumentGPR1, GPRInfo::argumentGPR4>(arg1, arg4);

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes