X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fvalidate.c;h=d00c39166d79d44a717d419c9c0254cc17aa55ea;hb=0285aa5ff8416027932daa001b84429be2ca559b;hp=d9016258a4b3fb41a6ac65be0cef5f25d493b5eb;hpb=f815f89eb5b1a7d5e6fefaf5b19321d8870931f9;p=sbcl.git

diff --git a/src/runtime/validate.c b/src/runtime/validate.c
index d901625..d00c391 100644
--- a/src/runtime/validate.c
+++ b/src/runtime/validate.c
@@ -83,37 +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);
-}
-
-/* these OOAO violations are here because with mach exception handlers
- * we need to protect the stack guard pages from the mach exception
- * handlers which run on a different thread, so we take a thread
- * argument here. Too bad we don't have keywords args in C. */
-void
-protect_control_stack_guard_page_thread(int protect_p, struct thread *th) {
-    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);
-}
+#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);              \
+    }
 
-void
-protect_control_stack_return_guard_page_thread(int protect_p,
-                                               struct thread* th) {
-    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);
-}
+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)