X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fbsd-os.h;h=474f6867eb39276fd042e6e9f5c22936db27d1c6;hb=f35f14479a64dd97f93d2d91dc154bdc141d6842;hp=1cdc422f82fffbe9248e08afb7c7c3be5ac42c24;hpb=7f76d571fe545578e3bd26e627d181a39a8f1eb7;p=sbcl.git

diff --git a/src/runtime/bsd-os.h b/src/runtime/bsd-os.h
index 1cdc422..474f686 100644
--- a/src/runtime/bsd-os.h
+++ b/src/runtime/bsd-os.h
@@ -17,34 +17,86 @@
 #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;
+
+#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
  * is an mcontext_t, but according to comments by Raymond Wiker in the
  * original FreeBSD port of SBCL, that's wrong, it's actually a
  * ucontext_t. */
+
+#include <sys/ucontext.h>
 typedef ucontext_t os_context_t;
-/* KLUDGE: A hack inherited from CMU CL used to be conditional on
- * !defined(__linux__), and has now been made conditional on
- * CANNOT_GET_TO_SINGLE_STEP_FLAG: if the OS won't let us flip the
- * single-step flag bit in the state stored in a signal context, then
- * we need to mess around with overwriting preceding code with
- * bit-flipping code. This isn't needed in Linux or OpenBSD; I haven't
- * been able to test whether it's still needed in FreeBSD, so for
- * conservatism it's left in. -- WHN 2000-10-24 */
-#define CANNOT_GET_TO_SINGLE_STEP_FLAG
+#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
 
+#include "target-arch-os.h"
+#include "target-arch.h"
+
 #define OS_VM_PROT_READ PROT_READ
 #define OS_VM_PROT_WRITE PROT_WRITE
 #define OS_VM_PROT_EXECUTE PROT_EXEC
-
-#define OS_VM_DEFAULT_PAGESIZE	4096