0.9.9.36:

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

diff --git a/src/runtime/bsd-os.c b/src/runtime/bsd-os.c
index 9b25e7b..9b496c3 100644 (file)
--- a/src/runtime/bsd-os.c
+++ b/src/runtime/bsd-os.c
@@ -188,25 +188,25 @@ is_valid_lisp_addr(os_vm_address_t addr)
 static void
 memory_fault_handler(int signal, siginfo_t *siginfo, void *void_context)
 {
-    /* The way that we extract low level information like the fault
-     * address is not specified by POSIX. */
-#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
-    void *fault_addr = siginfo->si_addr;
-#elif defined LISP_FEATURE_DARWIN
-    void *fault_addr = siginfo->si_addr;
-#else
-#error unsupported BSD variant
-#endif
-
     os_context_t *context = arch_os_get_context(&void_context);
+    void *fault_addr = arch_get_bad_addr(signal, siginfo, context);
+
     if (!gencgc_handle_wp_violation(fault_addr))
-        if(!handle_guard_page_triggered(context,fault_addr))
+        if(!handle_guard_page_triggered(context,fault_addr)) {
 #ifdef LISP_FEATURE_C_STACK_IS_CONTROL_STACK
             arrange_return_to_lisp_function(context, SymbolFunction(MEMORY_FAULT_ERROR));
 #else
-            interrupt_handle_now(signal, siginfo, context);
+            if (!interrupt_maybe_gc_int(signal, siginfo, context)) {
+                interrupt_handle_now(signal, siginfo, context);
+            }
+#if defined(LISP_FEATURE_DARWIN)
+            /* Work around G5 bug; fix courtesy gbyers */
+            DARWIN_FIX_CONTEXT(context);
+#endif
 #endif
+        }
 }
+
 void
 os_install_interrupt_handlers(void)
 {
@@ -336,7 +336,41 @@ int arch_os_thread_cleanup(struct thread *thread) {
 }
 #endif
 
-#ifndef LISP_FEATURE_DARWIN   /* defined in ppc-darwin-os.c instead */
+#ifdef LISP_FEATURE_DARWIN
+/* defined in ppc-darwin-os.c instead */
+#elif defined(LISP_FEATURE_FREEBSD)
+char *
+os_get_runtime_executable_path()
+{
+    char path[PATH_MAX + 1];
+    /* Defined on FreeBSD 6 and later. -- JES, 2006-02-06. */
+#ifdef KERN_PROC_PATHNAME
+    size_t len = PATH_MAX + 1;
+    int mib[4];
+
+    mib[0] = CTL_KERN;
+    mib[1] = KERN_PROC;
+    mib[2] = KERN_PROC_PATHNAME;
+    mib[3] = -1;
+    if (sysctl(mib, 4, &path, &len, NULL, 0) != 0)
+        /* FIXME: Should we rather fall back into the /proc/-based
+         * code below, so that an SBCL executable core made on
+         * FreeBSD 6 would have at least some chance of working on
+         * FreeBSD 4? -- JES, 2006-02-06.
+         */
+        return NULL;
+#else
+    int size;
+    size = readlink("/proc/curproc/file", path, sizeof(path) - 1);
+    if (size < 0)
+        return NULL;
+    path[size] = '\0';
+    if (strcmp(path, "unknown") == 0)
+        return NULL;
+#endif
+    return copied_string(path);
+}
+#else /* Not DARWIN or FREEBSD */
 char *
 os_get_runtime_executable_path()
 {