projects
/
sbcl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
0.7.9.68:
[sbcl.git]
/
src
/
runtime
/
globals.c
diff --git
a/src/runtime/globals.c
b/src/runtime/globals.c
index
2dee4ce
..
96636d1
100644
(file)
--- a/
src/runtime/globals.c
+++ b/
src/runtime/globals.c
@@
-37,7
+37,7
@@
lispobj *current_binding_stack_pointer;
lispobj *dynamic_space_free_pointer;
#endif
lispobj *dynamic_space_free_pointer;
#endif
-#ifndef GENCGC /* since GENCGC has its own way to record trigger */
+#ifndef LISP_FEATURE_GENCGC /* GENCGC has its own way to record trigger */
lispobj *current_auto_gc_trigger;
#endif
lispobj *current_auto_gc_trigger;
#endif
@@
-51,7
+51,7
@@
void globals_init(void)
/* Space, stack, and free pointer vars are initialized by
* validate() and coreparse(). */
/* Space, stack, and free pointer vars are initialized by
* validate() and coreparse(). */
-#ifndef GENCGC /* since GENCGC has its own way to record trigger */
+#ifndef LISP_FEATURE_GENCGC
/* no GC trigger yet */
current_auto_gc_trigger = NULL;
#endif
/* no GC trigger yet */
current_auto_gc_trigger = NULL;
#endif
@@
-60,14
+60,14
@@
void globals_init(void)
foreign_function_call_active = 1;
/* Initialize the current Lisp state. */
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;
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
#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
}
#endif
}