#endif
#define BINDING_STACK_SIZE (1024*1024) /* chosen at random */
+#define ALIEN_STACK_SIZE (1024*1024) /* chosen at random */
+
/* eventually choosable per-thread: */
-#define THREAD_CONTROL_STACK_SIZE (2*1024*1024)
+#define DEFAULT_CONTROL_STACK_SIZE (2*1024*1024)
/* constants derived from the fundamental constants in passed by GENESIS */
#ifdef LISP_FEATURE_GENCGC
#if !defined(LANGUAGE_ASSEMBLY)
#include <thread.h>
+
#ifdef LISP_FEATURE_STACK_GROWS_DOWNWARD_NOT_UPWARD
-#define CONTROL_STACK_GUARD_PAGE(th) \
+
+#define CONTROL_STACK_HARD_GUARD_PAGE(th) \
((os_vm_address_t)(th->control_stack_start))
+#define CONTROL_STACK_GUARD_PAGE(th) \
+ (CONTROL_STACK_HARD_GUARD_PAGE(th) + os_vm_page_size)
#define CONTROL_STACK_RETURN_GUARD_PAGE(th) \
(CONTROL_STACK_GUARD_PAGE(th) + os_vm_page_size)
#else
-#define CONTROL_STACK_GUARD_PAGE(th) \
+
+#define CONTROL_STACK_HARD_GUARD_PAGE(th) \
(((os_vm_address_t)(th->control_stack_end)) - os_vm_page_size)
+#define CONTROL_STACK_GUARD_PAGE(th) \
+ (CONTROL_STACK_HARD_GUARD_PAGE(th) - os_vm_page_size)
#define CONTROL_STACK_RETURN_GUARD_PAGE(th) \
(CONTROL_STACK_GUARD_PAGE(th) - os_vm_page_size)
+
#endif
+#ifdef ALIEN_STACK_GROWS_DOWNWARD
+
+#define ALIEN_STACK_HARD_GUARD_PAGE(th) \
+ ((os_vm_address_t)(th->alien_stack_start))
+#define ALIEN_STACK_GUARD_PAGE(th) \
+ (ALIEN_STACK_HARD_GUARD_PAGE(th) + os_vm_page_size)
+#define ALIEN_STACK_RETURN_GUARD_PAGE(th) \
+ (ALIEN_STACK_GUARD_PAGE(th) + os_vm_page_size)
+
+#elif ALIEN_STACK_GROWS_UPWARD
+
+#define ALIEN_STACK_HARD_GUARD_PAGE(th) \
+ (((os_vm_address_t)th->alien_stack_start) + ALIEN_STACK_SIZE - \
+ os_vm_page_size)
+#define ALIEN_STACK_GUARD_PAGE(th) \
+ (ALIEN_STACK_HARD_GUARD_PAGE(th) - os_vm_page_size)
+#define ALIEN_STACK_RETURN_GUARD_PAGE(th) \
+ (ALIEN_STACK_GUARD_PAGE(th) - os_vm_page_size)
+
+#else
+#error ALIEN_STACK_GROWS_DOWNWARD or ALIEN_STACK_GROWS_UPWARD has to be defined
+#endif
+
+#define BINDING_STACK_HARD_GUARD_PAGE(th) \
+ (((os_vm_address_t)th->binding_stack_start) + BINDING_STACK_SIZE - \
+ os_vm_page_size)
+#define BINDING_STACK_GUARD_PAGE(th) \
+ (BINDING_STACK_HARD_GUARD_PAGE(th) - os_vm_page_size)
+#define BINDING_STACK_RETURN_GUARD_PAGE(th) \
+ (BINDING_STACK_GUARD_PAGE(th) - os_vm_page_size)
+
extern void validate(void);
-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 void
+protect_control_stack_hard_guard_page(int protect_p, struct thread *thread);
+extern void
+protect_control_stack_guard_page(int protect_p, struct thread *thread);
+extern void
+protect_control_stack_return_guard_page(int protect_p, struct thread *thread);
+extern void
+protect_binding_stack_hard_guard_page(int protect_p, struct thread *thread);
+extern void
+protect_binding_stack_guard_page(int protect_p, struct thread *thread);
+extern void
+protect_binding_stack_return_guard_page(int protect_p, struct thread *thread);
+extern void
+protect_alien_stack_hard_guard_page(int protect_p, struct thread *thread);
+extern void
+protect_alien_stack_guard_page(int protect_p, struct thread *thread);
+extern void
+protect_alien_stack_return_guard_page(int protect_p, struct thread *thread);
extern os_vm_address_t undefined_alien_address;
#endif