Title: [160648] trunk/Source
Revision
160648
Author
[email protected]
Date
2013-12-16 10:10:58 -0800 (Mon, 16 Dec 2013)

Log Message

Delete RVCT related code parts.
https://bugs.webkit.org/show_bug.cgi?id=125626

Patch by Peter Szanka <[email protected]> on 2013-12-16
Reviewed by Darin Adler.

Source/_javascript_Core:

* assembler/ARMAssembler.cpp:
* assembler/ARMAssembler.h:
(JSC::ARMAssembler::cacheFlush):
* assembler/MacroAssemblerARM.cpp:
(JSC::isVFPPresent):
* jit/JITStubsARM.h:
* jit/JITStubsARMv7.h:

Source/WebKit/blackberry:

* WebKitSupport/AboutData.cpp:
(BlackBerry::WebKit::configPage):

Source/WTF:

* wtf/Assertions.h:
* wtf/Compiler.h:
* wtf/FastMalloc.h:
* wtf/Platform.h:

Modified Paths

Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (160647 => 160648)


--- trunk/Source/_javascript_Core/ChangeLog	2013-12-16 18:04:13 UTC (rev 160647)
+++ trunk/Source/_javascript_Core/ChangeLog	2013-12-16 18:10:58 UTC (rev 160648)
@@ -1,3 +1,18 @@
+2013-12-16  Peter Szanka  <[email protected]>
+
+        Delete RVCT related code parts.
+        https://bugs.webkit.org/show_bug.cgi?id=125626
+
+        Reviewed by Darin Adler.
+
+        * assembler/ARMAssembler.cpp:
+        * assembler/ARMAssembler.h:
+        (JSC::ARMAssembler::cacheFlush):
+        * assembler/MacroAssemblerARM.cpp:
+        (JSC::isVFPPresent):
+        * jit/JITStubsARM.h:
+        * jit/JITStubsARMv7.h:
+
 2013-12-15  Ryosuke Niwa  <[email protected]>
 
         REGRESSION: 2x regression on Dromaeo DOM query tests

Modified: trunk/Source/_javascript_Core/assembler/ARMAssembler.cpp (160647 => 160648)


--- trunk/Source/_javascript_Core/assembler/ARMAssembler.cpp	2013-12-16 18:04:13 UTC (rev 160647)
+++ trunk/Source/_javascript_Core/assembler/ARMAssembler.cpp	2013-12-16 18:10:58 UTC (rev 160648)
@@ -420,23 +420,6 @@
     }
 }
 
-#if OS(LINUX) && COMPILER(RVCT)
-
-__asm void ARMAssembler::cacheFlush(void* code, size_t size)
-{
-    ARM
-    push {r7}
-    add r1, r1, r0
-    mov r7, #0xf0000
-    add r7, r7, #0x2
-    mov r2, #0x0
-    svc #0x0
-    pop {r7}
-    bx lr
-}
-
-#endif
-
 } // namespace JSC
 
 #endif // ENABLE(ASSEMBLER) && CPU(ARM_TRADITIONAL)

Modified: trunk/Source/_javascript_Core/assembler/ARMAssembler.h (160647 => 160648)


--- trunk/Source/_javascript_Core/assembler/ARMAssembler.h	2013-12-16 18:04:13 UTC (rev 160647)
+++ trunk/Source/_javascript_Core/assembler/ARMAssembler.h	2013-12-16 18:10:58 UTC (rev 160648)
@@ -1100,9 +1100,6 @@
         }
 #endif
 
-#if OS(LINUX) && COMPILER(RVCT)
-        static __asm void cacheFlush(void* code, size_t);
-#else
         static void cacheFlush(void* code, size_t size)
         {
 #if OS(LINUX) && COMPILER(GCC)
@@ -1133,7 +1130,6 @@
 #error "The cacheFlush support is missing on this platform."
 #endif
         }
-#endif
 
     private:
         static ARMWord RM(int reg)

Modified: trunk/Source/_javascript_Core/assembler/MacroAssemblerARM.cpp (160647 => 160648)


--- trunk/Source/_javascript_Core/assembler/MacroAssemblerARM.cpp	2013-12-16 18:04:13 UTC (rev 160647)
+++ trunk/Source/_javascript_Core/assembler/MacroAssemblerARM.cpp	2013-12-16 18:10:58 UTC (rev 160648)
@@ -62,7 +62,7 @@
     }
 #endif // OS(LINUX)
 
