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

Thu, 07 Nov 2013 02:01:49 -0800

Title: [158830] trunk/Source/_javascript_Core
Revision
158830
Author
[email protected]
Date
2013-11-07 02:02:39 -0800 (Thu, 07 Nov 2013)

Log Message

Fix build for architectures with 4 argument registers (broken since r158820).
https://bugs.webkit.org/show_bug.cgi?id=123969

Patch by Julien Brianceau <[email protected]> on 2013-11-07
Reviewed by Andreas Kling.

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

Modified Paths

Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (158829 => 158830)


--- trunk/Source/_javascript_Core/ChangeLog	2013-11-07 09:32:57 UTC (rev 158829)
+++ trunk/Source/_javascript_Core/ChangeLog	2013-11-07 10:02:39 UTC (rev 158830)
@@ -1,3 +1,13 @@
+2013-11-07  Julien Brianceau  <[email protected]>
+
+        Fix build for architectures with 4 argument registers (broken since r158820).
+        https://bugs.webkit.org/show_bug.cgi?id=123969
+
+        Reviewed by Andreas Kling.
+
+        * jit/CCallHelpers.h:
+        (JSC::CCallHelpers::setupArguments):
+
 2013-11-05  Filip Pizlo  <[email protected]>
 
         FTL should support CheckFunction

Modified: trunk/Source/_javascript_Core/jit/CCallHelpers.h (158829 => 158830)


--- trunk/Source/_javascript_Core/jit/CCallHelpers.h	2013-11-07 09:32:57 UTC (rev 158829)
+++ trunk/Source/_javascript_Core/jit/CCallHelpers.h	2013-11-07 10:02:39 UTC (rev 158830)
@@ -956,20 +956,22 @@
         move(arg4, GPRInfo::argumentGPR3);
     }
     
-    ALWAYS_INLINE void setupArguments(GPRReg arg1, GPRReg arg2, TrustedImmPtr arg3, TrustedImm32 arg4, GPRReg arg5)
+    ALWAYS_INLINE void setupArguments(GPRReg arg1, TrustedImmPtr arg2, GPRReg arg3, TrustedImmPtr arg4)
     {
-        setupThreeStubArgsGPR<GPRInfo::argumentGPR0, GPRInfo::argumentGPR1, GPRInfo::argumentGPR4>(arg1, arg2, arg5);
-        move(arg3, GPRInfo::argumentGPR2);
+        setupTwoStubArgsGPR<GPRInfo::argumentGPR0, GPRInfo::argumentGPR2>(arg1, arg3);
+        move(arg2, GPRInfo::argumentGPR1);
         move(arg4, GPRInfo::argumentGPR3);
     }
     
-    ALWAYS_INLINE void setupArguments(GPRReg arg1, TrustedImmPtr arg2, GPRReg arg3, TrustedImmPtr arg4)
+    ALWAYS_INLINE void setupArguments(GPRReg arg1, GPRReg arg2, TrustedImmPtr arg3, TrustedImm32 arg4, GPRReg arg5, GPRReg arg6)
     {
-        setupTwoStubArgsGPR<GPRInfo::argumentGPR0, GPRInfo::argumentGPR2>(arg1, arg3);
-        move(arg2, GPRInfo::argumentGPR1);
+        poke(arg6, POKE_ARGUMENT_OFFSET + 1);
+        poke(arg5, POKE_ARGUMENT_OFFSET);
+        setupTwoStubArgsGPR<GPRInfo::argumentGPR0, GPRInfo::argumentGPR1>(arg1, arg2);
+        move(arg3, GPRInfo::argumentGPR2);
         move(arg4, GPRInfo::argumentGPR3);
     }
-    
+
     ALWAYS_INLINE void setupArguments(TrustedImmPtr arg1)
     {
         move(arg1, GPRInfo::argumentGPR0);
@@ -1521,6 +1523,13 @@
         move(arg2, GPRInfo::argumentGPR1);
         move(arg5, GPRInfo::argumentGPR4);
     }
+
+    ALWAYS_INLINE void setupArguments(GPRReg arg1, GPRReg arg2, TrustedImmPtr arg3, TrustedImm32 arg4, GPRReg arg5)
+    {
+        setupThreeStubArgsGPR<GPRInfo::argumentGPR0, GPRInfo::argumentGPR1, GPRInfo::argumentGPR4>(arg1, arg2, arg5);
+        move(arg3, GPRInfo::argumentGPR2);
+        move(arg4, GPRInfo::argumentGPR3);
+    }
 #endif
 
     void setupResults(GPRReg destA, GPRReg destB)

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to