0.9.1.59:

[sbcl.git] / src / runtime / validate.c

diff --git a/src/runtime/validate.c b/src/runtime/validate.c
index 36c1729..536e262 100644 (file)
--- 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,23 +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
-#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
 }
 
-void protect_control_stack_guard_page(pid_t t_id, int protect_p) {
-    struct thread *th = find_thread_by_pid(t_id);
+void 
+protect_control_stack_guard_page(os_thread_t t_id, int protect_p) {
+    struct thread *th = find_thread_by_os_thread(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(os_thread_t t_id, int protect_p) {
+    struct thread *th = find_thread_by_os_thread(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);
+}