X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fglobals.c;h=96636d13e2c052c53f664db8b8214e170830f734;hb=98f3f617894ce24a40764aa98606ce68c5482cf0;hp=ae67e71ed713247eeb3a9d6258c15315d22c9969;hpb=d0583fb59b0d5e243c9141d649b82bac577f5aa9;p=sbcl.git

diff --git a/src/runtime/globals.c b/src/runtime/globals.c
index ae67e71..96636d1 100644
--- 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,30 @@ lispobj *current_control_frame_pointer;
 lispobj *current_binding_stack_pointer;
 #endif
 
-lispobj *control_stack;
-#ifdef __i386__
-lispobj *control_stack_end;
-#endif
+/* ALLOCATION_POINTER is more or less synonymous with RT, it seems.
+ * Anyone want to do an RT port of sbcl?  
+ */
 
 #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
+ * 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;
+
 void globals_init(void)
 {
     /* Space, stack, and free pointer vars are initialized by
      * validate() and coreparse(). */
 
-#ifndef INTERNAL_GC_TRIGGER
+#ifndef LISP_FEATURE_GENCGC 
     /* no GC trigger yet */
     current_auto_gc_trigger = NULL;
 #endif
@@ -57,14 +60,14 @@ void globals_init(void)
     foreign_function_call_active = 1;
 
     /* Initialize the current Lisp state. */
-#ifndef __i386__
-    current_control_stack_pointer = control_stack;
+#ifdef LISP_FEATURE_STACK_GROWS_DOWNWARD_NOT_UPWARD
+    current_control_stack_pointer = (lispobj *)CONTROL_STACK_END;
 #else
-    current_control_stack_pointer = control_stack_end;
+    current_control_stack_pointer = (lispobj *)CONTROL_STACK_START;
 #endif
 
     current_control_frame_pointer = (lispobj *)0;
 #ifndef BINDING_STACK_POINTER
-    current_binding_stack_pointer = BINDING_STACK_START;
+    current_binding_stack_pointer = native_pointer(BINDING_STACK_START);
 #endif
 }