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

Timestamp:

Oct 3, 2005, 6:43:58 PM (20 years ago)

Author:

mjs

Message:

Patch from George Staikos <​[email protected]>, reviewed and tweaked a bit by me.

​http://bugzilla.opendarwin.org/show_bug.cgi?id=5174
Add support for compiling on Linux (likely to help for other POSIX systems too)

• kjs/collector.cpp: (KJS::Collector::markCurrentThreadConservatively): (KJS::Collector::markOtherThreadConservatively):
• kjs/config.h:
• kjs/date_object.cpp: (KJS::formatDate): (KJS::formatDateUTCVariant): (KJS::formatTime): (KJS::timeZoneOffset): (KJS::DateProtoFuncImp::callAsFunction): (KJS::DateObjectImp::construct): (KJS::DateObjectImp::callAsFunction): (KJS::makeTime):
• kjs/identifier.cpp:
• kjs/internal.cpp: (KJS::initializeInterpreterLock): (KJS::lockInterpreter): (KJS::unlockInterpreter): (KJS::UndefinedImp::toPrimitive): (KJS::UndefinedImp::toBoolean): (KJS::UndefinedImp::toNumber): (KJS::UndefinedImp::toString): (KJS::NullImp::toPrimitive): (KJS::NullImp::toBoolean): (KJS::NullImp::toNumber): (KJS::NullImp::toString): (KJS::BooleanImp::toPrimitive): (KJS::BooleanImp::toBoolean): (KJS::BooleanImp::toNumber): (KJS::BooleanImp::toString): (KJS::StringImp::toPrimitive): (KJS::StringImp::toBoolean): (KJS::StringImp::toNumber): (KJS::StringImp::toString):
• kjs/internal.h:
• kjs/protected_values.cpp:

File:

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

trunk/JavaScriptCore/kjs/collector.cpp

@@ -32 +32 @@
 #include <algorithm>
 
-#if !WIN32
+#if __APPLE__
 
 #include <CoreFoundation/CoreFoundation.h>
@@ -40 +40 @@
 #include <mach/thread_act.h>
 
+#elif WIN32
+
+#include <windows.h>
+
 #else
 
-#include <windows.h>
+#include <pthread.h>
 
 #endif
@@ -292 +296 @@
     setjmp(registers);
 
-#if !WIN32
+#if __APPLE__
     pthread_t thread = pthread_self();
     void *stackBase = pthread_get_stackaddr_np(thread);
-#else
+#elif WIN32
     NT_TIB *pTib;
     __asm {
@@ -302 +306 @@
     }
     void *stackBase = (void *)pTib->StackBase;
+#else
+    void *stackBase = 0;
+    pthread_attr_t sattr;
+    // FIXME: this function is non-portable; other POSIX systems may have different np alternatives
+    pthread_getattr_np(pthread_self(), &sattr);
+    // Should work but fails on Linux (?)
+    //  pthread_attr_getstack(&sattr, &stackBase, &stackSize);
+    pthread_attr_getstackaddr(&sattr, &stackBase);
+    assert(stackBase);
 #endif
 
@@ -318 +331 @@
   thread_suspend(thread->machThread);
 
-#if defined(__i386__)
+#if __i386__
   i386_thread_state_t regs;
   unsigned user_count = sizeof(regs)/sizeof(int);
   thread_state_flavor_t flavor = i386_THREAD_STATE;
-#elif defined(__ppc__)
+#elif __ppc__
   ppc_thread_state_t  regs;
   unsigned user_count = PPC_THREAD_STATE_COUNT;
   thread_state_flavor_t flavor = PPC_THREAD_STATE;
-#elif defined(__ppc64__)
+#elif __ppc64__
   ppc_thread_state64_t  regs;
   unsigned user_count = PPC_THREAD_STATE64_COUNT;
@@ -340 +353 @@
   
   // scan the stack
-#if defined(__i386__)
+#if __i386__
   markStackObjectsConservatively((void *)regs.esp, pthread_get_stackaddr_np(thread->posixThread));
 #elif defined(__ppc__) || defined(__ppc64__)