0.6.12.7.flaky1:

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

diff --git a/src/runtime/globals.c b/src/runtime/globals.c
index 691bfb1..b4774db 100644 (file)
--- a/src/runtime/globals.c
+++ b/src/runtime/globals.c
@@ -13,15 +13,12 @@
  * files for more information.
  */
 
-/*
- * $Header$
- */
-
 #include <stdio.h>
 
 #include "runtime.h"
 #include "sbcl.h"
 #include "globals.h"
+#include "validate.h"
 
 int foreign_function_call_active;
 
@@ -31,24 +28,29 @@ lispobj *current_control_frame_pointer;
 lispobj *current_binding_stack_pointer;
 #endif
 
-lispobj *read_only_space;
-lispobj *static_space;
-lispobj *dynamic_0_space;
-lispobj *dynamic_1_space;
-lispobj *control_stack;
-#ifdef __i386__
-lispobj *control_stack_end;
-#endif
-lispobj *binding_stack;
+/* ALLOCATION_POINTER is more or less synonymous with RT, it seems.
+ * Anyone want to do an RT port of sbcl?  
+ */
 
-lispobj *current_dynamic_space;
 #ifndef ALLOCATION_POINTER
-lispobj *current_dynamic_space_free_pointer;
+/* The Object Formerly Known As current_dynamic_space_free_pointer */
+lispobj *dynamic_space_free_pointer;
 #endif
+
 #ifndef INTERNAL_GC_TRIGGER
 lispobj *current_auto_gc_trigger;
 #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 =
+#ifndef GENCGC
+    DYNAMIC_0_SPACE_START;
+#else
+    DYNAMIC_SPACE_START;
+#endif
+
 void globals_init(void)
 {
     /* Space, stack, and free pointer vars are initialized by
@@ -63,14 +65,14 @@ void globals_init(void)
     foreign_function_call_active = 1;
 
     /* Initialize the current Lisp state. */
-#ifndef __i386__
-    current_control_stack_pointer = control_stack;
+#ifndef __i386__ /* if stack grows upward */
+    current_control_stack_pointer = (lispobj *)CONTROL_STACK_START;
 #else
-    current_control_stack_pointer = control_stack_end;
+    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;
+    current_binding_stack_pointer = BINDING_STACK_START;
 #endif
 }