1.0.1.1:

[sbcl.git] / src / runtime / validate.h

diff --git a/src/runtime/validate.h b/src/runtime/validate.h
index 478f321..26f4670 100644 (file)
--- a/src/runtime/validate.h
+++ b/src/runtime/validate.h
@@ -12,30 +12,47 @@
 #if !defined(_INCLUDE_VALIDATE_H_)
 #define _INCLUDE_VALIDATE_H_
 
+#ifndef LISP_FEATURE_GENCGC
+/* FIXME: genesis/constants.h also defines this with a constant value */
+#define DYNAMIC_SPACE_START current_dynamic_space
+#endif
+
+#define BINDING_STACK_SIZE (1024*1024)   /* chosen at random */
+/* eventually choosable per-thread: */
+#define THREAD_CONTROL_STACK_SIZE (2*1024*1024)
+
 /* constants derived from the fundamental constants in passed by GENESIS */
-#define   BINDING_STACK_SIZE (1024*1024) /* chosen at random */
-#define   DYNAMIC_SPACE_SIZE (  DYNAMIC_SPACE_END -   DYNAMIC_SPACE_START)
+#ifdef LISP_FEATURE_GENCGC
+#define DEFAULT_DYNAMIC_SPACE_SIZE (DYNAMIC_SPACE_END - DYNAMIC_SPACE_START)
+#else
+#define DEFAULT_DYNAMIC_SPACE_SIZE (DYNAMIC_0_SPACE_END - DYNAMIC_0_SPACE_START)
+#endif
 #define READ_ONLY_SPACE_SIZE (READ_ONLY_SPACE_END - READ_ONLY_SPACE_START)
-#define    STATIC_SPACE_SIZE (   STATIC_SPACE_END -    STATIC_SPACE_START)
-#define THREAD_CONTROL_STACK_SIZE (2*1024*1024)        /* eventually this'll be choosable per-thread */
-
+#define STATIC_SPACE_SIZE (STATIC_SPACE_END - STATIC_SPACE_START)
 #ifdef LISP_FEATURE_LINKAGE_TABLE
-#define LINKAGE_TABLE_SPACE_SIZE (LINKAGE_TABLE_SPACE_END - LINKAGE_TABLE_SPACE_START)
+#define LINKAGE_TABLE_SPACE_SIZE \
+    (LINKAGE_TABLE_SPACE_END - LINKAGE_TABLE_SPACE_START)
 #endif
 
 #if !defined(LANGUAGE_ASSEMBLY)
 #include <thread.h>
-#ifdef LISP_FEATURE_STACK_GROWS_DOWNWARD_NOT_UPWARD 
-#define CONTROL_STACK_GUARD_PAGE(th) ((void *)(th->control_stack_start))
-#define CONTROL_STACK_RETURN_GUARD_PAGE(th) (CONTROL_STACK_GUARD_PAGE(th) + os_vm_page_size)
+#ifdef LISP_FEATURE_STACK_GROWS_DOWNWARD_NOT_UPWARD
+#define CONTROL_STACK_GUARD_PAGE(th) \
+    ((os_vm_address_t)(th->control_stack_start))
+#define CONTROL_STACK_RETURN_GUARD_PAGE(th) \
+    (CONTROL_STACK_GUARD_PAGE(th) + os_vm_page_size)
 #else
-#define CONTROL_STACK_GUARD_PAGE(th) (((void *)(th->control_stack_end)) - os_vm_page_size)
-#define CONTROL_STACK_RETURN_GUARD_PAGE(th) (CONTROL_STACK_GUARD_PAGE(th) - os_vm_page_size)
+#define CONTROL_STACK_GUARD_PAGE(th) \
+    (((os_vm_address_t)(th->control_stack_end)) - os_vm_page_size)
+#define CONTROL_STACK_RETURN_GUARD_PAGE(th) \
+    (CONTROL_STACK_GUARD_PAGE(th) - os_vm_page_size)
 #endif
 
 extern void validate(void);
-extern void protect_control_stack_guard_page(pid_t t_id, int protect_p);
-extern void protect_control_stack_return_guard_page(pid_t t_id, int protect_p);
+extern void protect_control_stack_guard_page(int protect_p);
+extern void protect_control_stack_return_guard_page(int protect_p);
+extern void protect_control_stack_guard_page_thread(int protect_p, struct thread *th);
+extern void protect_control_stack_return_guard_page_thread(int protect_p, struct thread* th);
 extern os_vm_address_t undefined_alien_address;
 #endif
 
@@ -50,7 +67,7 @@ extern os_vm_address_t undefined_alien_address;
  * and so forth. In SBCL, the memory map data are defined at the Lisp
  * level (compiler/target/parms.lisp) and stuffed into the sbcl.h file
  * created by GENESIS, so there's no longer a need for an
- * architecture-dependent header file of memory map data. 
+ * architecture-dependent header file of memory map data.
  */
 
 #endif