X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fglobals.h;h=13a04472300447eb364adf305b76807348558340;hb=902e93736a0888aa6b04dc328b1eb328423bf426;hp=4d956c80ca76f832309ff6ed73211436fb8ada96;hpb=5f338d314224411587a7cac218ea320bc982f19f;p=sbcl.git diff --git a/src/runtime/globals.h b/src/runtime/globals.h index 4d956c8..13a0447 100644 --- a/src/runtime/globals.h +++ b/src/runtime/globals.h @@ -9,39 +9,42 @@ * files for more information. */ -/* - * $Header$ - */ - #if !defined(_INCLUDE_GLOBALS_H_) #define _INCLUDED_GLOBALS_H_ #ifndef LANGUAGE_ASSEMBLY +#include +#include #include "runtime.h" extern int foreign_function_call_active; +extern boolean stop_the_world; extern lispobj *current_control_stack_pointer; extern lispobj *current_control_frame_pointer; -#if !defined(ibmrt) && !defined(__i386__) +#if !defined(__i386__) extern lispobj *current_binding_stack_pointer; #endif -#if !defined(ibmrt) && !defined(__i386__) +#if !defined(__i386__) +/* FIXME: Why doesn't the x86 need this? */ extern lispobj *dynamic_space_free_pointer; extern lispobj *current_auto_gc_trigger; #endif -extern void globals_init(void); +extern lispobj *current_dynamic_space; +extern pid_t parent_pid; +extern boolean stop_the_world; -#else LANGUAGE_ASSEMBLY +extern void globals_init(void); -/* These are needed by ./assem.s */ +#else /* LANGUAGE_ASSEMBLY */ #ifdef mips #define EXTERN(name,bytes) .extern name bytes #endif +/**/ #ifdef sparc #ifdef SVR4 #define EXTERN(name,bytes) .global name @@ -49,31 +52,42 @@ extern void globals_init(void); #define EXTERN(name,bytes) .global _ ## name #endif #endif -#ifdef ibmrt -#define EXTERN(name,bytes) .globl _/**/name +/**/ +#ifdef alpha +#ifdef __linux__ +#define EXTERN(name,bytes) .globl name +#endif +#endif +#ifdef ppc +#define EXTERN(name,bytes) .globl name #endif - #ifdef __i386__ #ifdef __linux__ +/* I'm very dubious about this. Linux hasn't used _ on external names + * since ELF became prevalent - i.e. about 1996, on x86 -dan 20010125 */ #define EXTERN(name,bytes) .globl _/**/name #else #define EXTERN(name,bytes) .global _ ## name #endif #endif +/* FIXME : these sizes are, incidentally, bogus on Alpha. But the + * EXTERN macro doesn't use its second arg anyway, so no immediate harm + * done -dan 2002.05.07 + */ + EXTERN(foreign_function_call_active, 4) EXTERN(current_control_stack_pointer, 4) EXTERN(current_control_frame_pointer, 4) -#if !defined(ibmrt) && !defined(__i386__) EXTERN(current_binding_stack_pointer, 4) EXTERN(dynamic_space_free_pointer, 4) -#endif +EXTERN(current_dynamic_space, 4) #ifdef mips EXTERN(current_flags_register, 4) #endif -#endif LANGUAGE_ASSEMBLY +#endif /* LANGUAGE_ASSEMBLY */ -#endif _INCLUDED_GLOBALS_H_ +#endif /* _INCLUDED_GLOBALS_H_ */