0.7.6.1:

[sbcl.git] / src / runtime / linux-os.c

diff --git a/src/runtime/linux-os.c b/src/runtime/linux-os.c
index e5e17c0..0bee001 100644 (file)
--- a/src/runtime/linux-os.c
+++ b/src/runtime/linux-os.c
@@ -48,6 +48,10 @@ size_t os_vm_page_size;
 #include "gencgc.h"
 #endif
 \f
+
+#ifdef sparc
+int early_kernel = 0;
+#endif
 void os_init(void)
 {
     /* Early versions of Linux don't support the mmap(..) functionality
@@ -55,25 +59,38 @@ void os_init(void)
     {
         struct utsname name;
        int major_version;
+#ifdef sparc
+       int minor_version;
+#endif
        uname(&name);
        major_version = atoi(name.release);
        if (major_version < 2) {
            lose("linux major version=%d (can't run in version < 2.0.0)",
                 major_version);
        }
+#ifdef sparc
+       /* KLUDGE: This will break if Linux moves to a uname() version number
+        * that has more than one digit initially -- CSR, 2002-02-12 */
+       minor_version = atoi(name.release+2);
+       if (minor_version < 4) {
+           FSHOW((stderr,"linux minor version=%d;\n enabling workarounds for SPARC kernel bugs in signal handling.\n", minor_version));
+           early_kernel = 1;
+       }
+#endif
     }
 
     os_vm_page_size = getpagesize();
-   /* This could just as well be in arch_init(), but it's not. */
+    /* This could just as well be in arch_init(), but it's not. */
 #ifdef __i386__
-    SET_FPU_CONTROL_WORD(0x1372|4|8|16|32); /* no interrupts */
+    /* FIXME: This used to be here.  However, I have just removed it
+       with no apparent ill effects (it may be that earlier kernels
+       started up a process with a different set of traps, or
+       something?) Find out what this was meant to do, and reenable it
+       or delete it if possible. -- CSR, 2002-07-15 */
+    /* SET_FPU_CONTROL_WORD(0x1372|4|8|16|32);  no interrupts */
 #endif
 }
 
-/* various os_context_*_addr accessors moved to {x86,alpha}-linux-os.c 
- * -dan 20010125
- */
-
 /* In Debian CMU CL ca. 2.4.9, it was possible to get an infinite
  * cascade of errors from do_mmap(..). This variable is a counter to
  * prevent that; when it counts down to zero, an error in do_mmap
@@ -182,7 +199,7 @@ os_map(int fd, int offset, os_vm_address_t addr, os_vm_size_t len)
                MAP_PRIVATE | MAP_FILE | MAP_FIXED,
                fd, (off_t) offset);
 
-    if(addr == MAP_FAILED) {
+    if (addr == MAP_FAILED) {
        perror("mmap");
        lose("unexpected mmap(..) failure");
     }
@@ -225,6 +242,7 @@ is_valid_lisp_addr(os_vm_address_t addr)
  * any OS-dependent special low-level handling for signals
  */
 
+
 #if defined GENCGC
 
 /*
@@ -234,11 +252,11 @@ is_valid_lisp_addr(os_vm_address_t addr)
 void
 sigsegv_handler(int signal, siginfo_t *info, void* void_context)
 {
-    os_context_t *context = (os_context_t*)void_context;
+    os_context_t *context = arch_os_get_context(&void_context);
     void* fault_addr = (void*)context->uc_mcontext.cr2;
-    if (!gencgc_handle_wp_violation(fault_addr)) {
-       interrupt_handle_now(signal, info, void_context);
-    }
+    if (!gencgc_handle_wp_violation(fault_addr)) 
+       if(!handle_control_stack_guard_triggered(context,fault_addr))
+           interrupt_handle_now(signal, info, void_context);
 }
 
 #else
@@ -246,52 +264,37 @@ sigsegv_handler(int signal, siginfo_t *info, void* void_context)
 static void
 sigsegv_handler(int signal, siginfo_t *info, void* void_context)
 {
-    os_context_t *context = (os_context_t*)void_context;
+    os_context_t *context = arch_os_get_context(&void_context);
     os_vm_address_t addr;
 
-#ifdef __i386__
-    interrupt_handle_now(signal,contextstruct);
-#else
-    char *control_stack_top = (char*)CONTROL_STACK_START + CONTROL_STACK_SIZE;
-    
     addr = arch_get_bad_addr(signal,info,context);
-
-    if(addr != NULL && 
-       *os_context_register_addr(context,reg_ALLOC) & (1L<<63)){
-       /* This is the end of a pseudo-atomic section during which
-        * a signal was received.  We must deal with the pending interrupt
-        * (see also interrupt.c, ../code/interrupt.lisp)
+    if (addr != NULL && 
+       *os_context_register_addr(context,reg_ALLOC) & (1L<<63)){
+       
+       /* Alpha stuff: This is the end of a pseudo-atomic section
+        * during which a signal was received.  We must deal with the
+        * pending interrupt (see also interrupt.c,
+        * ../code/interrupt.lisp)
         */
-
        /* (how we got here: when interrupting, we set bit 63 in
         * reg_Alloc.  At the end of the atomic section we tried to
-        * write to reg_Alloc, got a SIGSEGV (there's nothing mapped
+        * write to reg_ALLOC, got a SIGSEGV (there's nothing mapped
         * there) so ended up here
         */
        *os_context_register_addr(context,reg_ALLOC) -= (1L<<63);
        interrupt_handle_pending(context);
-    } else if (addr > control_stack_top && addr < BINDING_STACK_START) {
-       fprintf(stderr,
-               "Possible stack overflow at 0x%016lX:\n"
-               "control_stack_top=%lx, BINDING_STACK_START=%lx\n",
-               addr,
-               control_stack_top,
-               BINDING_STACK_START);
-       /* Try to fix control frame pointer. */
-       while ( ! (CONTROL_STACK_START <= *current_control_frame_pointer &&
-                  *current_control_frame_pointer <= control_stack_top))
-           ((char*)current_control_frame_pointer) -= sizeof(lispobj);
-       ldb_monitor();
-    } else if (!interrupt_maybe_gc(signal, info, context)) {
-       interrupt_handle_now(signal, info, context);
+    } else {
+       if(!interrupt_maybe_gc(signal, info, context))
+           if(!handle_control_stack_guard_triggered(context,addr))
+               interrupt_handle_now(signal, info, context);
     }
-#endif
 }
 #endif
 
 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);
 }