Title: [201161] trunk/Source/_javascript_Core
Revision
201161
Author
[email protected]
Date
2016-05-19 07:19:12 -0700 (Thu, 19 May 2016)

Log Message

[ARM] Remove redefined macro after r200606
https://bugs.webkit.org/show_bug.cgi?id=157890

Reviewed by Michael Saboff.

* bytecode/PolymorphicAccess.cpp:
* jit/CCallHelpers.h:

Modified Paths

Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (201160 => 201161)


--- trunk/Source/_javascript_Core/ChangeLog	2016-05-19 14:15:09 UTC (rev 201160)
+++ trunk/Source/_javascript_Core/ChangeLog	2016-05-19 14:19:12 UTC (rev 201161)
@@ -1,3 +1,13 @@
+2016-05-19  Csaba Osztrogonác  <[email protected]>
+
+        [ARM] Remove redefined macro after r200606
+        https://bugs.webkit.org/show_bug.cgi?id=157890
+
+        Reviewed by Michael Saboff.
+
+        * bytecode/PolymorphicAccess.cpp:
+        * jit/CCallHelpers.h:
+
 2016-05-18  Saam barati  <[email protected]>
 
         Function with default parameter values that are arrow functions that capture this isn't working

Modified: trunk/Source/_javascript_Core/bytecode/PolymorphicAccess.cpp (201160 => 201161)


--- trunk/Source/_javascript_Core/bytecode/PolymorphicAccess.cpp	2016-05-19 14:15:09 UTC (rev 201160)
+++ trunk/Source/_javascript_Core/bytecode/PolymorphicAccess.cpp	2016-05-19 14:19:12 UTC (rev 201161)
@@ -48,14 +48,6 @@
 
 static const bool verbose = false;
 
-// EncodedJSValue in JSVALUE32_64 is a 64-bit integer. When being compiled in ARM EABI, it must be aligned on an even-numbered register (r0, r2 or [sp]).
-// To prevent the assembler from using wrong registers, let's occupy r1 or r3 with a dummy argument when necessary.
-#if (COMPILER_SUPPORTS(EABI) && CPU(ARM)) || CPU(MIPS)
-#define EABI_32BIT_DUMMY_ARG      CCallHelpers::TrustedImm32(0),
-#else
-#define EABI_32BIT_DUMMY_ARG
-#endif
-
 void AccessGenerationResult::dump(PrintStream& out) const
 {
     out.print(m_kind);

Modified: trunk/Source/_javascript_Core/jit/CCallHelpers.h (201160 => 201161)


--- trunk/Source/_javascript_Core/jit/CCallHelpers.h	2016-05-19 14:15:09 UTC (rev 201160)
+++ trunk/Source/_javascript_Core/jit/CCallHelpers.h	2016-05-19 14:19:12 UTC (rev 201161)
@@ -44,7 +44,7 @@
 // EncodedJSValue in JSVALUE32_64 is a 64-bit integer. When being compiled in ARM EABI, it must be aligned even-numbered register (r0, r2 or [sp]).
 // To avoid assemblies from using wrong registers, let's occupy r1 or r3 with a dummy argument when necessary.
 #if (COMPILER_SUPPORTS(EABI) && CPU(ARM)) || CPU(MIPS)
-#define EABI_32BIT_DUMMY_ARG      TrustedImm32(0),
+#define EABI_32BIT_DUMMY_ARG      CCallHelpers::TrustedImm32(0),
 #else
 #define EABI_32BIT_DUMMY_ARG
 #endif
@@ -53,7 +53,7 @@
 // To avoid this, let's occupy the 4th argument register (r7) with a dummy argument when necessary. This must only be done when there
 // is no other 32-bit value argument behind this 64-bit JSValue.
 #if CPU(SH4)
-#define SH4_32BIT_DUMMY_ARG      TrustedImm32(0),
+#define SH4_32BIT_DUMMY_ARG      CCallHelpers::TrustedImm32(0),
 #else
 #define SH4_32BIT_DUMMY_ARG
 #endif
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to