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

diff --git a/src/runtime/validate.c b/src/runtime/validate.c
index d008f8d..11b970f 100644
--- a/src/runtime/validate.c
+++ b/src/runtime/validate.c
@@ -13,76 +13,85 @@
  * files for more information.
  */
 
-/*
- * $Header$
- */
-
 #include <stdio.h>
+#include <stdlib.h>
+
+#include "sbcl.h"
 #include "runtime.h"
 #include "os.h"
 #include "globals.h"
-#include "sbcl.h"
+#include "interr.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",
-		size,
-		(unsigned long)start);
-	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);
     }
 }
 
-#ifdef HOLES
-
-static os_vm_address_t holes[] = HOLES;
-
-static void make_holes(void)
-{
-    int i;
+os_vm_address_t undefined_alien_address = 0;
 
-    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);
+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;
+    } else {
+        lose("could not allocate guard page for undefined alien");
     }
 }
-#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);
-
-	control_stack = (lispobj *) CONTROL_STACK_START;
-#ifdef __i386__
-	control_stack_end = (lispobj *) (CONTROL_STACK_START
-					 + CONTROL_STACK_SIZE);
+    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
-	ensure_space(control_stack, CONTROL_STACK_SIZE);
 
-	ensure_space(BINDING_STACK_START, BINDING_STACK_SIZE);
+#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");
+    printf(" done.\n");
 #endif
 }
+
+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);
+}
+
+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);
+}