X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fvalidate.c;h=d00c39166d79d44a717d419c9c0254cc17aa55ea;hb=0285aa5ff8416027932daa001b84429be2ca559b;hp=0061344f7dc8d5c88bbb8e12eaad93e6100a82ba;hpb=1de12891f900d156ed035a097561ecd7755a256a;p=sbcl.git diff --git a/src/runtime/validate.c b/src/runtime/validate.c index 0061344..d00c391 100644 --- a/src/runtime/validate.c +++ b/src/runtime/validate.c @@ -22,6 +22,8 @@ #include "globals.h" #include "interr.h" #include "validate.h" +#include "interr.h" /* for declaration of lose */ + static void ensure_space(lispobj *start, unsigned long size) @@ -68,7 +70,8 @@ validate(void) #endif #ifdef LISP_FEATURE_LINKAGE_TABLE - ensure_space( (lispobj *)LINKAGE_TABLE_SPACE_START, LINKAGE_TABLE_SPACE_SIZE); + ensure_space( (lispobj *)LINKAGE_TABLE_SPACE_START, + LINKAGE_TABLE_SPACE_SIZE); #endif #ifdef LISP_FEATURE_OS_PROVIDES_DLOPEN @@ -80,18 +83,46 @@ validate(void) #endif } -void -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); +static inline void +protect_page(void *page, int protect_p, os_vm_prot_t flags) { + os_protect(page, os_vm_page_size, protect_p ? + flags : OS_VM_PROT_ALL); } -void -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); -} +#define DEF_PROTECT_PAGE(name,page_name,flags) \ + void \ + protect_##name(int protect_p, struct thread *thread) { \ + if (!thread) \ + thread = arch_os_get_current_thread(); \ + protect_page(page_name(thread), protect_p, flags); \ + } + +DEF_PROTECT_PAGE(control_stack_hard_guard_page, + CONTROL_STACK_HARD_GUARD_PAGE, + OS_VM_PROT_NONE) +DEF_PROTECT_PAGE(control_stack_guard_page, + CONTROL_STACK_GUARD_PAGE, + OS_VM_PROT_READ|OS_VM_PROT_EXECUTE) +DEF_PROTECT_PAGE(control_stack_return_guard_page, + CONTROL_STACK_RETURN_GUARD_PAGE, + OS_VM_PROT_READ|OS_VM_PROT_EXECUTE) + +DEF_PROTECT_PAGE(binding_stack_hard_guard_page, + BINDING_STACK_HARD_GUARD_PAGE, + OS_VM_PROT_NONE) +DEF_PROTECT_PAGE(binding_stack_guard_page, + BINDING_STACK_GUARD_PAGE, + OS_VM_PROT_NONE) +DEF_PROTECT_PAGE(binding_stack_return_guard_page, + BINDING_STACK_RETURN_GUARD_PAGE, + OS_VM_PROT_NONE) + +DEF_PROTECT_PAGE(alien_stack_hard_guard_page, + ALIEN_STACK_HARD_GUARD_PAGE, + OS_VM_PROT_NONE) +DEF_PROTECT_PAGE(alien_stack_guard_page, + ALIEN_STACK_GUARD_PAGE, + OS_VM_PROT_NONE) +DEF_PROTECT_PAGE(alien_stack_return_guard_page, + ALIEN_STACK_RETURN_GUARD_PAGE, + OS_VM_PROT_NONE)