X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fosf1-os.c;h=5dd0d46938d3c6025bce17a2eaa24860e7d108cc;hb=df679ed627975948b1cee190f4d79c397588c43e;hp=ba62135f29c933d4367e1291fbe549d69e7a2da3;hpb=503a50f07740b52908f630b0492cf56556f1a792;p=sbcl.git

diff --git a/src/runtime/osf1-os.c b/src/runtime/osf1-os.c
index ba62135..5dd0d46 100644
--- a/src/runtime/osf1-os.c
+++ b/src/runtime/osf1-os.c
@@ -49,9 +49,6 @@
 #include "validate.h"
 size_t os_vm_page_size;
 
-#if defined GENCGC
-#include "gencgc.h"
-#endif
 
 
 void os_init(void)
@@ -135,14 +132,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(((addr>=DYNAMIC_0_SPACE_END) && (addr<DYNAMIC_1_SPACE_START)) ||
-	      ((addr>=DYNAMIC_1_SPACE_END) && (addr<CONTROL_STACK_START))){
-	/* there's empty gap between these spaces.  This clause needs
-	   review if the spaces are ever juggled to make this untrue */
-	fprintf(stderr, "bad address 0x%p\n",addr);
-	lose("ran off end of dynamic space");
     } else if (!interrupt_maybe_gc(signal, info, context)) {
-	interrupt_handle_now(signal, info, context);
+	if(!handle_control_stack_guard_triggered(context,addr))
+	    interrupt_handle_now(signal, info, context);
     }
 }
 
@@ -150,6 +142,7 @@ sigsegv_handler(int signal, siginfo_t *info, void* void_context)
 void
 os_install_interrupt_handlers(void)
 {
-    undoably_install_low_level_interrupt_handler(SIGSEGV, sigsegv_handler);
+    undoably_install_low_level_interrupt_handler(SIG_MEMORY_FAULT,
+						 sigsegv_handler);
 }