Merge in WebKit r47029.

1 files changed, 31 insertions, 42 deletions

diff --git a/JavaScriptCore/jit/ExecutableAllocator.h b/JavaScriptCore/jit/ExecutableAllocator.h
index a545b0c..4ed47e3 100644
--- a/JavaScriptCore/jit/ExecutableAllocator.h
+++ b/JavaScriptCore/jit/ExecutableAllocator.h
@@ -156,7 +156,7 @@ public:
         return pool.release();
     }
 
-#if ENABLE(ASSEMBLER_WX_EXCLUSIVE) || !(PLATFORM(X86) || PLATFORM(X86_64))
+#if ENABLE(ASSEMBLER_WX_EXCLUSIVE)
     static void makeWritable(void* start, size_t size)
     {
         reprotectRegion(start, size, Writable);
@@ -165,58 +165,47 @@ public:
     static void makeExecutable(void* start, size_t size)
     {
         reprotectRegion(start, size, Executable);
-        cacheFlush(start, size);
     }
-
-    // If ASSEMBLER_WX_EXCLUSIVE protection is turned on, or on non-x86 platforms,
-    // we need to track start & size so we can makeExecutable/cacheFlush at the end.
-    class MakeWritable {
-    public:
-        MakeWritable(void* start, size_t size)
-            : m_start(start)
-            , m_size(size)
-        {
-            makeWritable(start, size);
-        }
-
-        ~MakeWritable()
-        {
-            makeExecutable(m_start, m_size);
-        }
-
-    private:
-        void* m_start;
-        size_t m_size;
-    };
 #else
     static void makeWritable(void*, size_t) {}
     static void makeExecutable(void*, size_t) {}
-
-    // On x86, without ASSEMBLER_WX_EXCLUSIVE, there is nothing to do here.
-    class MakeWritable { public: MakeWritable(void*, size_t) {} };
 #endif
 
-private:
-
-#if ENABLE(ASSEMBLER_WX_EXCLUSIVE) || !(PLATFORM(X86) || PLATFORM(X86_64))
-#if ENABLE(ASSEMBLER_WX_EXCLUSIVE)
-    static void reprotectRegion(void*, size_t, ProtectionSeting);
-#else
-    static void reprotectRegion(void*, size_t, ProtectionSeting) {}
-#endif
 
-   static void cacheFlush(void* code, size_t size)
-    {
 #if PLATFORM(X86) || PLATFORM(X86_64)
-        UNUSED_PARAM(code);
-        UNUSED_PARAM(size);
-#elif PLATFORM(ARM_V7) && PLATFORM(IPHONE)
+    static void cacheFlush(void*, size_t)
+    {
+    }
+#elif PLATFORM_ARM_ARCH(7) && PLATFORM(IPHONE)
+    static void cacheFlush(void* code, size_t size)
+    {
         sys_dcache_flush(code, size);
         sys_icache_invalidate(code, size);
-#else
-#error "ExecutableAllocator::cacheFlush not implemented on this platform."
-#endif
     }
+#elif PLATFORM(ARM)
+    static void cacheFlush(void* code, size_t size)
+    {
+    #if COMPILER(GCC) && (GCC_VERSION >= 30406)
+        __clear_cache(reinterpret_cast<char*>(code), reinterpret_cast<char*>(code) + size);
+    #else
+        const int syscall = 0xf0002;
+        __asm __volatile (
+               "mov     r0, %0\n"
+               "mov     r1, %1\n"
+               "mov     r7, %2\n"
+               "mov     r2, #0x0\n"
+               "swi     0x00000000\n"
+           :
+           :   "r" (code), "r" (reinterpret_cast<char*>(code) + size), "r" (syscall)
+           :   "r0", "r1", "r7");
+    #endif // COMPILER(GCC) && (GCC_VERSION >= 30406)
+    }
+#endif
+
+private:
+
+#if ENABLE(ASSEMBLER_WX_EXCLUSIVE)
+    static void reprotectRegion(void*, size_t, ProtectionSeting);
 #endif
 
     RefPtr<ExecutablePool> m_smallAllocationPool;