Changeset 47023 in webkit for trunk/JavaScriptCore

Timestamp:

Aug 10, 2009, 10:07:14 PM (16 years ago)

Author:

[email protected]

Message:

Build fix

Hoist page size initialization into platform specific code.

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• runtime/MarkStack.h (modified) (1 diff)
• runtime/MarkStackPosix.cpp (modified) (1 diff)
• runtime/MarkStackWin.cpp (modified) (1 diff)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2009-08-10  Oliver Hunt  <[email protected]>
+
+        Reviewed by NOBODY (Build fix).
+
+        Hoist page size initialization into platform specific code.
+
+        * jit/ExecutableAllocatorPosix.cpp:
+        * jit/ExecutableAllocatorWin.cpp:
+        * runtime/MarkStack.h:
+        (JSC::MarkStack::pageSize):
+        * runtime/MarkStackPosix.cpp:
+        (JSC::MarkStack::initializePagesize):
+        * runtime/MarkStackWin.cpp:
+        (JSC::MarkStack::initializePagesize):
+
 2009-08-07  Oliver Hunt  <[email protected]>
 

trunk/JavaScriptCore/runtime/MarkStack.h

@@ -92 +92 @@
         static void releaseStack(void* addr, size_t size);
 
+        static void initializePagesize();
         static size_t pageSize()
         {
             if (!s_pageSize)
-                s_pageSize = getpagesize();
+                initializePagesize();
             return s_pageSize;
         }

trunk/JavaScriptCore/runtime/MarkStackPosix.cpp

@@ -28 +28 @@
 
 #include "MarkStack.h"
+
+#include <unistd.h>
 #include <sys/mman.h>
 
 namespace JSC {
+
+void MarkStack::initializePagesize()
+{
+    MarkStack::s_pageSize = getpagesize();
+}
+
 void* MarkStack::allocateStack(size_t size)
 {

trunk/JavaScriptCore/runtime/MarkStackWin.cpp

@@ -32 +32 @@
 
 namespace JSC {
+
+void MarkStack::initializePagesize()
+{
+    SYSTEM_INFO system_info;
+    GetSystemInfo(&system_info);
+    MarkStack::s_pageSize = system_info.dwPageSize;
+}
+
 void* MarkStack::allocateStack(size_t size)
 {