projects
/
sbcl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
1.0.29.13: relax CAST-EXTERNALLY-CHECKABLE-P a bit
[sbcl.git]
/
src
/
runtime
/
globals.c
diff --git
a/src/runtime/globals.c
b/src/runtime/globals.c
index
6152e25
..
099acd2
100644
(file)
--- a/
src/runtime/globals.c
+++ b/
src/runtime/globals.c
@@
-17,12
+17,14
@@
#include <sys/types.h>
#include <unistd.h>
#include <sys/types.h>
#include <unistd.h>
-#include "runtime.h"
#include "sbcl.h"
#include "sbcl.h"
+#include "runtime.h"
#include "globals.h"
#include "validate.h"
#include "globals.h"
#include "validate.h"
+#ifdef FOREIGN_FUNCTION_CALL_FLAG
int foreign_function_call_active;
int foreign_function_call_active;
+#endif
lispobj *current_control_stack_pointer;
lispobj *current_control_frame_pointer;
lispobj *current_control_stack_pointer;
lispobj *current_control_frame_pointer;
@@
-32,7
+34,7
@@
lispobj *current_binding_stack_pointer;
/* ALLOCATION_POINTER is x86 or RT. Anyone want to do an RT port? */
/* ALLOCATION_POINTER is x86 or RT. Anyone want to do an RT port? */
-#ifndef ALLOCATION_POINTER
+# if !defined(LISP_FEATURE_X86) && !defined(LISP_FEATURE_X86_64)
/* The Object Formerly Known As current_dynamic_space_free_pointer */
lispobj *dynamic_space_free_pointer;
#endif
/* The Object Formerly Known As current_dynamic_space_free_pointer */
lispobj *dynamic_space_free_pointer;
#endif
@@
-46,29
+48,26
@@
lispobj *current_auto_gc_trigger;
* is done). For the GENCGC, it always points to DYNAMIC_SPACE_START. */
lispobj *current_dynamic_space;
* is done). For the GENCGC, it always points to DYNAMIC_SPACE_START. */
lispobj *current_dynamic_space;
+#if defined(LISP_FEATURE_SB_THREAD) && !defined(LISP_FEATURE_GCC_TLS)
+pthread_key_t specials=0;
+#endif
+
void globals_init(void)
{
/* Space, stack, and free pointer vars are initialized by
* validate() and coreparse(). */
current_control_frame_pointer = (lispobj *)0;
void globals_init(void)
{
/* Space, stack, and free pointer vars are initialized by
* validate() and coreparse(). */
current_control_frame_pointer = (lispobj *)0;
-#ifndef LISP_FEATURE_GENCGC
+#ifndef LISP_FEATURE_GENCGC
/* no GC trigger yet */
current_auto_gc_trigger = NULL;
#endif
/* no GC trigger yet */
current_auto_gc_trigger = NULL;
#endif
- /* Set foreign function call active. */
+#ifdef FOREIGN_FUNCTION_CALL_FLAG
foreign_function_call_active = 1;
foreign_function_call_active = 1;
-
- /* Initialize the current Lisp state. */
-#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
#endif
- current_control_frame_pointer = (lispobj *)0;
-#ifndef BINDING_STACK_POINTER
- current_binding_stack_pointer = native_pointer(BINDING_STACK_START);
+#if defined(LISP_FEATURE_SB_THREAD) && !defined(LISP_FEATURE_GCC_TLS)
+ pthread_key_create(&specials,0);
#endif
}
#endif
}