X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fglobals.h;h=fc8ad968452cdda1b696c212d88277948b1361e0;hb=dd54f9e004a0a83d1328e94648f48dcc27e0be5b;hp=9dca7974bb5712f5432157f4857c39fb3c863a41;hpb=9a19ce460a70a6c1de36095b3e2621116b91cc80;p=sbcl.git

diff --git a/src/runtime/globals.h b/src/runtime/globals.h
index 9dca797..fc8ad96 100644
--- a/src/runtime/globals.h
+++ b/src/runtime/globals.h
@@ -16,23 +16,26 @@
 # include <sys/types.h>
 # include <unistd.h>
 # include "runtime.h"
+# include "runtime-options.h"
 #endif
 
 #include "sbcl.h"
 
-/* Currently threads live only on x86oid platforms, but this thing
- * cannot ever work with threads, so... */
-#if !defined(LISP_FEATURE_SB_THREAD) && !defined(LISP_FEATURE_X86) && !defined(LISP_FEATURE_X86_64)
-#define FOREIGN_FUNCTION_CALL_FLAG
-#endif
-
 #ifndef LANGUAGE_ASSEMBLY
 
-#ifdef FOREIGN_FUNCTION_CALL_FLAG
+#ifdef LISP_FEATURE_SB_THREAD
+#define foreign_function_call_active_p(thread) \
+    (thread->foreign_function_call_active)
+#else
 extern int foreign_function_call_active;
+#define foreign_function_call_active_p(thread) \
+    foreign_function_call_active
 #endif
 
-extern size_t dynamic_space_size;
+extern os_vm_size_t dynamic_space_size;
+extern os_vm_size_t thread_control_stack_size;
+
+extern struct runtime_options *runtime_options;
 
 #ifdef LISP_FEATURE_WIN32
 #define ENVIRON _environ
@@ -45,11 +48,15 @@ extern char **ENVIRON;
 extern pthread_key_t specials;
 #endif
 
+#if !defined(LISP_FEATURE_SB_THREAD)
 extern lispobj *current_control_stack_pointer;
+#endif
+#if defined(LISP_FEATURE_X86) || defined(LISP_FEATURE_X86_64) || !defined(LISP_FEATURE_SB_THREAD)
 extern lispobj *current_control_frame_pointer;
-# if !defined(LISP_FEATURE_X86) && !defined(LISP_FEATURE_X86_64)
+#endif
+#if !defined(LISP_FEATURE_X86) && !defined(LISP_FEATURE_X86_64) && !defined(LISP_FEATURE_SB_THREAD)
 extern lispobj *current_binding_stack_pointer;
-# endif
+#endif
 
 #if !defined(LISP_FEATURE_X86) && !defined(LISP_FEATURE_X86_64)
 /* This is unused on X86 and X86_64, but is used as the global
@@ -70,6 +77,11 @@ extern lispobj *current_dynamic_space;
 
 extern void globals_init(void);
 
+#ifdef LISP_FEATURE_SB_SAFEPOINT
+# define GC_SAFEPOINT_PAGE_ADDR ((lispobj) gc_safepoint_page)
+extern char gc_safepoint_page[];
+#endif
+
 #else /* LANGUAGE_ASSEMBLY */
 
 # ifdef LISP_FEATURE_MIPS
@@ -96,7 +108,7 @@ extern void globals_init(void);
 /**/
 # ifdef LISP_FEATURE_PPC
 #  ifdef LISP_FEATURE_DARWIN
-#   define EXTERN(name,bytes) .globl _/**/name
+#   define EXTERN(name,bytes) .globl _ ## name
 #  else
 #   define EXTERN(name,bytes) .globl name
 #  endif
@@ -112,11 +124,13 @@ extern void globals_init(void);
 #  define POINTERSIZE 4
 # endif
 
-#ifdef FOREIGN_FUNCTION_CALL_FLAG
+#ifndef LISP_FEATURE_SB_THREAD
 EXTERN(foreign_function_call_active, 4)
 #endif
 
+#if !defined(LISP_FEATURE_SB_THREAD) && !defined(LISP_FEATURE_C_STACK_IS_CONTROL_STACK)
 EXTERN(current_control_stack_pointer, POINTERSIZE)
+#endif
 EXTERN(current_control_frame_pointer, POINTERSIZE)
 # if !defined(LISP_FEATURE_X86) && !defined(LISP_FEATURE_X86_64)
 EXTERN(current_binding_stack_pointer, POINTERSIZE)