Changeset 5005

Timestamp:

Aug 22, 2006, 1:01:22 AM (18 years ago)

Author:

Gary Byers

Message:

Some PPC64 conditionalizations should really have tested WORD_SIZE.

DARWIN_GS_HACK stuff around suspend/resume signal handlers. (May not
be necessary.)

Ensure that tcr.linear gets set on x86, even if not HAVE_TLS.

File:

• trunk/ccl/lisp-kernel/thread_manager.c (modified) (5 diffs)

trunk/ccl/lisp-kernel/thread_manager.c

@@ -257 +257 @@
 suspend_resume_handler(int signo, siginfo_t *info, ExceptionInformation *context)
 {
+#ifdef DARWIN_GS_HACK
+  Boolean gs_was_tcr = ensure_gs_pthread();
+#endif
   TCR *tcr = get_interrupt_tcr(false);
 
@@ -288 +291 @@
   }
 #if WAIT_FOR_RESUME_ACK
-    SEM_RAISE(tcr->suspend);
+  SEM_RAISE(tcr->suspend);
+#endif
+#ifdef DARWIN_GS_HACK
+  if (gs_was_tcr) {
+    set_gs_address(tcr);
+  }
 #endif
 #ifdef DARWIN
@@ -443 +451 @@
     tcr = calloc(1, sizeof(TCR));
 #ifdef DARWIN
-#ifdef PPC64
+#if WORD_SIZE == 64
     if (((unsigned)((natural)tcr)) != ((natural)tcr)) {
       tcr->next = chain;
@@ -495 +503 @@
   /* darwin_set_x8664_fs_reg(tcr); */
 #endif
-  tcr->linear = tcr;
 }
 
@@ -520 +527 @@
 #else
   TCR *tcr = allocate_tcr();
+#endif
+
+#ifdef X8664
+  tcr->linear = tcr;
 #endif