X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fruntime%2Fosf1-os.c;h=fc6a1f8a7d5e680d5a363a191a9654d258ac0659;hb=0285aa5ff8416027932daa001b84429be2ca559b;hp=5e229406383084866f00e07c5fc515f1d1d4eb61;hpb=2c6105acde389717317e725854d7dd3b3d6ece5c;p=sbcl.git

diff --git a/src/runtime/osf1-os.c b/src/runtime/osf1-os.c
index 5e22940..fc6a1f8 100644
--- a/src/runtime/osf1-os.c
+++ b/src/runtime/osf1-os.c
@@ -54,7 +54,7 @@ size_t os_vm_page_size;
 void
 os_init(char *argv[], char *envp[])
 {
-    os_vm_page_size = getpagesize();
+    os_vm_page_size = BACKEND_PAGE_BYTES;
 }
 
 
@@ -89,7 +89,7 @@ os_map(int fd, int offset, os_vm_address_t addr, os_vm_size_t len)
 
     if (addr == MAP_FAILED) {
         perror("mmap");
-        lose("unexpected mmap(..) failure");
+        lose("unexpected mmap(..) failure\n");
     }
 
     return addr;
@@ -122,10 +122,8 @@ is_valid_lisp_addr(os_vm_address_t addr)
 
 
 static void
-sigsegv_handler(int signal, siginfo_t *info, void* void_context)
+sigsegv_handler(int signal, siginfo_t *info, os_context_t *context)
 {
-    os_context_t *context = arch_os_get_context(&void_context);
-
     os_vm_address_t addr = arch_get_bad_addr(signal,info,context);
 
     if (addr != NULL &&
@@ -133,9 +131,9 @@ sigsegv_handler(int signal, siginfo_t *info, void* void_context)
         /* this is lifted from linux-os.c, so violates OOAO */
         *os_context_register_addr(context,reg_ALLOC) -= (1L<<63);
         interrupt_handle_pending(context);
-    } else if (!interrupt_maybe_gc(signal, info, context)) {
+    } else if (!cheneygc_handle_wp_violation(context, addr)) {
         if(!handle_guard_page_triggered(context,addr))
-            interrupt_handle_now(signal, info, context);
+            lisp_memory_fault_error(context, addr);
     }
 }
 
@@ -147,3 +145,8 @@ os_install_interrupt_handlers(void)
                                                  sigsegv_handler);
 }
 
+char *
+os_get_runtime_executable_path(int external)
+{
+    return NULL;
+}