Changeset 207476 in webkit

Timestamp:

Oct 18, 2016 12:03:29 PM (8 years ago)

Author:

keith_miller@apple.com

Message:

Cleanup Wasm memory.
​https://bugs.webkit.org/show_bug.cgi?id=163601

Reviewed by Saam Barati.

There were a couple of issues with the original Wasm memory patch.
This is a follow-up patch to fix those issues.

• wasm/WASMMemory.cpp:

(JSC::WASM::Memory::Memory):

• wasm/WASMMemory.h:

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• wasm/WASMMemory.cpp (modified) (1 diff)
• wasm/WASMMemory.h (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2016-10-18  Keith Miller  <keith_miller@apple.com>
+
+        Cleanup Wasm memory.
+        https://bugs.webkit.org/show_bug.cgi?id=163601
+
+        Reviewed by Saam Barati.
+
+        There were a couple of issues with the original Wasm memory patch.
+        This is a follow-up patch to fix those issues.
+
+        * wasm/WASMMemory.cpp:
+        (JSC::WASM::Memory::Memory):
+        * wasm/WASMMemory.h:
+
 2016-10-15  Filip Pizlo  <fpizlo@apple.com>
 

trunk/Source/JavaScriptCore/wasm/WASMMemory.cpp

@@ -41 +41 @@
     ASSERT(pinnedSizeRegisters.size() > 0);
 
-    void* result = mmap(nullptr, m_mappedCapacity, PROT_NONE, MAP_PRIVATE | MAP_ANON, 0, 0);
+    // FIXME: It would be nice if we had a VM tag for wasm memory. https://bugs.webkit.org/show_bug.cgi?id=163600
+    void* result = mmap(nullptr, m_mappedCapacity, PROT_NONE, MAP_PRIVATE | MAP_ANON, -1, 0);
     if (result == MAP_FAILED) {
         // Try again with a different number.
         m_mappedCapacity = m_capacity;
-        result = mmap(nullptr, m_mappedCapacity, PROT_NONE, MAP_PRIVATE | MAP_ANON, 0, 0);
+        result = mmap(nullptr, m_mappedCapacity, PROT_NONE, MAP_PRIVATE | MAP_ANON, -1, 0);
         if (result == MAP_FAILED)
             return;
     }
 
+    ASSERT(startingSize <= m_mappedCapacity);
     if (mprotect(result, startingSize, PROT_READ | PROT_WRITE)) {
         munmap(result, m_mappedCapacity);

trunk/Source/JavaScriptCore/wasm/WASMMemory.h

@@ -40 +40 @@
 
 // FIXME: We should support more than one memory size register. Right now we take a vector with only one
-// entry. Specifically an extry where the sizeOffset == 0. If we have more than one size register,
+// entry. Specifically an entry where the sizeOffset == 0. If we have more than one size register,
 // we can have one for each load size class. see: https://bugs.webkit.org/show_bug.cgi?id=162952
 struct PinnedRegisterInfo {