X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fbsd-os.c;h=f9cf70c8b92ca088847f2d21a3647e4980d40c48;hb=40588bcc85ce25d24d59becf96576cc7c89a3c95;hp=3199a86ab269cb0ea5be9a3e2a8683a8aa598bfe;hpb=79cc569a97e444389350ea3f5b1017374fe16bec;p=sbcl.git diff --git a/src/runtime/bsd-os.c b/src/runtime/bsd-os.c index 3199a86..f9cf70c 100644 --- a/src/runtime/bsd-os.c +++ b/src/runtime/bsd-os.c @@ -51,13 +51,24 @@ os_vm_size_t os_vm_page_size; static void netbsd_init(); #endif /* __NetBSD__ */ -void os_init(void) +#ifdef __FreeBSD__ +#include +#include + +static void freebsd_init(); +#endif /* __FreeBSD__ */ + +void +os_init(char *argv[], char *envp[]) { os_vm_page_size = getpagesize(); #ifdef __NetBSD__ netbsd_init(); #endif /* __NetBSD__ */ +#ifdef __FreeBSD__ + freebsd_init(); +#endif /* __FreeBSD__ */ } int *os_context_pc_addr(os_context_t *context) @@ -68,6 +79,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 @@ -81,9 +94,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 @@ -125,7 +138,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; @@ -178,31 +191,42 @@ 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(MEMORY_FAULT_DEBUG) + fprintf(stderr, "Memory fault at: %p, PC: %x\n", fault_addr, *os_context_pc_addr(context)); +#if defined(ARCH_HAS_STACK_POINTER) + fprintf(stderr, "Stack pointer: %x\n", *os_context_sp_addr(context)); +#endif #endif - os_context_t *context = arch_os_get_context(&void_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) { SHOW("os_install_interrupt_handlers()/bsd-os/defined(GENCGC)"); undoably_install_low_level_interrupt_handler(SIG_MEMORY_FAULT, memory_fault_handler); +#ifdef SIG_MEMORY_FAULT2 + undoably_install_low_level_interrupt_handler(SIG_MEMORY_FAULT2, + memory_fault_handler); +#endif SHOW("leaving os_install_interrupt_handlers()"); } @@ -229,6 +253,10 @@ os_install_interrupt_handlers(void) SHOW("os_install_interrupt_handlers()/bsd-os/!defined(GENCGC)"); undoably_install_low_level_interrupt_handler(SIG_MEMORY_FAULT, sigsegv_handler); +#ifdef SIG_MEMORY_FAULT2 + undoably_install_low_level_interrupt_handler(SIG_MEMORY_FAULT2, + sigsegv_handler); +#endif } #endif /* defined GENCGC */ @@ -270,6 +298,29 @@ The system may fail to start.\n", } } #endif /* __NetBSD__ */ + +#ifdef __FreeBSD__ +static void freebsd_init() +{ + /* Quote from sbcl-devel (NIIMI Satoshi): "Some OSes, like FreeBSD + * 4.x with GENERIC kernel, does not enable SSE support even on + * SSE capable CPUs". Detect this situation and skip the + * fast_bzero sse/base selection logic that's normally done in + * x86-assem.S. + */ +#ifdef LISP_FEATURE_X86 + size_t len; + int instruction_sse; + + len = sizeof(instruction_sse); + if (sysctlbyname("hw.instruction_sse", &instruction_sse, &len, NULL, 0) == 0 + && instruction_sse != 0) { + /* Use the SSE detector */ + fast_bzero_pointer = fast_bzero_detect; + } +#endif /* LISP_FEATURE_X86 */ +} +#endif /* __FreeBSD__ */ /* threads */ @@ -294,3 +345,45 @@ int arch_os_thread_cleanup(struct thread *thread) { return 1; /* success */ } #endif + +#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 + +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); +} +#else /* Not DARWIN or FREEBSD */ +char * +os_get_runtime_executable_path() +{ + return NULL; +} +#endif