X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fruntime%2Fvalidate.h;h=b0f9122f94eea00dd9dffec5ba684b0d7b6c6c81;hb=d1873cc3f7a09f9891bb9c05f206af1774876c0c;hp=71278f99bfc56b8a80a317a6fc144e8a0f023821;hpb=e365f2f7a9c66d307b48fee70778f4eaa84bdcc0;p=sbcl.git

diff --git a/src/runtime/validate.h b/src/runtime/validate.h
index 71278f9..b0f9122 100644
--- a/src/runtime/validate.h
+++ b/src/runtime/validate.h
@@ -12,23 +12,50 @@
 #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 DEFAULT_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)	/* wired elsewhere-watch out */
+#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)
+#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))
+#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_start))+THREAD_CONTROL_STACK_SIZE - 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_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
 
 /* note for anyone trying to port an architecture's support files
@@ -36,13 +63,13 @@ extern void protect_control_stack_guard_page(pid_t t_id, int protect_p);
  *
  * CMU CL had architecture-dependent header files included here to
  * define memory map data:
- *   #ifdef __i386__
+ *   #ifdef LISP_FEATURE_X86
  *   #include "x86-validate.h"
  *   #endif
  * 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