projects
/
sbcl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
0.6.12.4:
[sbcl.git]
/
src
/
runtime
/
globals.h
diff --git
a/src/runtime/globals.h
b/src/runtime/globals.h
index
3e8feca
..
f91de8a
100644
(file)
--- a/
src/runtime/globals.h
+++ b/
src/runtime/globals.h
@@
-9,10
+9,6
@@
* files for more information.
*/
* files for more information.
*/
-/*
- * $Header$
- */
-
#if !defined(_INCLUDE_GLOBALS_H_)
#define _INCLUDED_GLOBALS_H_
#if !defined(_INCLUDE_GLOBALS_H_)
#define _INCLUDED_GLOBALS_H_
@@
-28,23
+24,19
@@
extern lispobj *current_control_frame_pointer;
extern lispobj *current_binding_stack_pointer;
#endif
extern lispobj *current_binding_stack_pointer;
#endif
-extern lispobj *read_only_space;
-extern lispobj *static_space;
-extern lispobj *control_stack;
-extern lispobj *binding_stack;
-#ifdef __i386__
-extern lispobj *control_stack_end;
-#endif
#if !defined(ibmrt) && !defined(__i386__)
#if !defined(ibmrt) && !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 *dynamic_space_free_pointer;
extern lispobj *current_auto_gc_trigger;
#endif
+extern lispobj *current_dynamic_space;
+
extern void globals_init(void);
#else LANGUAGE_ASSEMBLY
extern void globals_init(void);
#else LANGUAGE_ASSEMBLY
-/* These are needed by ./assem.s */
+/* These are needed by assem.S. */
#ifdef mips
#define EXTERN(name,bytes) .extern name bytes
#ifdef mips
#define EXTERN(name,bytes) .extern name bytes
@@
-60,6
+52,14
@@
extern void globals_init(void);
#define EXTERN(name,bytes) .globl _/**/name
#endif
#define EXTERN(name,bytes) .globl _/**/name
#endif
+#ifdef alpha
+#ifdef linux
+#define EXTERN(name,bytes) .globl name
+#endif
+#endif
+
+/* 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 */
#ifdef __i386__
#ifdef __linux__
#define EXTERN(name,bytes) .globl _/**/name
#ifdef __i386__
#ifdef __linux__
#define EXTERN(name,bytes) .globl _/**/name
@@
-72,10
+72,9
@@
EXTERN(foreign_function_call_active, 4)
EXTERN(current_control_stack_pointer, 4)
EXTERN(current_control_frame_pointer, 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)
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)
#ifdef mips
EXTERN(current_flags_register, 4)