X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fvalidate.c;h=be8ad272ae421744730c2af62622556de7053bfc;hb=d68f3f83e6c5b9bed9789279cbae346f240488cc;hp=5c24d47bf0ff8c07490f80530873d03acfa0b4d6;hpb=686043635c45a16b418d2cc96a7f704fdab182c2;p=sbcl.git diff --git a/src/runtime/validate.c b/src/runtime/validate.c index 5c24d47..be8ad27 100644 --- a/src/runtime/validate.c +++ b/src/runtime/validate.c @@ -60,29 +60,37 @@ 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 LISP_FEATURE_C_STACK_IS_CONTROL_STACK + ensure_space( (lispobj *) ALTERNATE_SIGNAL_STACK_START, SIGSTKSZ); #endif - ensure_space( (lispobj *)CONTROL_STACK_START , CONTROL_STACK_SIZE); - ensure_space( (lispobj *)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); +} +