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

diff --git a/src/runtime/validate.c b/src/runtime/validate.c
index 20fad4a..54b3a6b 100644
--- a/src/runtime/validate.c
+++ b/src/runtime/validate.c
@@ -14,17 +14,20 @@
  */
 
 #include <stdio.h>
+#include <stdlib.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);
 	exit(1);
@@ -35,7 +38,8 @@ static void ensure_space(lispobj *start, unsigned long size)
 
 static os_vm_address_t holes[] = HOLES;
 
-static void make_holes(void)
+static void
+make_holes(void)
 {
     int i;
 
@@ -52,24 +56,44 @@ static void make_holes(void)
 }
 #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);
+#else
+    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);
 #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();
+    make_holes();
 #endif
-
+#ifndef GENCGC
+    current_dynamic_space = DYNAMIC_0_SPACE_START;
+#endif
+    
 #ifdef PRINTNOISE
-	printf(" done.\n");
+    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,
+	       os_vm_page_size,protect_p ?
+	       (OS_VM_PROT_READ|OS_VM_PROT_EXECUTE) : OS_VM_PROT_ALL);
 }
+