X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fbsd-os.h;h=880c5f7e6ce36b16002e98065dffdbbff6ecfedd;hb=f0cb0cf9c0fe1b6fce5d10dbd34a0b7b249c4ae8;hp=17226624389cda40252567cb9de9cd2d342295ba;hpb=074ba0606c687dbca4afc99e8e72e6f1a4486d24;p=sbcl.git

diff --git a/src/runtime/bsd-os.h b/src/runtime/bsd-os.h
index 1722662..880c5f7 100644
--- a/src/runtime/bsd-os.h
+++ b/src/runtime/bsd-os.h
@@ -17,23 +17,20 @@
 #include <sys/mman.h>
 #include <sys/signal.h>
 
+#ifdef LISP_FEATURE_DARWIN
+#include <mach/mach_types.h>
+#endif
+
 typedef caddr_t os_vm_address_t;
-#ifdef __NetBSD__
+#if defined __NetBSD__
 typedef vsize_t os_vm_size_t;
+#elif defined __OpenBSD__
+typedef size_t os_vm_size_t;
 #else
 typedef vm_size_t os_vm_size_t;
 #endif
 typedef off_t os_vm_offset_t;
 typedef int os_vm_prot_t;
-typedef int os_context_register_t;
-
-#if defined __OpenBSD__
-/* name defined for compatibility between OpenBSD 3.1 sigaltstack(2) and
- * Linux sigaltstack(2) */
-typedef struct sigaltstack stack_t;
-#elif defined __FreeBSD__
-/* FreeBSD 4.6 and NetBSD 1.6 already have stack_t defined. */
-#endif
 
 #if defined __FreeBSD__
 /* Note: The man page for sigaction(2) in FreeBSD 4.0 says that this
@@ -48,21 +45,38 @@ typedef ucontext_t os_context_t;
  * step flag bit by messing with the flags stored in a signal context,
  * so we need to implement single stepping in a more roundabout way. */
 #define CANNOT_GET_TO_SINGLE_STEP_FLAG
-#define SIG_MEMORY_FAULT SIGBUS
+/* Sometime in late 2005 FreeBSD was changed to signal SIGSEGV instead
+ * of SIGBUS for memory faults, as required by POSIX. In order to
+ * support both new and old FreeBSD at the same time, both signals are
+ * hooked to the GC write barrier machinery. If you're reading this
+ * message in the far future where FreeBSD 6 and earlier are just
+ * quaint memories, feel free to delete this hack (and any code that's
+ * #ifdef SIG_MEMORY_FAULT2'ed). -- JES, 2005-12-30
+ */
+/* Hooking both SIGBUS and SIGSEGV causes troubles on some situation,
+ * so use a variable.
+ */
+extern int sig_memory_fault;
+#define SIG_MEMORY_FAULT (sig_memory_fault)
+
+#define SIG_STOP_FOR_GC (SIGUSR2)
+
 #elif defined __OpenBSD__
+
 typedef struct sigcontext os_context_t;
 #define SIG_MEMORY_FAULT SIGSEGV
-#elif defined LISP_FEATURE_DARWIN
-  /* man pages claim that the third argument is a sigcontext struct,
-     but ucontext_t is defined, matches sigcontext where sensible,
-     offers better access to mcontext, and is of course the SUSv2-
-     mandated type of the third argument, so we use that instead.
-     If Apple is going to break ucontext_t out of spite, I'm going
-     to be cross with them ;) -- PRM */
+#if defined(LISP_FEATURE_X86)
+extern int openbsd_use_fxsave;
+#endif
+
+#elif defined __NetBSD__
 
 #include <ucontext.h>
 typedef ucontext_t os_context_t;
-#define SIG_MEMORY_FAULT SIGBUS
+#define SIG_MEMORY_FAULT SIGSEGV
+
+#elif defined LISP_FEATURE_DARWIN
+#include "darwin-os.h"
 #else
 #error unsupported BSD variant
 #endif