X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fglobals.c;h=2b397cb52376c85437c52c0ffcbc3dd95f30fb29;hb=bfb19d306581ac86feb4371846c4b9953d692dd8;hp=7d40faf3ac24be1bea165767b34933f90a64c8de;hpb=c8322df812da6eb4ef1ae51735b224b2ad0f1503;p=sbcl.git

diff --git a/src/runtime/globals.c b/src/runtime/globals.c
index 7d40faf..2b397cb 100644
--- a/src/runtime/globals.c
+++ b/src/runtime/globals.c
@@ -14,13 +14,17 @@
  */
 
 #include <stdio.h>
+#include <sys/types.h>
+#include <unistd.h>
 
-#include "runtime.h"
 #include "sbcl.h"
+#include "runtime.h"
 #include "globals.h"
 #include "validate.h"
 
+#ifdef FOREIGN_FUNCTION_CALL_FLAG
 int foreign_function_call_active;
+#endif
 
 lispobj *current_control_stack_pointer;
 lispobj *current_control_frame_pointer;
@@ -28,46 +32,46 @@ lispobj *current_control_frame_pointer;
 lispobj *current_binding_stack_pointer;
 #endif
 
-/* ALLOCATION_POINTER is more or less synonymous with RT, it seems.
- * Anyone want to do an RT port of sbcl?  
- */
+/* ALLOCATION_POINTER is x86 or RT.  Anyone want to do an RT port?   */
 
-#ifndef ALLOCATION_POINTER
+# if !defined(LISP_FEATURE_X86) && !defined(LISP_FEATURE_X86_64)
 /* The Object Formerly Known As current_dynamic_space_free_pointer */
 lispobj *dynamic_space_free_pointer;
 #endif
 
-#ifndef INTERNAL_GC_TRIGGER
+#ifndef LISP_FEATURE_GENCGC /* GENCGC has its own way to record trigger */
 lispobj *current_auto_gc_trigger;
 #endif
 
+#ifdef LISP_FEATURE_SB_THREAD
+boolean stop_the_world=0;
+#endif
+
 /* For copying GCs, this points to the start of the dynamic space
  * currently in use (that will become the from_space when the next GC
  * is done).  For the GENCGC, it always points to DYNAMIC_SPACE_START. */
 lispobj *current_dynamic_space;
 
+#if defined(LISP_FEATURE_SB_THREAD)
+pthread_key_t specials=0;
+#endif
+
 void globals_init(void)
 {
     /* Space, stack, and free pointer vars are initialized by
      * validate() and coreparse(). */
+    current_control_frame_pointer = (lispobj *)0;
 
-#ifndef INTERNAL_GC_TRIGGER
+#ifndef LISP_FEATURE_GENCGC
     /* no GC trigger yet */
     current_auto_gc_trigger = NULL;
 #endif
 
-    /* Set foreign function call active. */
+#ifdef FOREIGN_FUNCTION_CALL_FLAG
     foreign_function_call_active = 1;
-
-    /* Initialize the current Lisp state. */
-#ifndef __i386__ /* if stack grows upward */
-    current_control_stack_pointer = (lispobj *)CONTROL_STACK_START;
-#else
-    current_control_stack_pointer = (lispobj *)CONTROL_STACK_END;
 #endif
 
-    current_control_frame_pointer = (lispobj *)0;
-#ifndef BINDING_STACK_POINTER
-    current_binding_stack_pointer = BINDING_STACK_START;
+#ifdef LISP_FEATURE_SB_THREAD
+    pthread_key_create(&specials,0);
 #endif
 }