Changeset 12300 in webkit for trunk/JavaScriptCore

Timestamp:

Jan 22, 2006, 9:44:33 PM (19 years ago)

Author:

staikos

Message:

Reviewed by Maciej and Darin.

• kjs/collector.cpp: merge major speedup from KDE on Linux

patch by Maks Orlovich, bug #6145
Also unify cpu detection

• kjs/config.h: define simpler CPU macros

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• kjs/collector.cpp (modified) (3 diffs)
• kjs/config.h (modified) (1 diff)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2006-01-22  George Staikos <[email protected]>
+
+        Reviewed by Maciej.
+
+        * kjs/collector.cpp: merge major speedup from KDE on Linux
+                             patch by Maks Orlovich, bug #6145
+                             Also unify cpu detection
+        * kjs/config.h: define simpler CPU macros
+
 2006-01-22  George Staikos <[email protected]>
 

trunk/JavaScriptCore/kjs/collector.cpp

@@ -314 +314 @@
     void *stackBase = (void *)pTib->StackBase;
 #else
-    void *stackBase = 0;
-    pthread_attr_t sattr;
+    static void *stackBase = 0;
+    static pthread_t stackThread;
+    pthread_t thread = pthread_self();
+    if (stackBase == 0 || thread != stackThread) {
+        pthread_attr_t sattr;
 #ifdef HAVE_PTHREAD_NP_H
-    // e.g. on FreeBSD 5.4, [email protected]
-    pthread_attr_get_np(thread, &sattr);
+        // e.g. on FreeBSD 5.4, [email protected]
+        pthread_attr_get_np(thread, &sattr);
 #else
-    // FIXME: this function is non-portable; other POSIX systems may have different np alternatives
-    pthread_getattr_np(pthread_self(), &sattr);
-#endif
-    // Should work but fails on Linux (?)
-    //  pthread_attr_getstack(&sattr, &stackBase, &stackSize);
-    pthread_attr_getstackaddr(&sattr, &stackBase);
-    assert(stackBase);
+        // FIXME: this function is non-portable; other POSIX systems may have different np alternatives
+        pthread_getattr_np(thread, &sattr);
+#endif
+        // Should work but fails on Linux (?)
+        //  pthread_attr_getstack(&sattr, &stackBase, &stackSize);
+        pthread_attr_getstackaddr(&sattr, &stackBase);
+        assert(stackBase);
+        stackThread = thread;
+    }
 #endif
 
@@ -343 +348 @@
   thread_suspend(thread->machThread);
 
-#if __i386__
+#if KJS_CPU_X86
   i386_thread_state_t regs;
   unsigned user_count = sizeof(regs)/sizeof(int);
   thread_state_flavor_t flavor = i386_THREAD_STATE;
-#elif __ppc__
+#elif KJS_CPU_PPC
   ppc_thread_state_t  regs;
   unsigned user_count = PPC_THREAD_STATE_COUNT;
   thread_state_flavor_t flavor = PPC_THREAD_STATE;
-#elif __ppc64__
+#elif KJS_CPU_PPC64
   ppc_thread_state64_t  regs;
   unsigned user_count = PPC_THREAD_STATE64_COUNT;
@@ -365 +370 @@
   
   // scan the stack
-#if __i386__
+#if KJS_CPU_X86
   markStackObjectsConservatively((void *)regs.esp, pthread_get_stackaddr_np(thread->posixThread));
-#elif defined(__ppc__) || defined(__ppc64__)
+#elif KJS_CPU_PPC || KJS_CPU_PPC64
   markStackObjectsConservatively((void *)regs.r1, pthread_get_stackaddr_np(thread->posixThread));
 #else

trunk/JavaScriptCore/kjs/config.h

@@ -41 +41 @@
 #define HAVE_STRING_H 1
 
-#ifdef __ppc__
+#ifdef __ppc__ || __PPC__ || __powerpc__
+#define KJS_CPU_PPC 1
 #define WORDS_BIGENDIAN 1
+#elif __ppc64__ || __PPC64__
+#define KJS_CPU_PPC64 1
+#define WORDS_BIGENDIAN 1
+#elif __i386__
+#define KJS_CPU_X86 1
 #endif