Changeset 238564 in webkit

Timestamp:

Nov 27, 2018, 11:47:17 AM (6 years ago)

Author:

mark.lam@apple.com

Message:

Introducing a ENABLE_SEPARATED_WX_HEAP macro.
​https://bugs.webkit.org/show_bug.cgi?id=192013
<rdar://problem/45494310>

Reviewed by Keith Miller.

This makes the code a little more readable.

I put the definition of ENABLE_SEPARATED_WX_HEAP in JSC's config.h instead of
Platform.h because ENABLE_SEPARATED_WX_HEAP is only needed inside JSC. Also,
ENABLE_SEPARATED_WX_HEAP depends on ENABLE(FAST_JIT_PERMISSIONS), which is only
defined for JSC.

• config.h:
• jit/ExecutableAllocator.cpp:

(JSC::FixedVMPoolExecutableAllocator::FixedVMPoolExecutableAllocator):
(JSC::FixedVMPoolExecutableAllocator::initializeSeparatedWXHeaps):

• jit/ExecutableAllocator.h:

(JSC::performJITMemcpy):

• runtime/Options.cpp:

(JSC::recomputeDependentOptions):

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• config.h (modified) (2 diffs)
• jit/ExecutableAllocator.cpp (modified) (4 diffs)
• jit/ExecutableAllocator.h (modified) (4 diffs)
• runtime/Options.cpp (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2018-11-27  Mark Lam  <mark.lam@apple.com>
+
+        Introducing a ENABLE_SEPARATED_WX_HEAP macro.
+        https://bugs.webkit.org/show_bug.cgi?id=192013
+        <rdar://problem/45494310>
+
+        Reviewed by Keith Miller.
+
+        This makes the code a little more readable.
+
+        I put the definition of ENABLE_SEPARATED_WX_HEAP in JSC's config.h instead of
+        Platform.h because ENABLE_SEPARATED_WX_HEAP is only needed inside JSC.  Also,
+        ENABLE_SEPARATED_WX_HEAP depends on ENABLE(FAST_JIT_PERMISSIONS), which is only
+        defined for JSC.
+
+        * config.h:
+        * jit/ExecutableAllocator.cpp:
+        (JSC::FixedVMPoolExecutableAllocator::FixedVMPoolExecutableAllocator):
+        (JSC::FixedVMPoolExecutableAllocator::initializeSeparatedWXHeaps):
+        * jit/ExecutableAllocator.h:
+        (JSC::performJITMemcpy):
+        * runtime/Options.cpp:
+        (JSC::recomputeDependentOptions):
+
 2018-11-26  Caio Lima  <ticaiolima@gmail.com>
 

trunk/Source/JavaScriptCore/config.h

@@ -1 +1 @@
 /*
- * Copyright (C) 2006, 2007, 2008, 2013 Apple Inc. All rights reserved.
+ * Copyright (C) 2006-2018 Apple Inc. All rights reserved.
  * Copyright (C) 2006 Samuel Weinig <sam.weinig@gmail.com>
  *
@@ -38 +38 @@
 
 #include <wtf/DisallowCType.h>
+
+#if !defined(ENABLE_SEPARATED_WX_HEAP)
+#if (!ENABLE(FAST_JIT_PERMISSIONS) || !CPU(ARM64E)) && PLATFORM(IOS_FAMILY) && CPU(ARM64)
+#define ENABLE_SEPARATED_WX_HEAP 1
+#else
+#define ENABLE_SEPARATED_WX_HEAP 0
+#endif
+#endif // !defined(ENABLE_SEPARATED_WX_HEAP)

trunk/Source/JavaScriptCore/jit/ExecutableAllocator.cpp

@@ -105 +105 @@
 #endif
 
-#if !ENABLE(FAST_JIT_PERMISSIONS) || !CPU(ARM64E)
+#if ENABLE(SEPARATED_WX_HEAP)
 JS_EXPORT_PRIVATE bool useFastPermisionsJITCopy { false };
 JS_EXPORT_PRIVATE JITWriteSeparateHeapsFunction jitWriteSeparateHeapsFunction;
@@ -183 +183 @@
             void* reservationBase = m_reservation.base();
 
-#if ENABLE(FAST_JIT_PERMISSIONS) && CPU(ARM64E)
+#if ENABLE(FAST_JIT_PERMISSIONS) && !ENABLE(SEPARATED_WX_HEAP)
             RELEASE_ASSERT(os_thread_self_restrict_rwx_is_supported());
             os_thread_self_restrict_rwx_to_rx();
 
-#else // not ENABLE(FAST_JIT_PERMISSIONS) or not CPU(ARM64E)
+#else // not ENABLE(FAST_JIT_PERMISSIONS) or ENABLE(SEPARATED_WX_HEAP)
 #if ENABLE(FAST_JIT_PERMISSIONS)
             if (os_thread_self_restrict_rwx_is_supported()) {
@@ -201 +201 @@
                 initializeSeparatedWXHeaps(m_reservation.base(), pageSize(), reservationBase, reservationSize);
             }
-#endif // not ENABLE(FAST_JIT_PERMISSIONS) or not CPU(ARM64E)
+#endif // not ENABLE(FAST_JIT_PERMISSIONS) or ENABLE(SEPARATED_WX_HEAP)
 
             addFreshFreeSpace(reservationBase, reservationSize);
@@ -295 +295 @@
         memset_s(&writableAddr, sizeof(writableAddr), 0, sizeof(writableAddr));
 
-#if !ENABLE(FAST_JIT_PERMISSIONS) || !CPU(ARM64E)
+#if ENABLE(SEPARATED_WX_HEAP)
         jitWriteSeparateHeapsFunction = reinterpret_cast<JITWriteSeparateHeapsFunction>(writeThunk.code().executableAddress());
 #endif

trunk/Source/JavaScriptCore/jit/ExecutableAllocator.h

@@ -79 +79 @@
 JS_EXPORT_PRIVATE bool isJITPC(void* pc);
 
-#if !ENABLE(FAST_JIT_PERMISSIONS) || !CPU(ARM64E)
+#if ENABLE(SEPARATED_WX_HEAP)
 
 typedef void (*JITWriteSeparateHeapsFunction)(off_t, const void*, size_t);
@@ -85 +85 @@
 extern JS_EXPORT_PRIVATE bool useFastPermisionsJITCopy;
 
-#endif // !ENABLE(FAST_JIT_PERMISSIONS) || !CPU(ARM64E)
+#endif // ENABLE(SEPARATED_WX_HEAP)
 
 static inline void* performJITMemcpy(void *dst, const void *src, size_t n)
@@ -97 +97 @@
         RELEASE_ASSERT(reinterpret_cast<uint8_t*>(dst) + n <= endOfFixedExecutableMemoryPool());
 #if ENABLE(FAST_JIT_PERMISSIONS)
-#if !CPU(ARM64E)
+#if ENABLE(SEPARATED_WX_HEAP)
         if (useFastPermisionsJITCopy)
 #endif
@@ -108 +108 @@
 #endif // ENABLE(FAST_JIT_PERMISSIONS)
 
-#if !ENABLE(FAST_JIT_PERMISSIONS) || !CPU(ARM64E)
+#if ENABLE(SEPARATED_WX_HEAP)
         if (jitWriteSeparateHeapsFunction) {
             // Use execute-only write thunk for writes inside the JIT region. This is a variant of

trunk/Source/JavaScriptCore/runtime/Options.cpp

@@ -469 +469 @@
     }
     
-#if PLATFORM(IOS_FAMILY) && CPU(ARM64) && !CPU(ARM64E)
+#if ENABLE(SEPARATED_WX_HEAP)
     // Override globally for now. Longer term we'll just make the default
     // be to have this option enabled, and have platforms that don't support