0.7.4.8:

[sbcl.git] / src / runtime / bsd-os.h

diff --git a/src/runtime/bsd-os.h b/src/runtime/bsd-os.h
index 1cdc422..63da20b 100644 (file)
--- a/src/runtime/bsd-os.h
+++ b/src/runtime/bsd-os.h
@@ -21,6 +21,7 @@ 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 __FreeBSD__
 /* Note: The man page for sigaction(2) in FreeBSD 4.0 says that this
@@ -28,14 +29,10 @@ typedef int os_vm_prot_t;
  * original FreeBSD port of SBCL, that's wrong, it's actually a
  * ucontext_t. */
 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
 #elif defined __OpenBSD__
 typedef struct sigcontext os_context_t;
@@ -43,8 +40,9 @@ typedef struct sigcontext os_context_t;
 #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