Changeset 259956 in webkit

Timestamp:

Apr 12, 2020 6:03:40 AM (4 years ago)

Author:

Carlos Garcia Campos

Message:

Merge r257662 - Clean up code with how we choose Gigacage sizes and whether or not to use Wasm fast memory
​https://bugs.webkit.org/show_bug.cgi?id=208392

Reviewed by Yusuke Suzuki.

Source/bmalloc:

• bmalloc/Gigacage.h:

Source/JavaScriptCore:

• runtime/OptionsList.h:

Location:

releases/WebKitGTK/webkit-2.28/Source

Files:

• JavaScriptCore/ChangeLog (modified) (1 diff)
• JavaScriptCore/runtime/OptionsList.h (modified) (1 diff)
• bmalloc/ChangeLog (modified) (1 diff)
• bmalloc/bmalloc/Gigacage.h (modified) (1 diff)

releases/WebKitGTK/webkit-2.28/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2020-02-28  Saam Barati  <sbarati@apple.com>
+
+        Clean up code with how we choose Gigacage sizes and whether or not to use Wasm fast memory
+        https://bugs.webkit.org/show_bug.cgi?id=208392
+
+        Reviewed by Yusuke Suzuki.
+
+        * runtime/OptionsList.h:
+
 2020-03-19  Yusuke Suzuki  <ysuzuki@apple.com>
 

releases/WebKitGTK/webkit-2.28/Source/JavaScriptCore/runtime/OptionsList.h

@@ -459 +459 @@
     v(Int32, omgTierUpCounterIncrementForEntry, 15, Normal, "The amount the tier up counter is incremented on each function entry.") \
     /* FIXME: enable fast memories on iOS and pre-allocate them. https://bugs.webkit.org/show_bug.cgi?id=170774 */ \
-    v(Bool, useWebAssemblyFastMemory, !isIOS(), Normal, "If true, we will try to use a 32-bit address space with a signal handler to bounds check wasm memory.") \
+    v(Bool, useWebAssemblyFastMemory, OS_CONSTANT(EFFECTIVE_ADDRESS_WIDTH) >= 48, Normal, "If true, we will try to use a 32-bit address space with a signal handler to bounds check wasm memory.") \
     v(Bool, logWebAssemblyMemory, false, Normal, nullptr) \
     v(Unsigned, webAssemblyFastMemoryRedzonePages, 128, Normal, "WebAssembly fast memories use 4GiB virtual allocations, plus a redzone (counted as multiple of 64KiB WebAssembly pages) at the end to catch reg+imm accesses which exceed 32-bit, anything beyond the redzone is explicitly bounds-checked") \

releases/WebKitGTK/webkit-2.28/Source/bmalloc/ChangeLog

@@ +1 @@
+2020-02-28  Saam Barati  <sbarati@apple.com>
+
+        Clean up code with how we choose Gigacage sizes and whether or not to use Wasm fast memory
+        https://bugs.webkit.org/show_bug.cgi?id=208392
+
+        Reviewed by Yusuke Suzuki.
+
+        * bmalloc/Gigacage.h:
+
 2020-03-09  Mike Gorse  <mgorse@suse.com>
 

releases/WebKitGTK/webkit-2.28/Source/bmalloc/bmalloc/Gigacage.h

@@ -67 +67 @@
 #if GIGACAGE_ENABLED
 
-#if BCPU(ARM64)
+#if BOS_EFFECTIVE_ADDRESS_WIDTH < 48
 constexpr size_t primitiveGigacageSize = 2 * bmalloc::Sizes::GB;
 constexpr size_t jsValueGigacageSize = 2 * bmalloc::Sizes::GB;