Changeset 73091 in webkit for trunk/JavaScriptCore/runtime

Timestamp:

Dec 1, 2010, 6:13:59 PM (14 years ago)

Author:

[email protected]

Message:

Baby step toward a cross-platform virtual memory abstraction: created
an all-static OSAllocator class and changed MarkStack to use it.

Reviewed by Sam Weinig.

• JavaScriptCore.exp: These functions are inlined now.

• JavaScriptCore.vcproj/WTF/WTF.vcproj: Added OSAllocatorWin.cpp.

• JavaScriptCore.xcodeproj/project.pbxproj: Added OSAllocatorPosix.cpp.

• runtime/MarkStack.h:

(JSC::MarkStack::allocateStack):
(JSC::MarkStack::releaseStack): Use OSAllocator instead of rolling our
own platform-specific code.

• runtime/MarkStackNone.cpp: Removed. Nothing used this.

• runtime/MarkStackPosix.cpp:
• runtime/MarkStackSymbian.cpp:
• runtime/MarkStackWin.cpp: Removed custom platform-specific code, since

we use the OSAllocator abstraction now.

• wtf/OSAllocator.h: Added.
• wtf/OSAllocatorPosix.cpp: Added.

(WTF::OSAllocator::reserve):
(WTF::OSAllocator::reserveAndCommit):
(WTF::OSAllocator::commit):
(WTF::OSAllocator::decommit):
(WTF::OSAllocator::release):

• wtf/OSAllocatorSymbian.cpp: Added.

(WTF::OSAllocator::reserve):
(WTF::OSAllocator::reserveAndCommit):
(WTF::OSAllocator::commit):
(WTF::OSAllocator::decommit):
(WTF::OSAllocator::release):

• wtf/OSAllocatorWin.cpp: Added.

(WTF::OSAllocator::reserve):
(WTF::OSAllocator::reserveAndCommit):
(WTF::OSAllocator::commit):
(WTF::OSAllocator::decommit):
(WTF::OSAllocator::release): The new OSAllocator abstraction.

• wtf/wtf.pri: Added OSAllocatorSymbian.cpp.

Location:

trunk/JavaScriptCore/runtime

Files:

• MarkStack.h (modified) (2 diffs)
• MarkStackNone.cpp (deleted)
• MarkStackPosix.cpp (modified) (1 diff)
• MarkStackSymbian.cpp (modified) (1 diff)
• MarkStackWin.cpp (modified) (1 diff)

trunk/JavaScriptCore/runtime/MarkStack.h

@@ -29 +29 @@
 #include "JSValue.h"
 #include <wtf/Noncopyable.h>
+#include <wtf/OSAllocator.h>
 
 namespace JSC {
@@ -86 +87 @@
         };
 
-        static void* allocateStack(size_t size);
-        static void releaseStack(void* addr, size_t size);
+        static void* allocateStack(size_t size) { return OSAllocator::reserveAndCommit(size); }
+        static void releaseStack(void* addr, size_t size) { OSAllocator::release(addr, size); }
 
         static void initializePagesize();

trunk/JavaScriptCore/runtime/MarkStackPosix.cpp

@@ -39 +39 @@
 }
 
-void* MarkStack::allocateStack(size_t size)
-{
-    return mmap(0, size, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANON, -1, 0);
-}
-void MarkStack::releaseStack(void* addr, size_t size)
-{
-    munmap(addr, size);
-}
-
 }
 

trunk/JavaScriptCore/runtime/MarkStackSymbian.cpp

@@ -34 +34 @@
 }
 
-void* MarkStack::allocateStack(size_t size)
-{
-    return fastMalloc(size);
-}
-
-void MarkStack::releaseStack(void* addr, size_t size)
-{
-    return fastFree(addr);
-}
-
 }
 

trunk/JavaScriptCore/runtime/MarkStackWin.cpp

@@ -40 +40 @@
 }
 
-void* MarkStack::allocateStack(size_t size)
-{
-    return VirtualAlloc(0, size, MEM_COMMIT | MEM_RESERVE, PAGE_READWRITE);
-}
-void MarkStack::releaseStack(void* addr, size_t)
-{
-    // According to http://msdn.microsoft.com/en-us/library/aa366892(VS.85).aspx,
-    // dwSize must be 0 if dwFreeType is MEM_RELEASE.
-    VirtualFree(addr, 0, MEM_RELEASE);
-}
-
 }