static void freebsd_init();
#endif /* __FreeBSD__ */
+#ifdef __OpenBSD__
+#include <sys/types.h>
+#include <sys/resource.h>
+#include <sys/stat.h>
+#include <sys/sysctl.h>
+#include <dlfcn.h>
+#ifdef LISP_FEATURE_X86
+#include <machine/cpu.h>
+#endif
+
+static void openbsd_init();
+#endif
+
void
os_init(char *argv[], char *envp[])
{
netbsd_init();
#elif defined(__FreeBSD__)
freebsd_init();
+#elif defined(__OpenBSD__)
+ openbsd_init();
#endif
}
*/
void
-memory_fault_handler(int signal, siginfo_t *siginfo, void *void_context
+memory_fault_handler(int signal, siginfo_t *siginfo, os_context_t *context
#if defined(LISP_FEATURE_FREEBSD) && defined(LISP_FEATURE_X86_64)
/* FreeBSD/amd64 stores fault address only in undocumented 4th arg. */
,void *fault_addr
#endif
)
{
- os_context_t *context = arch_os_get_context(&void_context);
#if defined(LISP_FEATURE_FREEBSD) && defined(LISP_FEATURE_X86_64)
/* KLUDGE: Store fault address into si_addr for compatibilities. */
siginfo->si_addr = fault_addr;
FSHOW((stderr, "Memory fault at: %p, PC: %p\n", fault_addr, *os_context_pc_addr(context)));
if (!gencgc_handle_wp_violation(fault_addr))
- if(!handle_guard_page_triggered(context,fault_addr)) {
-#ifdef LISP_FEATURE_C_STACK_IS_CONTROL_STACK
+ if(!handle_guard_page_triggered(context,fault_addr))
lisp_memory_fault_error(context, fault_addr);
-#else
- if (!maybe_gc(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
- }
}
#if defined(LISP_FEATURE_MACH_EXCEPTION_HANDLER)
void
-mach_error_memory_fault_handler(int signal, siginfo_t *siginfo, void *void_context) {
+mach_error_memory_fault_handler(int signal, siginfo_t *siginfo,
+ os_context_t *context) {
lose("Unhandled memory fault. Exiting.");
}
#endif
#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 PPC/Darwin/Cheney only */
static void
-sigsegv_handler(int signal, siginfo_t *info, void* void_context)
+sigsegv_handler(int signal, siginfo_t *info, os_context_t *context)
{
- os_context_t *context = arch_os_get_context(&void_context);
#if 0
unsigned int pc = (unsigned int *)(*os_context_pc_addr(context));
#endif
if (!cheneygc_handle_wp_violation(context, addr))
if (!handle_guard_page_triggered(context, addr))
interrupt_handle_now(signal, info, context);
- /* Work around G5 bug; fix courtesy gbyers */
- DARWIN_FIX_CONTEXT(context);
}
void
struct timespec timeout;
int ret;
-again:
if (sec < 0)
ret = umtx_wait((void *)lock_word, oldval, NULL);
else {
case ETIMEDOUT:
return 1;
case EINTR:
- /* spurious wakeup from interrupt */
- goto again;
+ return 2;
default:
/* EWOULDBLOCK and others, need to check the lock */
return -1;
return NULL;
return copied_string(path);
}
-#elif defined(LISP_FEATURE_NETBSD)
+#elif defined(LISP_FEATURE_NETBSD) || defined(LISP_FEATURE_OPENBSD)
char *
os_get_runtime_executable_path()
{
return NULL;
}
}
-#else /* Not DARWIN or FREEBSD or NETBSD */
+#else /* Not DARWIN or FREEBSD or NETBSD or OPENBSD */
char *
os_get_runtime_executable_path()
{
return NULL;
}
#endif
+
+#ifdef __OpenBSD__
+
+int openbsd_use_fxsave = 0;
+
+void
+openbsd_init()
+{
+#ifdef LISP_FEATURE_X86
+ int mib[2];
+ size_t size;
+#endif
+ /*
+ * Show a warning if it looks like the memory available after
+ * allocating the spaces won't be at least this much.
+ */
+#ifdef LISP_FEATURE_X86_64
+ const int wantfree = 64 * 1024 * 1024;
+#else
+ const int wantfree = 32 * 1024 * 1024;
+#endif
+ struct rlimit rl;
+
+#ifdef LISP_FEATURE_X86
+ /* Save the machdep.osfxsr sysctl for use by os_restore_fp_control() */
+ mib[0] = CTL_MACHDEP;
+ mib[1] = CPU_OSFXSR;
+ size = sizeof (openbsd_use_fxsave);
+ sysctl(mib, 2, &openbsd_use_fxsave, &size, NULL, 0);
+#endif
+
+ /* OpenBSD, like NetBSD, counts mmap()ed space against the
+ * process's data size limit. If the soft limit is lower than the
+ * hard limit then try to yank it up, this lets users in the
+ * "staff" or "daemon" login classes run sbcl with larger dynamic
+ * space sizes.
+ */
+ getrlimit (RLIMIT_DATA, &rl);
+ if (rl.rlim_cur < rl.rlim_max) {
+ rl.rlim_cur = rl.rlim_max;
+ if (setrlimit (RLIMIT_DATA, &rl) < 0) {
+ fprintf (stderr,
+ "RUNTIME WARNING: unable to raise process data size limit:\n\
+ %s.\n\
+The system may fail to start.\n",
+ strerror(errno));
+ }
+ }
+
+ /*
+ * Display a (hopefully) helpful warning if it looks like we won't
+ * be able to allocate enough memory.
+ */
+ getrlimit (RLIMIT_DATA, &rl);
+ if (dynamic_space_size + READ_ONLY_SPACE_SIZE + STATIC_SPACE_SIZE +
+ LINKAGE_TABLE_SPACE_SIZE + wantfree > rl.rlim_cur)
+ fprintf (stderr,
+ "RUNTIME WARNING: data size resource limit may be too low,\n"
+ " try decreasing the dynamic space size with --dynamic-space-size\n"
+ " or raising the datasize or datasize-max limits in /etc/login.conf\n");
+}
+
+/* OpenBSD's dlsym() relies on the gcc bulitin
+ * __builtin_return_address(0) returning an address in the
+ * executable's text segment, but when called from lisp it will return
+ * an address in the dynamic space. Work around this by calling this
+ * wrapper function instead. Note that tail-call optimization will
+ * defeat this, disable it by saving the dlsym() return value in a
+ * volatile variable.
+*/
+void *
+os_dlsym(void *handle, const char *symbol)
+{
+ void * volatile ret = dlsym(handle, symbol);
+ return ret;
+}
+
+#endif