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

[ossy]

Title: [185323] trunk/Source/_javascript_Core

Revision

185323

Author

o...@webkit.org

Date

2015-06-08 11:21:59 -0700 (Mon, 08 Jun 2015)

Log Message

[ARM] Add the missing setupArgumentsWithExecState functions after r185240
https://bugs.webkit.org/show_bug.cgi?id=145754

Reviewed by Benjamin Poulain.

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

Modified Paths

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

Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (185322 => 185323)

--- trunk/Source/_javascript_Core/ChangeLog	2015-06-08 16:49:57 UTC (rev 185322)
+++ trunk/Source/_javascript_Core/ChangeLog	2015-06-08 18:21:59 UTC (rev 185323)
@@ -1,3 +1,13 @@
+2015-06-08  Csaba Osztrogonác  <o...@webkit.org>
+
+        [ARM] Add the missing setupArgumentsWithExecState functions after r185240
+        https://bugs.webkit.org/show_bug.cgi?id=145754
+
+        Reviewed by Benjamin Poulain.
+
+        * jit/CCallHelpers.h:
+        (JSC::CCallHelpers::setupArgumentsWithExecState):
+
 2015-06-08  Brady Eidson  <beid...@apple.com>
 
         Completely remove all IDB properties/constructors when it is disabled at runtime.

Modified: trunk/Source/_javascript_Core/jit/CCallHelpers.h (185322 => 185323)

--- trunk/Source/_javascript_Core/jit/CCallHelpers.h	2015-06-08 16:49:57 UTC (rev 185322)
+++ trunk/Source/_javascript_Core/jit/CCallHelpers.h	2015-06-08 18:21:59 UTC (rev 185323)
@@ -1810,6 +1810,14 @@
         setupArgumentsWithExecState(arg1, arg2, arg3);
     }
 
+    ALWAYS_INLINE void setupArgumentsWithExecState(TrustedImm32 arg1, GPRReg arg2, GPRReg arg3, GPRReg arg4, GPRReg arg5, TrustedImmPtr arg6)
+    {
+        poke(arg6, POKE_ARGUMENT_OFFSET + 2);
+        poke(arg5, POKE_ARGUMENT_OFFSET + 1);
+        poke(arg4, POKE_ARGUMENT_OFFSET);
+        setupArgumentsWithExecState(arg1, arg2, arg3);
+    }
+
     ALWAYS_INLINE void setupArgumentsWithExecState(TrustedImm32 arg1, GPRReg arg2, GPRReg arg3, GPRReg arg4, GPRReg arg5, GPRReg arg6, GPRReg arg7)
     {
         poke(arg7, POKE_ARGUMENT_OFFSET + 3);
@@ -1828,6 +1836,16 @@
         setupArgumentsWithExecState(arg1, arg2, arg3);
     }
 
+    ALWAYS_INLINE void setupArgumentsWithExecState(TrustedImm32 arg1, GPRReg arg2, GPRReg arg3, GPRReg arg4, GPRReg arg5, GPRReg arg6, GPRReg arg7, TrustedImmPtr arg8)
+    {
+        poke(arg8, POKE_ARGUMENT_OFFSET + 4);
+        poke(arg7, POKE_ARGUMENT_OFFSET + 3);
+        poke(arg6, POKE_ARGUMENT_OFFSET + 2);
+        poke(arg5, POKE_ARGUMENT_OFFSET + 1);
+        poke(arg4, POKE_ARGUMENT_OFFSET);
+        setupArgumentsWithExecState(arg1, arg2, arg3);
+    }
+
     ALWAYS_INLINE void setupArgumentsWithExecState(TrustedImm32 arg1, GPRReg arg2, GPRReg arg3, TrustedImm32 arg4, TrustedImm32 arg5, GPRReg arg6, GPRReg arg7)
     {
         poke(arg7, POKE_ARGUMENT_OFFSET + 3);

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