X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fvalidate.c;h=f7acb74d2619c753685c626af192aee01eb3660a;hb=f0cb0cf9c0fe1b6fce5d10dbd34a0b7b249c4ae8;hp=967775ae8f126c059838bf5eeaee6de4fb4db960;hpb=e5d96999ae4388181ddb0c113313f26afbe997e8;p=sbcl.git

diff --git a/src/runtime/validate.c b/src/runtime/validate.c
index 967775a..f7acb74 100644
--- a/src/runtime/validate.c
+++ b/src/runtime/validate.c
@@ -26,13 +26,13 @@
 
 
 static void
-ensure_space(lispobj *start, unsigned long size)
+ensure_space(lispobj *start, uword_t size)
 {
     if (os_validate((os_vm_address_t)start,(os_vm_size_t)size)==NULL) {
         fprintf(stderr,
-                "ensure_space: failed to validate %ld bytes at 0x%08lx\n",
+                "ensure_space: failed to validate %lu bytes at 0x%08lx\n",
                 size,
-                (unsigned long)start);
+                (uword_t)start);
         fprintf(stderr,
                 "(hint: Try \"ulimit -a\"; maybe you should increase memory limits.)\n");
         exit(1);
@@ -89,26 +89,37 @@ protect_page(void *page, int protect_p, os_vm_prot_t flags) {
                flags : 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);                   \
+#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)