X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fruntime%2Fglobals.c;h=6152e258d2bab91ba9c2be2e535e0b91d4ce7496;hb=b870615b146940f661e5d0e9069ca4e16e9f483d;hp=e775166ff555100be05650c4c7b0709299fe57b2;hpb=dc5e3163fe667e2629c7769aa8cf2e501eeeefa6;p=sbcl.git diff --git a/src/runtime/globals.c b/src/runtime/globals.c index e775166..6152e25 100644 --- a/src/runtime/globals.c +++ b/src/runtime/globals.c @@ -14,6 +14,8 @@ */ #include +#include +#include #include "runtime.h" #include "sbcl.h" @@ -28,16 +30,14 @@ 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 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 @@ -50,8 +50,9 @@ void globals_init(void) { /* Space, stack, and free pointer vars are initialized by * validate() and coreparse(). */ + current_control_frame_pointer = (lispobj *)0; -#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 @@ -68,6 +69,6 @@ void globals_init(void) 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 }