X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fbsd-os.h;h=f1669d6ccaed9b0bb5146eeb785bcc0c437c8196;hb=8a632c14b592472873cfb214239c9387bc1a1ced;hp=6907482129d7125daf097c985b25049b9eb58e9a;hpb=8735f137435f1a90c05df67a03e48602a79572f8;p=sbcl.git diff --git a/src/runtime/bsd-os.h b/src/runtime/bsd-os.h index 6907482..f1669d6 100644 --- a/src/runtime/bsd-os.h +++ b/src/runtime/bsd-os.h @@ -31,7 +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 @@ -54,7 +53,6 @@ typedef ucontext_t os_context_t; * 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 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 @@ -63,7 +61,15 @@ 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_INTERRUPT_THREAD (SIGINFO) +#define SIG_STOP_FOR_GC (SIGUSR1) +#define SIG_RESUME_FROM_GC (SIGUSR2) #elif defined __OpenBSD__ @@ -77,17 +83,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 */ - -#include -typedef ucontext_t os_context_t; -#define SIG_MEMORY_FAULT SIGBUS - +#include "darwin-os.h" #else #error unsupported BSD variant #endif