Changeset 236864 in webkit

Timestamp:

Oct 4, 2018, 5:35:25 PM (7 years ago)

Author:

mark.lam@apple.com

Message:

Move start/EndOfFixedExecutableMemoryPool pointers into the FixedVMPoolExecutableAllocator object.
​https://bugs.webkit.org/show_bug.cgi?id=190295
<rdar://problem/19197193>

Reviewed by Saam Barati.

This allows us to use the tagging logic already baked into MacroAssemblerCodePtr
instead of needing to use our own custom version here.

• jit/ExecutableAllocator.cpp:

(JSC::FixedVMPoolExecutableAllocator::FixedVMPoolExecutableAllocator):
(JSC::FixedVMPoolExecutableAllocator::memoryStart):
(JSC::FixedVMPoolExecutableAllocator::memoryEnd):
(JSC::FixedVMPoolExecutableAllocator::isJITPC):
(JSC::ExecutableAllocator::allocate):
(JSC::startOfFixedExecutableMemoryPoolImpl):
(JSC::endOfFixedExecutableMemoryPoolImpl):
(JSC::isJITPC):

• jit/ExecutableAllocator.h:

Location:

trunk/Source/JavaScriptCore

Files:

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

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2018-10-04  Mark Lam  <mark.lam@apple.com>
+
+        Move start/EndOfFixedExecutableMemoryPool pointers into the FixedVMPoolExecutableAllocator object.
+        https://bugs.webkit.org/show_bug.cgi?id=190295
+        <rdar://problem/19197193>
+
+        Reviewed by Saam Barati.
+
+        This allows us to use the tagging logic already baked into MacroAssemblerCodePtr
+        instead of needing to use our own custom version here.
+
+        * jit/ExecutableAllocator.cpp:
+        (JSC::FixedVMPoolExecutableAllocator::FixedVMPoolExecutableAllocator):
+        (JSC::FixedVMPoolExecutableAllocator::memoryStart):
+        (JSC::FixedVMPoolExecutableAllocator::memoryEnd):
+        (JSC::FixedVMPoolExecutableAllocator::isJITPC):
+        (JSC::ExecutableAllocator::allocate):
+        (JSC::startOfFixedExecutableMemoryPoolImpl):
+        (JSC::endOfFixedExecutableMemoryPoolImpl):
+        (JSC::isJITPC):
+        * jit/ExecutableAllocator.h:
+
 2018-10-04  Mark Lam  <mark.lam@apple.com>
 

trunk/Source/JavaScriptCore/jit/ExecutableAllocator.cpp

@@ -105 +105 @@
 #endif
 
-JS_EXPORT_PRIVATE void* taggedStartOfFixedExecutableMemoryPool;
-JS_EXPORT_PRIVATE void* taggedEndOfFixedExecutableMemoryPool;
-
 #if !ENABLE(FAST_JIT_PERMISSIONS) || !CPU(ARM64E)
 JS_EXPORT_PRIVATE bool useFastPermisionsJITCopy { false };
@@ -169 +166 @@
 
             void* reservationEnd = reinterpret_cast<uint8_t*>(reservationBase) + reservationSize;
-            taggedStartOfFixedExecutableMemoryPool = tagCodePtr<ExecutableMemoryPtrTag>(reservationBase);
-            taggedEndOfFixedExecutableMemoryPool = tagCodePtr<ExecutableMemoryPtrTag>(reservationEnd);
+
+            m_memoryStart = MacroAssemblerCodePtr<ExecutableMemoryPtrTag>(tagCodePtr<ExecutableMemoryPtrTag>(reservationBase));
+            m_memoryEnd = MacroAssemblerCodePtr<ExecutableMemoryPtrTag>(tagCodePtr<ExecutableMemoryPtrTag>(reservationEnd));
         }
     }
 
     virtual ~FixedVMPoolExecutableAllocator();
+
+    void* memoryStart() { return m_memoryStart.untaggedExecutableAddress(); }
+    void* memoryEnd() { return m_memoryEnd.untaggedExecutableAddress(); }
+    bool isJITPC(void* pc) { return memoryStart() <= pc && pc < memoryEnd(); }
 
 protected:
@@ -359 +361 @@
 private:
     PageReservation m_reservation;
+    MacroAssemblerCodePtr<ExecutableMemoryPtrTag> m_memoryStart;
+    MacroAssemblerCodePtr<ExecutableMemoryPtrTag> m_memoryEnd;
 };
 
@@ -462 +466 @@
 
 #if USE(POINTER_PROFILING)
-    void* start = startOfFixedExecutableMemoryPool();
-    void* end = endOfFixedExecutableMemoryPool();
+    void* start = allocator->memoryStart();
+    void* end = allocator->memoryEnd();
     void* resultStart = result->start().untaggedPtr();
     void* resultEnd = result->end().untaggedPtr();
-    RELEASE_ASSERT(start == removeCodePtrTag(taggedStartOfFixedExecutableMemoryPool));
-    RELEASE_ASSERT(end == removeCodePtrTag(taggedEndOfFixedExecutableMemoryPool));
     RELEASE_ASSERT(start <= resultStart && resultStart < end);
     RELEASE_ASSERT(start < resultEnd && resultEnd <= end);
@@ -496 +498 @@
 #endif
 
-}
+void* startOfFixedExecutableMemoryPoolImpl()
+{
+    return allocator->memoryStart();
+}
+
+void* endOfFixedExecutableMemoryPoolImpl()
+{
+    return allocator->memoryEnd();
+}
+
+bool isJITPC(void* pc)
+{
+    return allocator->isJITPC(pc);
+}
+
+} // namespace JSC
 
 #else // !ENABLE(JIT)

trunk/Source/JavaScriptCore/jit/ExecutableAllocator.h

@@ -62 +62 @@
 #if ENABLE(JIT)
 
-extern JS_EXPORT_PRIVATE void* taggedStartOfFixedExecutableMemoryPool;
-extern JS_EXPORT_PRIVATE void* taggedEndOfFixedExecutableMemoryPool;
+JS_EXPORT_PRIVATE void* startOfFixedExecutableMemoryPoolImpl();
+JS_EXPORT_PRIVATE void* endOfFixedExecutableMemoryPoolImpl();
 
 template<typename T = void*>
 T startOfFixedExecutableMemoryPool()
 {
-    return untagCodePtr<T, ExecutableMemoryPtrTag>(taggedStartOfFixedExecutableMemoryPool);
+    return bitwise_cast<T>(startOfFixedExecutableMemoryPoolImpl());
 }
 
@@ -74 +74 @@
 T endOfFixedExecutableMemoryPool()
 {
-    return untagCodePtr<T, ExecutableMemoryPtrTag>(taggedEndOfFixedExecutableMemoryPool);
+    return bitwise_cast<T>(endOfFixedExecutableMemoryPoolImpl());
 }
 
-inline bool isJITPC(void* pc)
-{
-    return startOfFixedExecutableMemoryPool() <= pc && pc < endOfFixedExecutableMemoryPool();
-}
+bool isJITPC(void* pc);
 
 #if !ENABLE(FAST_JIT_PERMISSIONS) || !CPU(ARM64E)