X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fruntime%2Fvalidate.c;h=f9b6ab164d59bc29506ca736521c5bb5a8e47bf2;hb=cf4cb9554515c59eddbde38d1cf236339c37f55f;hp=20fad4acb0d9b451c79096148810af05f6553980;hpb=cea4896b2482b7b2b429c1631d774b4cfbc0efba;p=sbcl.git

diff --git a/src/runtime/validate.c b/src/runtime/validate.c
index 20fad4a..f9b6ab1 100644
--- a/src/runtime/validate.c
+++ b/src/runtime/validate.c
@@ -14,62 +14,54 @@
  */
 
 #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 ensure_space(lispobj *start, unsigned long size)
+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%08X\n",
+		"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;
-
-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);
-    }
-}
-#endif
-
-void validate(void)
+void
+validate(void)
 {
 #ifdef PRINTNOISE
-	printf("validating memory ...");
-	fflush(stdout);
+    printf("validating memory ...");
+    fflush(stdout);
 #endif
-
-	ensure_space(READ_ONLY_SPACE_START, READ_ONLY_SPACE_SIZE);
-	ensure_space(STATIC_SPACE_START   , STATIC_SPACE_SIZE);
-	ensure_space(DYNAMIC_SPACE_START  , DYNAMIC_SPACE_SIZE);
-	ensure_space(CONTROL_STACK_START  , CONTROL_STACK_SIZE);
-	ensure_space(BINDING_STACK_START  , BINDING_STACK_SIZE);
-
-#ifdef HOLES
-	make_holes();
+    
+    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);
+#else
+    ensure_space( (lispobj *)DYNAMIC_0_SPACE_START  , DYNAMIC_SPACE_SIZE);
+    ensure_space( (lispobj *)DYNAMIC_1_SPACE_START  , DYNAMIC_SPACE_SIZE);
 #endif
 
 #ifdef PRINTNOISE
-	printf(" done.\n");
+    printf(" done.\n");
 #endif
 }
+
+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);
+}
+