-#if (COMPILER(RVCT) && defined(__TARGET_FPU_VFP)) || (COMPILER(GCC) && defined(__VFP_FP__))
+#if (COMPILER(GCC) && defined(__VFP_FP__))
     return true;
 #else
     return false;

Modified: trunk/Source/_javascript_Core/jit/JITStubsARM.h (160647 => 160648)


--- trunk/Source/_javascript_Core/jit/JITStubsARM.h	2013-12-16 18:04:13 UTC (rev 160647)
+++ trunk/Source/_javascript_Core/jit/JITStubsARM.h	2013-12-16 18:10:58 UTC (rev 160648)
@@ -297,13 +297,6 @@
 
 #endif // COMPILER(GCC)
 
-#if COMPILER(RVCT)
-
-/* Include the generated file */
-#include "GeneratedJITStubs_RVCT.h"
-
-#endif // COMPILER(RVCT)
-
 } // namespace JSC
 
 #endif // JITStubsARM_h

Modified: trunk/Source/_javascript_Core/jit/JITStubsARMv7.h (160647 => 160648)


--- trunk/Source/_javascript_Core/jit/JITStubsARMv7.h	2013-12-16 18:04:13 UTC (rev 160647)
+++ trunk/Source/_javascript_Core/jit/JITStubsARMv7.h	2013-12-16 18:10:58 UTC (rev 160648)
@@ -346,13 +346,6 @@
 
 #endif // COMPILER(GCC)
 
-#if COMPILER(RVCT)
-
-/* Include the generated file */
-#include "GeneratedJITStubs_RVCT.h"
-
-#endif // COMPILER(RVCT)
-
 } // namespace JSC
 
 #endif // JITStubsARMv7_h

Modified: trunk/Source/WTF/ChangeLog (160647 => 160648)


--- trunk/Source/WTF/ChangeLog	2013-12-16 18:04:13 UTC (rev 160647)
+++ trunk/Source/WTF/ChangeLog	2013-12-16 18:10:58 UTC (rev 160648)
@@ -1,3 +1,15 @@
+2013-12-16  Peter Szanka  <[email protected]>
+
+        Delete RVCT related code parts.
+        https://bugs.webkit.org/show_bug.cgi?id=125626
+
+        Reviewed by Darin Adler.
+
+        * wtf/Assertions.h:
+        * wtf/Compiler.h:
+        * wtf/FastMalloc.h:
+        * wtf/Platform.h:
+
 2013-12-13  Brent Fulgham  <[email protected]>
 
         [Win] Remove Pre-VS2013 support code.

Modified: trunk/Source/WTF/wtf/Assertions.h (160647 => 160648)


--- trunk/Source/WTF/wtf/Assertions.h	2013-12-16 18:04:13 UTC (rev 160647)
+++ trunk/Source/WTF/wtf/Assertions.h	2013-12-16 18:10:58 UTC (rev 160648)
@@ -223,13 +223,7 @@
 #define ASSERT_NOT_REACHED() ((void)0)
 #define NO_RETURN_DUE_TO_ASSERT
 
-#if COMPILER(RVCT)
-template<typename T>
-inline void assertUnused(T& x) { (void)x; }
-#define ASSERT_UNUSED(variable, assertion) (assertUnused(variable))
-#else
 #define ASSERT_UNUSED(variable, assertion) ((void)variable)
-#endif
 
 #ifdef ADDRESS_SANITIZER
 #define ASSERT_WITH_SECURITY_IMPLICATION(assertion) \
@@ -299,13 +293,7 @@
 /* ASSERT_WITH_MESSAGE_UNUSED */
 
 #if ASSERT_MSG_DISABLED
-#if COMPILER(RVCT)
-template<typename T>
-inline void assertWithMessageUnused(T& x) { (void)x; }
-#define ASSERT_WITH_MESSAGE_UNUSED(variable, assertion, ...) (assertWithMessageUnused(variable))
-#else
 #define ASSERT_WITH_MESSAGE_UNUSED(variable, assertion, ...) ((void)variable)
