0.7.12.35

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

diff --git a/src/runtime/globals.c b/src/runtime/globals.c
index b4774db..96636d1 100644 (file)
--- a/src/runtime/globals.c
+++ b/src/runtime/globals.c
@@ -37,26 +37,21 @@ lispobj *current_binding_stack_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 =
-#ifndef GENCGC
-    DYNAMIC_0_SPACE_START;
-#else
-    DYNAMIC_SPACE_START;
-#endif
+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
@@ -65,14 +60,14 @@ void globals_init(void)
     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
+#ifdef LISP_FEATURE_STACK_GROWS_DOWNWARD_NOT_UPWARD
     current_control_stack_pointer = (lispobj *)CONTROL_STACK_END;
+#else
+    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
 }