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

Timestamp:

Sep 3, 2005, 6:18:13 PM (20 years ago)

Author:

darin

Message:

Reviewed, tweaked and landed by Darin.

• some Windows compilation fixes, hoping to fix the problems reported in these bugs: 4627, 4629, 4630, 4631, 4632, 4633, 4634, 4635, 4636, 4637, 4639, 4640, 4641, 4644, 4645

• kjs/collector.cpp: Include <windows.h> on WIN32. Put thread-related code inside KJS_MULTIPLE_THREADS #if directives. (KJS::Collector::markCurrentThreadConservatively): Use NT_TIB to find the stack base on Win32.

• kjs/config.h: Define HAVE_SYS_TIMEB_H for Win32.

• kjs/date_object.cpp: Add include of <limits.h>. Add definitions of strncasecmp, isfinite, and copysign for Win32. (KJS::KRFCDate_parseDate): Move "errno = 0" line down closer to the first call to strol -- I believe that on Win32 there's some other call before that setting errno.

• kjs/date_object.h: Remove unneeded include of <sys/time.h>.

• kjs/dtoa.cpp: Add an undef of strtod, needed on Win32.

• kjs/fast_malloc.cpp: Put #if !WIN32 around some customization that's not appropriate on Win32. (KJS::region_list_append): Add a missing cast so this Win32-specific function compiles in C++. (KJS::sbrk): Change parameter type to match the declaration.

• kjs/function.cpp: (isxdigit): Define a locale-independent isxdigit on Win32.

• kjs/function.h: Remove unneeded friend class Function for FunctionImp.

• kjs/identifier.cpp: Took out the APPLE_CHANGES from around the AVOID_STATIC_CONSTRUCTORS define. We ultimately intend to phase out APPLE_CHANGES entirely. Also fix the non-AVOID_STATIC_CONSTRUCTORS code path.

• kjs/internal.cpp: Remove uneeded include of <strings.h>, which was confused with <string.h>! Add a Win32 implementation of copysign. Put the threads code inside KJS_MULTIPLE_THREADS.

• kjs/internal.h: Define a KJS_MULTIPLE_THREADS macro on non-Win32 only. Later we can make this specific to Mac OS X if we like.

• kjs/interpreter_map.cpp: Add missing include of <stdlib.h>.

• kjs/list.cpp: (KJS::ListImp::markValues): Use std::min instead of MIN. (KJS::List::copy): Ditto. (KJS::List::copyTail): Ditto.

• kjs/math_object.cpp: (signbit): Add a Win32 implementation of signbit.

• kjs/nodes.cpp: (Node::finalCheck): Use unsigned instead of uint. Put the use of always_inline inside GNUC.

• kjs/number_object.cpp: (NumberProtoFuncImp::callAsFunction): Use "10.0" instead of "10" inside all the calls to pow to avoid ambiguity caused by overloading of pow on Win32, seen when passing an int rather than a double or float.

• kjs/operations.cpp: (KJS::isInf): Add Win32 implementation. (KJS::isPosInf): Add Win32 implementation. (KJS::isNegInf): Add Win32 implementation.

• kjs/regexp.cpp: Use unsigned instead of uint.
• kjs/regexp.h: Ditto.
• kjs/regexp_object.cpp: Ditto.
• kjs/regexp_object.h: Ditto.

File:

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

trunk/JavaScriptCore/kjs/collector.cpp

@@ -29 +29 @@
 #include <algorithm>
 
-#if APPLE_CHANGES
+#if !WIN32
+
 #include <CoreFoundation/CoreFoundation.h>
 #include <pthread.h>
@@ -35 +36 @@
 #include <mach/task.h>
 #include <mach/thread_act.h>
+
+#else
+
+#include <windows.h>
+
 #endif
 
@@ -174 +180 @@
 }
 
+#if KJS_MULTIPLE_THREADS
+
 struct Collector::Thread {
   Thread(pthread_t pthread, mach_port_t mthread) : posixThread(pthread), machThread(mthread) {}
@@ -222 +230 @@
   }
 }
+
+#endif
 
 #define IS_POINTER_ALIGNED(p) (((int)(p) & (sizeof(char *) - 1)) == 0)
@@ -275 +285 @@
 void Collector::markCurrentThreadConservatively()
 {
-  jmp_buf registers;
-  setjmp(registers);
-
-  pthread_t thread = pthread_self();
-  void *stackBase = pthread_get_stackaddr_np(thread);
-  int dummy;
-  void *stackPointer = &dummy;
-  markStackObjectsConservatively(stackPointer, stackBase);
-}
+    jmp_buf registers;
+    setjmp(registers);
+
+#if !WIN32
+    pthread_t thread = pthread_self();
+    void *stackBase = pthread_get_stackaddr_np(thread);
+#else
+    NT_TIB *pTib;
+    __asm {
+        MOV EAX, FS:[18h]
+        MOV pTib, EAX
+    }
+    void *stackBase = (void *)pTib->StackBase;
+#endif
+
+    int dummy;
+    void *stackPointer = &dummy;
+
+    markStackObjectsConservatively(stackPointer, stackBase);
+}
+
+#if KJS_MULTIPLE_THREADS
 
 typedef unsigned long usword_t; // word size, assumed to be either 32 or 64 bit
@@ -324 +347 @@
 }
 
+#endif
+
 void Collector::markStackObjectsConservatively()
 {
   markCurrentThreadConservatively();
 
+#if KJS_MULTIPLE_THREADS
   for (Thread *thread = registeredThreads; thread != NULL; thread = thread->next) {
     if (thread->posixThread != pthread_self()) {
@@ -333 +359 @@
     }
   }
+#endif
 }