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

diff --git a/src/runtime/validate.c b/src/runtime/validate.c
index be8ad27..f4c8bfe 100644
--- a/src/runtime/validate.c
+++ b/src/runtime/validate.c
@@ -16,10 +16,10 @@
 #include <stdio.h>
 #include <stdlib.h>
 
+#include "sbcl.h"
 #include "runtime.h"
 #include "os.h"
 #include "globals.h"
-#include "sbcl.h"
 #include "validate.h"
 
 static void
@@ -30,31 +30,24 @@ ensure_space(lispobj *start, unsigned long size)
 		"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);
     }
 }
 
-#ifdef HOLES
-
-static os_vm_address_t holes[] = HOLES;
+os_vm_address_t undefined_alien_address = 0;
 
 static void
-make_holes(void)
-{
-    int i;
-
-    for (i = 0; i < sizeof(holes)/sizeof(holes[0]); i++) {
-	if (os_validate(holes[i], HOLE_SIZE) == NULL) {
-	    fprintf(stderr,
-		    "make_holes: failed to validate %ld bytes at 0x%08X\n",
-		    HOLE_SIZE,
-		    (unsigned long)holes[i]);
-	    exit(1);
-	}
-	os_protect(holes[i], HOLE_SIZE, 0);
+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;
+    } else {
+	lose("could not allocate guard page for undefined alien");
     }
 }
-#endif
 
 void
 validate(void)
@@ -72,25 +65,32 @@ validate(void)
     ensure_space( (lispobj *)DYNAMIC_0_SPACE_START  , DYNAMIC_SPACE_SIZE);
     ensure_space( (lispobj *)DYNAMIC_1_SPACE_START  , DYNAMIC_SPACE_SIZE);
 #endif
-    ensure_space( (lispobj *)CONTROL_STACK_START  , CONTROL_STACK_SIZE);
-    ensure_space( (lispobj *)BINDING_STACK_START  , BINDING_STACK_SIZE);
-#ifdef LISP_FEATURE_C_STACK_IS_CONTROL_STACK
-    ensure_space( (lispobj *) ALTERNATE_SIGNAL_STACK_START, SIGSTKSZ);
+
+#ifdef LISP_FEATURE_LINKAGE_TABLE
+    ensure_space( (lispobj *)LINKAGE_TABLE_SPACE_START, LINKAGE_TABLE_SPACE_SIZE);
 #endif
 
-#ifdef HOLES
-    make_holes();
+#ifdef LISP_FEATURE_OS_PROVIDES_DLOPEN
+    ensure_undefined_alien();
 #endif
-    
+ 
 #ifdef PRINTNOISE
     printf(" done.\n");
 #endif
-    protect_control_stack_guard_page(1);
 }
 
-void protect_control_stack_guard_page(int protect_p) {
-    os_protect(CONTROL_STACK_GUARD_PAGE,
+void 
+protect_control_stack_guard_page(pid_t t_id, int protect_p) {
+    struct thread *th = find_thread_by_pid(t_id);
+    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(pid_t t_id, int protect_p) {
+    struct thread *th = find_thread_by_pid(t_id);
+    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);
+}