projects
/
sbcl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
0.pre7.86.flaky7.14:
[sbcl.git]
/
src
/
runtime
/
globals.c
diff --git
a/src/runtime/globals.c
b/src/runtime/globals.c
index
9129424
..
7d40faf
100644
(file)
--- a/
src/runtime/globals.c
+++ b/
src/runtime/globals.c
@@
-13,15
+13,12
@@
* files for more information.
*/
* files for more information.
*/
-/*
- * $Header$
- */
-
#include <stdio.h>
#include "runtime.h"
#include "sbcl.h"
#include "globals.h"
#include <stdio.h>
#include "runtime.h"
#include "sbcl.h"
#include "globals.h"
+#include "validate.h"
int foreign_function_call_active;
int foreign_function_call_active;
@@
-31,21
+28,24
@@
lispobj *current_control_frame_pointer;
lispobj *current_binding_stack_pointer;
#endif
lispobj *current_binding_stack_pointer;
#endif
-lispobj *read_only_space;
-lispobj *static_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?
+ */
#ifndef ALLOCATION_POINTER
#ifndef ALLOCATION_POINTER
+/* The Object Formerly Known As current_dynamic_space_free_pointer */
lispobj *dynamic_space_free_pointer;
#endif
lispobj *dynamic_space_free_pointer;
#endif
+
#ifndef INTERNAL_GC_TRIGGER
lispobj *current_auto_gc_trigger;
#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;
+
void globals_init(void)
{
/* Space, stack, and free pointer vars are initialized by
void globals_init(void)
{
/* Space, stack, and free pointer vars are initialized by
@@
-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__
- current_control_stack_pointer = control_stack;
+#ifndef __i386__ /* if stack grows upward */
+ current_control_stack_pointer = (lispobj *)CONTROL_STACK_START;
#else
#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
#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
}
#endif
}