X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fvalidate.c;h=d88d17df03dc98828b0aa25b360b060b18005f54;hb=4ed3f0d08c3a57a6762018d9622f253ab9d0f2b6;hp=cf91204e080f1fcca05fcc113017eb01d0bf32b6;hpb=dfa55a883f94470267b626dae77ce7e7dfac3df6;p=sbcl.git diff --git a/src/runtime/validate.c b/src/runtime/validate.c index cf91204..d88d17d 100644 --- a/src/runtime/validate.c +++ b/src/runtime/validate.c @@ -14,13 +14,16 @@ */ #include +#include + #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, @@ -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,32 +56,36 @@ 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); + + 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(); + make_holes(); #endif -#ifndef GENCGC - current_dynamic_space = DYNAMIC_0_SPACE_START; -#endif - + #ifdef PRINTNOISE - printf(" done.\n"); + 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); + 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); +} +