X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fvalidate.h;h=1037f2fa758191255535bdbd8afa655548cd8862;hb=a6831e56ae6c27cab9b5efe157d087e261447d72;hp=2a963a05ea1f95e7dc8d9ce0889b1a9b5d3cf714;hpb=9f10bc102adce15a820027777a03e49a7b7623da;p=sbcl.git

diff --git a/src/runtime/validate.h b/src/runtime/validate.h
index 2a963a0..1037f2f 100644
--- a/src/runtime/validate.h
+++ b/src/runtime/validate.h
@@ -12,22 +12,40 @@
 #if !defined(_INCLUDE_VALIDATE_H_)
 #define _INCLUDE_VALIDATE_H_
 
+#ifndef LISP_FEATURE_GENCGC
+#define DYNAMIC_SPACE_START current_dynamic_space
+#endif
+
+#define        BINDING_STACK_SIZE (1024*1024)   /* chosen at random */
+#define THREAD_CONTROL_STACK_SIZE (2*1024*1024) /* eventually choosable per-thread */
+
 /* constants derived from the fundamental constants in passed by GENESIS */
-#define   BINDING_STACK_SIZE (  BINDING_STACK_END -   BINDING_STACK_START)
-#define   CONTROL_STACK_SIZE (  CONTROL_STACK_END -   CONTROL_STACK_START)
-#define   DYNAMIC_SPACE_SIZE (  DYNAMIC_SPACE_END -   DYNAMIC_SPACE_START)
-#define READ_ONLY_SPACE_SIZE (READ_ONLY_SPACE_END - READ_ONLY_SPACE_START)
-#define    STATIC_SPACE_SIZE (   STATIC_SPACE_END -    STATIC_SPACE_START)
+#ifdef LISP_FEATURE_GENCGC
+#define       DYNAMIC_SPACE_SIZE       (DYNAMIC_SPACE_END -       DYNAMIC_SPACE_START)
+#else
+#define       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)
+#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 (CONTROL_STACK_START)
+#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)
 #else
-#define CONTROL_STACK_GUARD_PAGE (CONTROL_STACK_END - os_vm_page_size)
+#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)
 #endif
 
-#if !defined(LANGUAGE_ASSEMBLY)
 extern void validate(void);
-extern void protect_control_stack_guard_page(int protect_p);
+extern void protect_control_stack_guard_page(os_thread_t t_id, int protect_p);
+extern void protect_control_stack_return_guard_page(os_thread_t t_id,
+                                                    int protect_p);
+extern os_vm_address_t undefined_alien_address;
 #endif
 
 /* note for anyone trying to port an architecture's support files
@@ -35,7 +53,7 @@ extern void protect_control_stack_guard_page(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