X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fvalidate.c;h=0efa39f2951e191f0b036178433107eb64df2882;hb=4b585c19dcd87dc3410094a2d2d7385d49200a44;hp=11b970f453755107b997815823a50ff51fa25e3c;hpb=0b5119848b6b8713e473fa669356645747e11dbd;p=sbcl.git

diff --git a/src/runtime/validate.c b/src/runtime/validate.c
index 11b970f..0efa39f 100644
--- 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,10 +63,10 @@ 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
@@ -95,3 +97,21 @@ protect_control_stack_return_guard_page(int protect_p) {
                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_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);
+}