X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fvalidate.c;h=e3ad9b1f827c90e1982606bf7db97dd5addb314c;hb=78bc9e41ff8b294a28f2b6dda222fc4c8ac00aaf;hp=5f31b203a65a9ba8c5dc81ec142418d6fcd75708;hpb=5f338d314224411587a7cac218ea320bc982f19f;p=sbcl.git

diff --git a/src/runtime/validate.c b/src/runtime/validate.c
index 5f31b20..e3ad9b1 100644
--- a/src/runtime/validate.c
+++ b/src/runtime/validate.c
@@ -13,10 +13,6 @@
  * files for more information.
  */
 
-/*
- * $Header$
- */
-
 #include <stdio.h>
 #include "runtime.h"
 #include "os.h"
@@ -24,11 +20,12 @@
 #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);
@@ -39,7 +36,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;
 
@@ -56,22 +54,31 @@ static void make_holes(void)
 }
 #endif
 
-void validate(void)
+void
+validate(void)
 {
 #ifdef PRINTNOISE
 	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);
+	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 HOLES
 	make_holes();
 #endif
+#ifndef GENCGC
+        current_dynamic_space = DYNAMIC_0_SPACE_START;
+#endif
 
 #ifdef PRINTNOISE
 	printf(" done.\n");