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

diff --git a/src/runtime/bsd-os.h b/src/runtime/bsd-os.h
index 1cdc422..de0522f 100644
--- a/src/runtime/bsd-os.h
+++ b/src/runtime/bsd-os.h
@@ -21,30 +21,40 @@ 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;
-/* 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 */
+/* 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
 #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