Changeset 201161 in webkit

Timestamp:

May 19, 2016 7:19:12 AM (8 years ago)

Author:

Csaba Osztrogonác

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:

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• bytecode/PolymorphicAccess.cpp (modified) (1 diff)
• jit/CCallHelpers.h (modified) (2 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2016-05-19  Csaba Osztrogonác  <ossy@webkit.org>
+
+        [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  <sbarati@apple.com>
 

trunk/Source/JavaScriptCore/bytecode/PolymorphicAccess.cpp

@@ -48 +48 @@
 
 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

trunk/Source/JavaScriptCore/jit/CCallHelpers.h

@@ -45 +45 @@
 // 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
@@ -54 +54 @@
 // 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