0.9.2.42:

[sbcl.git] / src / runtime / globals.c

diff --git a/src/runtime/globals.c b/src/runtime/globals.c
index de9389a..6c9f88a 100644 (file)
--- a/src/runtime/globals.c
+++ b/src/runtime/globals.c
@@ -14,9 +14,11 @@
  */
 
 #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"
 
@@ -28,46 +30,44 @@ 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
 /* 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
 
-/* for copying GCs, this points to the start of the dynamic space
+#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_0_SPACE_START */
+ * 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. */
     foreign_function_call_active = 1;
-
-    /* Initialize the current Lisp state. */
-#ifndef __i386__
-    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;
+#if defined(LISP_FEATURE_SB_THREAD)
+    pthread_key_create(&specials,0);
 #endif
 }