X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fvalidate.c;h=0efa39f2951e191f0b036178433107eb64df2882;hb=646a14a9099c3c6bbb60ff09f7fb6a781a030815;hp=8b62b471d27258e1e20bcb4baef706d3324e1a85;hpb=94ea2b2082deaa0331dfb66fa6af6ca12dd8dc83;p=sbcl.git

diff --git a/src/runtime/validate.c b/src/runtime/validate.c
index 8b62b47..0efa39f 100644
--- a/src/runtime/validate.c
+++ b/src/runtime/validate.c
@@ -20,19 +20,22 @@
 #include "runtime.h"
 #include "os.h"
 #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)
 {
     if (os_validate((os_vm_address_t)start,(os_vm_size_t)size)==NULL) {
-	fprintf(stderr,
-		"ensure_space: failed to validate %ld bytes at 0x%08lx\n",
-		size,
-		(unsigned long)start);
-	fprintf(stderr,
-		"(hint: Try \"ulimit -a\"; maybe you should increase memory limits.)\n");
-	exit(1);
+        fprintf(stderr,
+                "ensure_space: failed to validate %ld bytes at 0x%08lx\n",
+                size,
+                (unsigned long)start);
+        fprintf(stderr,
+                "(hint: Try \"ulimit -a\"; maybe you should increase memory limits.)\n");
+        exit(1);
     }
 }
 
@@ -42,10 +45,10 @@ static void
 ensure_undefined_alien(void) {
     os_vm_address_t start = os_validate(NULL, os_vm_page_size);
     if (start) {
-	os_protect(start, os_vm_page_size, OS_VM_PROT_NONE);
-	undefined_alien_address = start;
+        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");
     }
 }
 
@@ -56,14 +59,14 @@ validate(void)
     printf("validating memory ...");
     fflush(stdout);
 #endif
-    
+
     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
@@ -73,22 +76,42 @@ validate(void)
 #ifdef LISP_FEATURE_OS_PROVIDES_DLOPEN
     ensure_undefined_alien();
 #endif
- 
+
 #ifdef PRINTNOISE
     printf(" done.\n");
 #endif
 }
 
-void 
-protect_control_stack_guard_page(struct thread *th, int protect_p) {
+void
+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);
+               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) {
+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_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);
+               os_vm_page_size,protect_p ?
+               (OS_VM_PROT_READ|OS_VM_PROT_EXECUTE) : OS_VM_PROT_ALL);
 }