1.0.25.13: 80 chars, trailing space

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

diff --git a/src/runtime/validate.c b/src/runtime/validate.c
index cf91204..d901625 100644 (file)
--- a/src/runtime/validate.c
+++ b/src/runtime/validate.c
@@ -14,70 +14,106 @@
  */
 
 #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"
+#include "interr.h"                     /* for declaration of lose */
+
 
-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%08lx\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
+os_vm_address_t undefined_alien_address = 0;
 
-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);
+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\n");
     }
 }
-#endif
 
-void validate(void)
+void
+validate(void)
 {
 #ifdef PRINTNOISE
-       printf("validating memory ...");
-       fflush(stdout);
+    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 GENCGC
-       ensure_space( (lispobj *)DYNAMIC_SPACE_START  , DYNAMIC_SPACE_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);
+    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 HOLES
-       make_holes();
+#ifdef LISP_FEATURE_LINKAGE_TABLE
+    ensure_space( (lispobj *)LINKAGE_TABLE_SPACE_START,
+                  LINKAGE_TABLE_SPACE_SIZE);
 #endif
-#ifndef GENCGC
-       current_dynamic_space = DYNAMIC_0_SPACE_START;
+
+#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);
+}
+
+/* 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);
+}