Changeset 29454 in webkit for trunk/JavaScriptCore/kjs/collector.cpp

Timestamp:

Jan 13, 2008, 11:47:56 AM (18 years ago)

Author:

Darin Adler

Message:

Contributions and review by Adriaan de Groot,
Simon Hausmann, Eric Seidel, and Darin Adler.

• ​http://bugs.webkit.org/show_bug.cgi?id=16590 Compilation fixes for Solaris.

• kjs/DateMath.h: (KJS::GregorianDateTime::GregorianDateTime): Use the WIN_OS code path for SOLARIS too, presumably because Solaris also lacks the tm_gtoff and tm_zone fields. (KJS::GregorianDateTime::operator tm): Ditto.

• kjs/collector.cpp: (KJS::currentThreadStackBase): Use thr_stksegment on Solaris.

• wtf/MathExtras.h: (isfinite): Implement for Solaris. (isinf): Ditto. (signbit): Ditto. But this one is wrong, so I added a FIXME.

• wtf/Platform.h: Define PLATFORM(SOLARIS) when "sun" or "sun" is defined.

File:

• trunk/JavaScriptCore/kjs/collector.cpp (modified) (4 diffs)

trunk/JavaScriptCore/kjs/collector.cpp

@@ -1 +1 @@
 // -*- mode: c++; c-basic-offset: 4 -*-
 /*
- *  This file is part of the KDE libraries
  *  Copyright (C) 2003, 2004, 2005, 2006, 2007 Apple Inc. All rights reserved.
  *  Copyright (C) 2007 Eric Seidel <[email protected]>
@@ -59 +58 @@
 #include <sys/mman.h>
 #include <unistd.h>
+
+#if PLATFORM(SOLARIS)
+#include <thread.h>
+#endif
 
 #if HAVE(PTHREAD_NP_H)
@@ -334 +337 @@
         );
     return (void*)pTib->StackBase;
+#elif PLATFORM(SOLARIS)
+    stack_t s;
+    thr_stksegment(&s);
+    return s.ss_sp;
 #elif PLATFORM(UNIX)
-    static void *stackBase = 0;
+    static void* stackBase = 0;
     static size_t stackSize = 0;
     static pthread_t stackThread;
@@ -350 +357 @@
 #endif
         int rc = pthread_attr_getstack(&sattr, &stackBase, &stackSize);
-        (void)rc; // FIXME: deal with error code somehow?  seems fatal...
+        (void)rc; // FIXME: Deal with error code somehow? Seems fatal.
         ASSERT(stackBase);
         pthread_attr_destroy(&sattr);
         stackThread = thread;
     }
-    return (void*)(size_t(stackBase) + stackSize);
+    return static_cast<char*>(stackBase) + stackSize;
 #else
 #error Need a way to get the stack base on this platform