1.0.25.13: 80 chars, trailing space

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

diff --git a/src/runtime/validate.c b/src/runtime/validate.c
index e11b0bf..d901625 100644 (file)
--- a/src/runtime/validate.c
+++ b/src/runtime/validate.c
@@ -22,6 +22,8 @@
 #include "globals.h"
 #include "interr.h"
 #include "validate.h"
+#include "interr.h"                     /* for declaration of lose */
+
 
 static void
 ensure_space(lispobj *start, unsigned long size)
@@ -46,7 +48,7 @@ ensure_undefined_alien(void) {
         os_protect(start, os_vm_page_size, OS_VM_PROT_NONE);
         undefined_alien_address = start;
     } else {
-        lose("could not allocate guard page for undefined alien");
+        lose("could not allocate guard page for undefined alien\n");
     }
 }
 
@@ -61,14 +63,15 @@ validate(void)
     ensure_space( (lispobj *)READ_ONLY_SPACE_START, READ_ONLY_SPACE_SIZE);
     ensure_space( (lispobj *)STATIC_SPACE_START   , STATIC_SPACE_SIZE);
 #ifdef LISP_FEATURE_GENCGC
-    ensure_space( (lispobj *)DYNAMIC_SPACE_START  , DYNAMIC_SPACE_SIZE);
+    ensure_space( (lispobj *)DYNAMIC_SPACE_START  , dynamic_space_size);
 #else
-    ensure_space( (lispobj *)DYNAMIC_0_SPACE_START  , DYNAMIC_SPACE_SIZE);
-    ensure_space( (lispobj *)DYNAMIC_1_SPACE_START  , DYNAMIC_SPACE_SIZE);
+    ensure_space( (lispobj *)DYNAMIC_0_SPACE_START, dynamic_space_size);
+    ensure_space( (lispobj *)DYNAMIC_1_SPACE_START, dynamic_space_size);
 #endif
 
 #ifdef LISP_FEATURE_LINKAGE_TABLE
-    ensure_space( (lispobj *)LINKAGE_TABLE_SPACE_START, LINKAGE_TABLE_SPACE_SIZE);
+    ensure_space( (lispobj *)LINKAGE_TABLE_SPACE_START,
+                  LINKAGE_TABLE_SPACE_SIZE);
 #endif
 
 #ifdef LISP_FEATURE_OS_PROVIDES_DLOPEN
@@ -81,14 +84,35 @@ validate(void)
 }
 
 void
-protect_control_stack_guard_page(struct thread *th, int protect_p) {
+protect_control_stack_guard_page(int protect_p) {
+    struct thread *th = arch_os_get_current_thread();
+    os_protect(CONTROL_STACK_GUARD_PAGE(th),
+               os_vm_page_size,protect_p ?
+               (OS_VM_PROT_READ|OS_VM_PROT_EXECUTE) : OS_VM_PROT_ALL);
+}
+
+void
+protect_control_stack_return_guard_page(int protect_p) {
+    struct thread *th = arch_os_get_current_thread();
+    os_protect(CONTROL_STACK_RETURN_GUARD_PAGE(th),
+               os_vm_page_size,protect_p ?
+               (OS_VM_PROT_READ|OS_VM_PROT_EXECUTE) : OS_VM_PROT_ALL);
+}
+
+/* these OOAO violations are here because with mach exception handlers
+ * we need to protect the stack guard pages from the mach exception
+ * handlers which run on a different thread, so we take a thread
+ * argument here. Too bad we don't have keywords args in C. */
+void
+protect_control_stack_guard_page_thread(int protect_p, struct thread *th) {
     os_protect(CONTROL_STACK_GUARD_PAGE(th),
                os_vm_page_size,protect_p ?
                (OS_VM_PROT_READ|OS_VM_PROT_EXECUTE) : OS_VM_PROT_ALL);
 }
 
 void
-protect_control_stack_return_guard_page(struct thread *th, int protect_p) {
+protect_control_stack_return_guard_page_thread(int protect_p,
+                                               struct thread* th) {
     os_protect(CONTROL_STACK_RETURN_GUARD_PAGE(th),
                os_vm_page_size,protect_p ?
                (OS_VM_PROT_READ|OS_VM_PROT_EXECUTE) : OS_VM_PROT_ALL);