X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fvalidate.c;h=0061344f7dc8d5c88bbb8e12eaad93e6100a82ba;hb=1de12891f900d156ed035a097561ecd7755a256a;hp=e11b0bf0ddb21d33c2eead11192e6e7b79c91fff;hpb=be7adb92bf0012ab07adac2943e73772dfad7911;p=sbcl.git diff --git a/src/runtime/validate.c b/src/runtime/validate.c index e11b0bf..0061344 100644 --- a/src/runtime/validate.c +++ b/src/runtime/validate.c @@ -46,7 +46,7 @@ ensure_undefined_alien(void) { 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"); + lose("could not allocate guard page for undefined alien\n"); } } @@ -61,10 +61,10 @@ validate(void) 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); + 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 #ifdef LISP_FEATURE_LINKAGE_TABLE @@ -81,14 +81,16 @@ validate(void) } void -protect_control_stack_guard_page(struct thread *th, int protect_p) { +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(struct thread *th, int protect_p) { +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);