X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fbsd-os.h;h=4f72a66eaaf57da4b9203a3edb1c6cdad73f1c46;hb=2ffb42cdf6d95801c24460084e8b486c71b767c2;hp=3cbf029c2268cbed91c4ff8d8b067bd7d4bf370a;hpb=422b88abf96f4842a3d0999cd3b80d96f5a153d6;p=sbcl.git

diff --git a/src/runtime/bsd-os.h b/src/runtime/bsd-os.h
index 3cbf029..4f72a66 100644
--- a/src/runtime/bsd-os.h
+++ b/src/runtime/bsd-os.h
@@ -17,8 +17,18 @@
 #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;
+#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;
@@ -28,7 +38,7 @@ typedef int os_context_register_t;
  * Linux sigaltstack(2) */
 typedef struct sigaltstack stack_t;
 #elif defined __FreeBSD__
-/* FreeBSD 4.6 already has stack_t defined. */
+/* FreeBSD 4.6 and NetBSD 1.6 already have stack_t defined. */
 #endif
 
 #if defined __FreeBSD__
@@ -37,16 +47,54 @@ typedef struct sigaltstack stack_t;
  * original FreeBSD port of SBCL, that's wrong, it's actually a
  * ucontext_t. */
 
+#include <sys/ucontext.h>
 typedef ucontext_t os_context_t;
 /* As the sbcl-devel message from Raymond Wiker 2000-12-01, FreeBSD
  * (unlike Linux and OpenBSD) doesn't let us tweak the CPU's single
  * 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
+#define SIG_MEMORY_FAULT SIGSEGV
+/* 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
+ */
+#define SIG_MEMORY_FAULT2 SIGBUS
+
 #elif defined __OpenBSD__
+
 typedef struct sigcontext os_context_t;
 #define SIG_MEMORY_FAULT SIGSEGV
+
+#elif defined __NetBSD__
+
+#include <ucontext.h>
+typedef ucontext_t 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)
+#include <sys/ucontext.h>
+#include <sys/_types.h>
+typedef struct ucontext os_context_t;
+#else
+#include <ucontext.h>
+typedef ucontext_t os_context_t;
+#endif
+
+#define SIG_MEMORY_FAULT SIGBUS
+
 #else
 #error unsupported BSD variant
 #endif