Simplify (and robustify) regular PACKing

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

diff --git a/src/runtime/bsd-os.h b/src/runtime/bsd-os.h
index 474f686..880c5f7 100644 (file)
--- a/src/runtime/bsd-os.h
+++ b/src/runtime/bsd-os.h
@@ -31,15 +31,6 @@ 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
@@ -49,7 +40,11 @@ typedef struct sigaltstack stack_t;
 
 #include <sys/ucontext.h>
 typedef ucontext_t os_context_t;
-#define SIG_MEMORY_FAULT SIGSEGV
+/* 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
 /* 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
@@ -58,12 +53,21 @@ typedef ucontext_t os_context_t;
  * 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
+/* Hooking both SIGBUS and SIGSEGV causes troubles on some situation,
+ * so use a variable.
+ */
+extern int sig_memory_fault;
+#define SIG_MEMORY_FAULT (sig_memory_fault)
+
+#define SIG_STOP_FOR_GC (SIGUSR2)
 
 #elif defined __OpenBSD__
 
 typedef struct sigcontext os_context_t;
 #define SIG_MEMORY_FAULT SIGSEGV
+#if defined(LISP_FEATURE_X86)
+extern int openbsd_use_fxsave;
+#endif
 
 #elif defined __NetBSD__
 
@@ -72,24 +76,7 @@ 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
-
+#include "darwin-os.h"
 #else
 #error unsupported BSD variant
 #endif