Changeset 74455 in webkit

Timestamp:

Dec 21, 2010 8:29:33 PM (13 years ago)

Author:

barraclough@apple.com

Message:

Bug 26276 - Need a mechanism to determine stack extent

Reviewed by Oliver Hunt.

This patch adds accurate stack size calculation for:

DARWIN, QNX, UNIX

We still need to fix:

WINDOWS, SOLARIS, OPENBSD, SYMBIAN, HAIKU, WINCE

• wtf/StackBounds.cpp:

(WTF::StackBounds::initialize):

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• wtf/StackBounds.cpp (modified) (6 diffs)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2010-12-21  Gavin Barraclough  <barraclough@apple.com>
+
+        Reviewed by Oliver Hunt.
+
+        Bug 26276 - Need a mechanism to determine stack extent
+
+        This patch adds accurate stack size calculation for:
+            DARWIN, QNX, UNIX
+        We still need to fix:
+            WINDOWS, SOLARIS, OPENBSD, SYMBIAN, HAIKU, WINCE
+
+        * wtf/StackBounds.cpp:
+        (WTF::StackBounds::initialize):
+
 2010-12-21  Gavin Barraclough  <barraclough@apple.com>
 

trunk/JavaScriptCore/wtf/StackBounds.cpp

@@ -58 +58 @@
 namespace WTF {
 
+// Bug 26276 - Need a mechanism to determine stack extent
+//
+// These platforms should now be working correctly:
+//     DARWIN, QNX, UNIX
+// These platforms are not:
+//     WINDOWS, SOLARIS, OPENBSD, SYMBIAN, HAIKU, WINCE
+//
+// FIXME: remove this! - this code unsafely guesses at stack sizes!
+#if OS(WINDOWS) || OS(SOLARIS) || OS(OPENBSD) || OS(SYMBIAN) || OS(HAIKU) || OS(WINCE)
 // Based on the current limit used by the JSC parser, guess the stack size.
 static const ptrdiff_t estimatedStackSize = 128 * sizeof(void*) * 1024;
-
 // This method assumes the stack is growing downwards.
 static void* estimateStackBound(void* origin)
@@ -66 +74 @@
     return static_cast<char*>(origin) - estimatedStackSize;
 }
+#endif
 
 #if OS(DARWIN)
@@ -73 +82 @@
     pthread_t thread = pthread_self();
     m_origin = pthread_get_stackaddr_np(thread);
-    m_bound = estimateStackBound(m_origin);
+    m_bound = static_cast<char*>(m_origin) - pthread_get_stacksize_np(thread);
 }
 
@@ -103 +112 @@
 #error Need a way to get the stack bounds on this platform (Windows)
 #endif
+    // Looks like we should be able to get pTib->StackLimit
     m_bound = estimateStackBound(m_origin);
 }
@@ -128 +138 @@
     ASSERT(stackBase);
 
+    m_bound = stackBase;
     m_origin = static_cast<char*>(stackBase) + stackSize;
-    m_bound = estimateStackBound(m_origin);
 }
 
@@ -195 +205 @@
     ASSERT(stackBase);
     pthread_attr_destroy(&sattr);
+    m_bound = stackBase;
     m_origin = static_cast<char*>(stackBase) + stackSize;
-    m_bound = estimateStackBound(m_origin);
 }