-#endif
 #else
 #define ASSERT_WITH_MESSAGE_UNUSED(variable, assertion, ...) do \
     if (!(assertion)) { \

Modified: trunk/Source/WTF/wtf/Compiler.h (160647 => 160648)


--- trunk/Source/WTF/wtf/Compiler.h	2013-12-16 18:04:13 UTC (rev 160647)
+++ trunk/Source/WTF/wtf/Compiler.h	2013-12-16 18:10:58 UTC (rev 160648)
@@ -105,15 +105,6 @@
 
 #endif /* defined(_MSC_VER) */
 
-/* COMPILER(RVCT) - ARM RealView Compilation Tools */
-#if defined(__CC_ARM) || defined(__ARMCC__)
-#define WTF_COMPILER_RVCT 1
-#define RVCT_VERSION_AT_LEAST(major, minor, patch, build) (__ARMCC_VERSION >= (major * 100000 + minor * 10000 + patch * 1000 + build))
-#else
-/* Define this for !RVCT compilers, just so we can write things like RVCT_VERSION_AT_LEAST(3, 0, 0, 0). */
-#define RVCT_VERSION_AT_LEAST(major, minor, patch, build) 0
-#endif
-
 /* COMPILER(GCCE) - GNU Compiler Collection for Embedded */
 #if defined(__GCCE__)
 #define WTF_COMPILER_GCCE 1
@@ -123,7 +114,7 @@
 
 /* COMPILER(GCC) - GNU Compiler Collection */
 /* --gnu option of the RVCT compiler also defines __GNUC__ */
-#if defined(__GNUC__) && !COMPILER(RVCT)
+#if defined(__GNUC__)
 #define WTF_COMPILER_GCC 1
 #define GCC_VERSION (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__)
 #define GCC_VERSION_AT_LEAST(major, minor, patch) (GCC_VERSION >= (major * 10000 + minor * 100 + patch))
@@ -219,7 +210,7 @@
 #ifndef ALWAYS_INLINE
 #if COMPILER(GCC) && defined(NDEBUG) && !COMPILER(MINGW)
 #define ALWAYS_INLINE inline __attribute__((__always_inline__))
-#elif (COMPILER(MSVC) || COMPILER(RVCT)) && defined(NDEBUG)
+#elif COMPILER(MSVC) && defined(NDEBUG)
 #define ALWAYS_INLINE __forceinline
 #else
 #define ALWAYS_INLINE inline
@@ -232,8 +223,6 @@
 #ifndef NEVER_INLINE
 #if COMPILER(GCC)
 #define NEVER_INLINE __attribute__((__noinline__))
-#elif COMPILER(RVCT)
-#define NEVER_INLINE __declspec(noinline)
 #else
 #define NEVER_INLINE
 #endif
@@ -243,7 +232,7 @@
 /* UNLIKELY */
 
 #ifndef UNLIKELY
-#if COMPILER(GCC) || (COMPILER(RVCT) && defined(__GNUC__))
+#if COMPILER(GCC)
 #define UNLIKELY(x) __builtin_expect(!!(x), 0)
 #else
 #define UNLIKELY(x) (x)
@@ -254,7 +243,7 @@
 /* LIKELY */
 
 #ifndef LIKELY
-#if COMPILER(GCC) || (COMPILER(RVCT) && defined(__GNUC__))
+#if COMPILER(GCC)
 #define LIKELY(x) __builtin_expect(!!(x), 1)
 #else
 #define LIKELY(x) (x)
@@ -268,7 +257,7 @@
 #ifndef NO_RETURN
 #if COMPILER(GCC)
 #define NO_RETURN __attribute((__noreturn__))
-#elif COMPILER(MSVC) || COMPILER(RVCT)
+#elif COMPILER(MSVC)
 #define NO_RETURN __declspec(noreturn)
 #else
 #define NO_RETURN
@@ -342,11 +331,7 @@
 
 /* UNUSED_PARAM */
 
-#if COMPILER(RVCT)
-template<typename T>
-inline void unusedParam(T& x) { (void)x; }
-#define UNUSED_PARAM(variable) unusedParam(variable)
-#elif COMPILER(MSVC)
+#if COMPILER(MSVC)
 #define UNUSED_PARAM(variable) (void)&variable
 #else
 #define UNUSED_PARAM(variable) (void)variable

Modified: trunk/Source/WTF/wtf/FastMalloc.h (160647 => 160648)


--- trunk/Source/WTF/wtf/FastMalloc.h	2013-12-16 18:04:13 UTC (rev 160647)
+++ trunk/Source/WTF/wtf/FastMalloc.h	2013-12-16 18:10:58 UTC (rev 160648)
@@ -242,7 +242,7 @@
 #define WTF_PRIVATE_INLINE __private_extern__ inline __attribute__((always_inline))
 #elif COMPILER(GCC)
 #define WTF_PRIVATE_INLINE inline __attribute__((always_inline))
-#elif COMPILER(MSVC) || COMPILER(RVCT)
+#elif COMPILER(MSVC)
 #define WTF_PRIVATE_INLINE __forceinline
 #else
 #define WTF_PRIVATE_INLINE inline

Modified: trunk/Source/WTF/wtf/Platform.h (160647 => 160648)


--- trunk/Source/WTF/wtf/Platform.h	2013-12-16 18:04:13 UTC (rev 160647)
+++ trunk/Source/WTF/wtf/Platform.h	2013-12-16 18:10:58 UTC (rev 160648)
@@ -169,7 +169,7 @@
 #define WTF_CPU_ARM_HARDFP 1
 #endif
 
-#if defined(__ARMEB__) || (COMPILER(RVCT) && defined(__BIG_ENDIAN))
+#if defined(__ARMEB__)
 #define WTF_CPU_BIG_ENDIAN 1
 
 #elif !defined(__ARM_EABI__) \
@@ -569,7 +569,7 @@
 #endif
 
 #if !defined(HAVE_VASPRINTF)
-#if !COMPILER(MSVC) && !COMPILER(RVCT) && !COMPILER(MINGW) && !(COMPILER(GCC) && OS(QNX))
+#if !COMPILER(MSVC) && !COMPILER(MINGW) && !(COMPILER(GCC) && OS(QNX))
 #define HAVE_VASPRINTF 1
 #endif
 #endif
@@ -820,7 +820,7 @@
 #endif
 
 /* Configure the interpreter */
-#if COMPILER(GCC) || (COMPILER(RVCT) && defined(__GNUC__))
+#if COMPILER(GCC)
 #define HAVE_COMPUTED_GOTO 1
 #endif
 

Modified: trunk/Source/WebKit/blackberry/ChangeLog (160647 => 160648)


--- trunk/Source/WebKit/blackberry/ChangeLog	2013-12-16 18:04:13 UTC (rev 160647)
+++ trunk/Source/WebKit/blackberry/ChangeLog	2013-12-16 18:10:58 UTC (rev 160648)
@@ -1,3 +1,13 @@
+2013-12-16  Peter Szanka  <[email protected]>
+
+        Delete RVCT related code parts.
+        https://bugs.webkit.org/show_bug.cgi?id=125626
+
+        Reviewed by Darin Adler.
+
+        * WebKitSupport/AboutData.cpp:
+        (BlackBerry::WebKit::configPage):
+
 2013-12-11  Joseph Pecoraro  <[email protected]>
 
         Web Inspector: Push More Inspector Required Classes Down into _javascript_Core

Modified: trunk/Source/WebKit/blackberry/WebKitSupport/AboutData.cpp (160647 => 160648)


--- trunk/Source/WebKit/blackberry/WebKitSupport/AboutData.cpp	2013-12-16 18:04:13 UTC (rev 160647)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/AboutData.cpp	2013-12-16 18:10:58 UTC (rev 160648)
@@ -76,12 +76,6 @@
     builder.append("<tr><td>_MSC_VER</td><td>" + String::number(_MSC_VER) + "</td></tr>");
     builder.append("<tr><td>_MSC_FULL_VER</td><td>" + String::number(_MSC_FULL_VER) + "</td></tr>");
     builder.append("<tr><td>_MSC_BUILD</td><td>" + String::number(_MSC_BUILD) + "</td></tr>");
-#elif COMPILER(RVCT)
-    builder.appendLiteral("<tr><td>ARM RealView Compiler Toolkit</td><td>RVCT</td></tr>");
-    builder.append("<tr><td>__ARMCC_VERSION</td><td>" + String::number(__ARMCC_VERSION) + "</td></tr>");
-#if COMPILER(RVCT4GNU)
-    builder.appendLiteral("<tr><td>RVCT 4+ in --gnu mode</td><td>1</td></tr>");
-#endif
 #elif COMPILER(GCC)
     builder.append("<tr><td>GCC</td><td>" + String::number(__GNUC__) + "." + String::number(__GNUC_MINOR__) + "." + String::number(__GNUC_PATCHLEVEL__) + "</td></tr>");
 #endif
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to