X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fglobals.h;h=13a04472300447eb364adf305b76807348558340;hb=902e93736a0888aa6b04dc328b1eb328423bf426;hp=5b451818c984ffc8b75d9b97e009404b5dc48940;hpb=a4e7c6bc705d739360dfaa9c3c652fd4a05d6c06;p=sbcl.git diff --git a/src/runtime/globals.h b/src/runtime/globals.h index 5b45181..13a0447 100644 --- a/src/runtime/globals.h +++ b/src/runtime/globals.h @@ -14,27 +14,32 @@ #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 lispobj *current_dynamic_space; +extern pid_t parent_pid; +extern boolean stop_the_world; extern void globals_init(void); -#else LANGUAGE_ASSEMBLY +#else /* LANGUAGE_ASSEMBLY */ #ifdef mips #define EXTERN(name,bytes) .extern name bytes @@ -48,15 +53,14 @@ extern void globals_init(void); #endif #endif /**/ -#ifdef ibmrt -#define EXTERN(name,bytes) .globl _/**/name -#endif -/**/ #ifdef alpha -#ifdef linux +#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 @@ -67,6 +71,11 @@ extern void globals_init(void); #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) @@ -79,6 +88,6 @@ EXTERN(current_dynamic_space, 4) EXTERN(current_flags_register, 4) #endif -#endif LANGUAGE_ASSEMBLY +#endif /* LANGUAGE_ASSEMBLY */ -#endif _INCLUDED_GLOBALS_H_ +#endif /* _INCLUDED_GLOBALS_H_ */