Changeset 48702 in webkit for trunk/JavaScriptCore

Timestamp:

Sep 23, 2009, 11:10:59 PM (16 years ago)

Author:

[email protected]

Message:

2009-09-24 Gabor Loki <​[email protected]>

Reviewed by Gavin Barraclough.

Avoid clear_cache built-in function if DISABLE_BUILTIN_CLEAR_CACHE define is set
​https://bugs.webkit.org/show_bug.cgi?id=28886

There are some GCC packages (for example GCC-2006q3 from CodeSourcery)
which contain clear_cache built-in function only for C while the C++
version of clear_cache is missing on ARM architectures.

Fixed a small bug in the inline assembly of cacheFlush function on
ARM_TRADITIONAL.

• jit/ExecutableAllocator.h: (JSC::ExecutableAllocator::cacheFlush):

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• jit/ExecutableAllocator.h (modified) (2 diffs)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2009-09-24  Gabor Loki  <[email protected]>
+
+        Reviewed by Gavin Barraclough.
+
+        Avoid __clear_cache built-in function if DISABLE_BUILTIN_CLEAR_CACHE define is set
+        https://bugs.webkit.org/show_bug.cgi?id=28886
+
+        There are some GCC packages (for example GCC-2006q3 from CodeSourcery)
+        which contain __clear_cache built-in function only for C while the C++
+        version of __clear_cache is missing on ARM architectures.
+
+        Fixed a small bug in the inline assembly of cacheFlush function on
+        ARM_TRADITIONAL.
+
+        * jit/ExecutableAllocator.h:
+        (JSC::ExecutableAllocator::cacheFlush):
+
 2009-09-23  Geoffrey Garen  <[email protected]>
 

trunk/JavaScriptCore/jit/ExecutableAllocator.h

@@ -192 +192 @@
         User::IMB_Range(code, static_cast<char*>(code) + size);
     }
-#elif PLATFORM(ARM) && COMPILER(GCC) && (GCC_VERSION >= 30406)
+#elif PLATFORM(ARM) && COMPILER(GCC) && (GCC_VERSION >= 30406) && !defined(DISABLE_BUILTIN_CLEAR_CACHE)
     static void cacheFlush(void* code, size_t size)
     {
@@ -204 +204 @@
             "mov     r0, %0\n"
             "mov     r1, %1\n"
-            "mov     r7, 0xf0002\n"
+            "mov     r7, #0xf0000\n"
+            "add     r7, r7, #0x2\n"
             "mov     r2, #0x0\n"
             "svc     0x0\n"