X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fruntime%2Fbsd-os.h;h=d95431df0fbc5c59c6e1fe57362369160bd8aa02;hb=a93dc34ed9e7f5c7162e9c18961e6cce23941b46;hp=de568f869a81604f3c813f73173a56f2c5671c9d;hpb=cea4896b2482b7b2b429c1631d774b4cfbc0efba;p=sbcl.git

diff --git a/src/runtime/bsd-os.h b/src/runtime/bsd-os.h
index de568f8..d95431d 100644
--- a/src/runtime/bsd-os.h
+++ b/src/runtime/bsd-os.h
@@ -21,21 +21,51 @@ typedef caddr_t os_vm_address_t;
 typedef vm_size_t os_vm_size_t;
 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 already has 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;
+/* 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
 #elif defined __OpenBSD__
 typedef struct sigcontext os_context_t;
+#define SIG_MEMORY_FAULT SIGSEGV
+#elif defined 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 */
+
+#include <ucontext.h>
+typedef ucontext_t os_context_t;
+#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