X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fbsd-os.c;h=10c2fd439c283fbc9907f39205c481870a9406ec;hb=402958f92506b9d3de852601b8c1ccb99b5ee558;hp=0bd5fc9259b4a179ec5e201742bf93df3f2f7b5b;hpb=a499f2c9099d1dc2cb4227a2505eb4cc6f310e24;p=sbcl.git diff --git a/src/runtime/bsd-os.c b/src/runtime/bsd-os.c index 0bd5fc9..10c2fd4 100644 --- a/src/runtime/bsd-os.c +++ b/src/runtime/bsd-os.c @@ -23,6 +23,7 @@ #include #include #include +#include #include "sbcl.h" #include "./signal.h" #include "os.h" @@ -53,6 +54,7 @@ static void netbsd_init(); #ifdef __FreeBSD__ #include +#include static void freebsd_init(); #endif /* __FreeBSD__ */ @@ -78,6 +80,8 @@ int *os_context_pc_addr(os_context_t *context) return CONTEXT_ADDR_FROM_STEM(pc); #elif defined __NetBSD__ return CONTEXT_ADDR_FROM_STEM(EIP); +#elif defined(LISP_FEATURE_DARWIN) && defined(LISP_FEATURE_X86) + return CONTEXT_ADDR_FROM_STEM(eip); #elif defined LISP_FEATURE_DARWIN return &context->uc_mcontext->ss.srr0; #else @@ -91,9 +95,9 @@ os_context_sigmask_addr(os_context_t *context) /* (Unlike most of the other context fields that we access, the * signal mask field is a field of the basic, outermost context * struct itself both in FreeBSD 4.0 and in OpenBSD 2.6.) */ -#if defined __FreeBSD__ || __NetBSD__ || defined LISP_FEATURE_DARWIN +#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(LISP_FEATURE_DARWIN) return &context->uc_sigmask; -#elif defined __OpenBSD__ +#elif defined (__OpenBSD__) return &context->sc_mask; #else #error unsupported BSD variant @@ -188,25 +192,33 @@ 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 + os_context_t *context = arch_os_get_context(&void_context); + void *fault_addr = arch_get_bad_addr(signal, siginfo, context); + +#if defined(LISP_FEATURE_RESTORE_TLS_SEGMENT_REGISTER_FROM_CONTEXT) + FSHOW_SIGNAL((stderr, "/ TLS: restoring fs: %p in memory_fault_handler\n", + *CONTEXT_ADDR_FROM_STEM(fs))); + os_restore_tls_segment_register(context); #endif - os_context_t *context = arch_os_get_context(&void_context); + FSHOW((stderr, "Memory fault at: %p, PC: %x\n", fault_addr, *os_context_pc_addr(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) { @@ -217,10 +229,22 @@ os_install_interrupt_handlers(void) undoably_install_low_level_interrupt_handler(SIG_MEMORY_FAULT2, memory_fault_handler); #endif + +#ifdef LISP_FEATURE_SB_THREAD + undoably_install_low_level_interrupt_handler(SIG_INTERRUPT_THREAD, + interrupt_thread_handler); + undoably_install_low_level_interrupt_handler(SIG_STOP_FOR_GC, + sig_stop_for_gc_handler); +#ifdef SIG_RESUME_FROM_GC + undoably_install_low_level_interrupt_handler(SIG_RESUME_FROM_GC, + sig_stop_for_gc_handler); +#endif +#endif + SHOW("leaving os_install_interrupt_handlers()"); } -#else /* Currently Darwin only */ +#else /* Currently PPC/Darwin/Cheney only */ static void sigsegv_handler(int signal, siginfo_t *info, void* void_context) @@ -311,27 +335,45 @@ static void freebsd_init() #endif /* LISP_FEATURE_X86 */ } #endif /* __FreeBSD__ */ - -/* threads */ -/* no threading in any *BSD variant on any CPU (yet? in sbcl-0.8.0 anyway) */ -#ifdef LISP_FEATURE_SB_THREAD -#error "Define threading support functions" -#else -int arch_os_thread_init(struct thread *thread) { - stack_t sigstack; -#ifdef LISP_FEATURE_C_STACK_IS_CONTROL_STACK - /* Signal handlers are run on the control stack, so if it is exhausted - * we had better use an alternate stack for whatever signal tells us - * we've exhausted it */ - sigstack.ss_sp=((void *) thread)+dynamic_values_bytes; - sigstack.ss_flags=0; - sigstack.ss_size = 32*SIGSTKSZ; - sigaltstack(&sigstack,0); +#ifdef LISP_FEATURE_DARWIN +/* defined in ppc-darwin-os.c instead */ +#elif defined(LISP_FEATURE_FREEBSD) +#ifndef KERN_PROC_PATHNAME +#define KERN_PROC_PATHNAME 12 #endif - return 1; /* success */ + +char * +os_get_runtime_executable_path() +{ + char path[PATH_MAX + 1]; + + if (getosreldate() >= 600024) { + /* KERN_PROC_PATHNAME is available */ + 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) + 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; + return copied_string(path); } -int arch_os_thread_cleanup(struct thread *thread) { - return 1; /* success */ +#else /* Not DARWIN or FREEBSD */ +char * +os_get_runtime_executable_path() +{ + return NULL; } #endif