* becomes 'yes'.) */
boolean internal_errors_enabled = 0;
-struct interrupt_data * global_interrupt_data;
+static void (*interrupt_low_level_handlers[NSIG]) (int, siginfo_t*, void*);
+union interrupt_handler interrupt_handlers[NSIG];
/* At the toplevel repl we routinely call this function. The signal
* mask ought to be clear anyway most of the time, but may be non-zero
* if we were interrupted e.g. while waiting for a queue. */
-void reset_signal_mask ()
+void reset_signal_mask(void)
{
sigset_t new;
sigemptyset(&new);
thread_sigmask(SIG_SETMASK,&new,0);
}
-void block_blockable_signals ()
+void block_blockable_signals(void)
{
sigset_t block;
- sigemptyset(&block);
- sigaddset_blockable(&block);
+ sigcopyset(&block, &blockable_sigset);
thread_sigmask(SIG_BLOCK, &block, 0);
}
* utility routines used by various signal handlers
*/
-void
+static void
build_fake_control_stack_frames(struct thread *th,os_context_t *context)
{
#ifndef LISP_FEATURE_C_STACK_IS_CONTROL_STACK
/* Build a fake stack frame or frames */
current_control_frame_pointer =
- (lispobj *)(*os_context_register_addr(context, reg_CSP));
- if ((lispobj *)(*os_context_register_addr(context, reg_CFP))
+ (lispobj *)(unsigned long)
+ (*os_context_register_addr(context, reg_CSP));
+ if ((lispobj *)(unsigned long)
+ (*os_context_register_addr(context, reg_CFP))
== current_control_frame_pointer) {
/* There is a small window during call where the callee's
* frame isn't built yet. */
/* Get current Lisp state from context. */
#ifdef reg_ALLOC
dynamic_space_free_pointer =
- (lispobj *)(*os_context_register_addr(context, reg_ALLOC));
+ (lispobj *)(unsigned long)
+ (*os_context_register_addr(context, reg_ALLOC));
#if defined(LISP_FEATURE_ALPHA)
if ((long)dynamic_space_free_pointer & 1) {
lose("dead in fake_foreign_function_call, context = %x", context);
#endif
#ifdef reg_BSP
current_binding_stack_pointer =
- (lispobj *)(*os_context_register_addr(context, reg_BSP));
+ (lispobj *)(unsigned long)
+ (*os_context_register_addr(context, reg_BSP));
#endif
build_fake_control_stack_frames(thread,context);
{
lispobj context_sap = 0;
- check_blockables_blocked_or_lose();
fake_foreign_function_call(context);
+ if (!internal_errors_enabled) {
+ describe_internal_error(context);
+ /* There's no good way to recover from an internal error
+ * before the Lisp error handling mechanism is set up. */
+ lose("internal error too early in init, can't recover");
+ }
+
/* Allocate the SAP object while the interrupts are still
* disabled. */
- if (internal_errors_enabled) {
- context_sap = alloc_sap(context);
- }
+ context_sap = alloc_sap(context);
thread_sigmask(SIG_SETMASK, os_context_sigmask_addr(context), 0);
- if (internal_errors_enabled) {
- SHOW("in interrupt_internal_error");
+ SHOW("in interrupt_internal_error");
#ifdef QSHOW
- /* Display some rudimentary debugging information about the
- * error, so that even if the Lisp error handler gets badly
- * confused, we have a chance to determine what's going on. */
- describe_internal_error(context);
+ /* Display some rudimentary debugging information about the
+ * error, so that even if the Lisp error handler gets badly
+ * confused, we have a chance to determine what's going on. */
+ describe_internal_error(context);
#endif
- funcall2(SymbolFunction(INTERNAL_ERROR), context_sap,
- continuable ? T : NIL);
- } else {
- describe_internal_error(context);
- /* There's no good way to recover from an internal error
- * before the Lisp error handling mechanism is set up. */
- lose("internal error too early in init, can't recover");
- }
+ funcall2(SymbolFunction(INTERNAL_ERROR), context_sap,
+ continuable ? T : NIL);
+
undo_fake_foreign_function_call(context); /* blocks signals again */
if (continuable) {
arch_skip_instruction(context);
interrupt_handle_now(int signal, siginfo_t *info, void *void_context)
{
os_context_t *context = (os_context_t*)void_context;
- struct thread *thread=arch_os_get_current_thread();
#if !defined(LISP_FEATURE_X86) && !defined(LISP_FEATURE_X86_64)
boolean were_in_lisp;
#endif
delivered we appear to have a null FPU control word. */
os_restore_fp_control(context);
#endif
- handler = thread->interrupt_data->interrupt_handlers[signal];
+ handler = interrupt_handlers[signal];
if (ARE_SAME_HANDLER(handler.c, SIG_IGN)) {
return;
* because we're not in pseudoatomic and allocation shouldn't
* be interrupted. In which case it's no longer an issue as
* all our allocation from C now goes through a PA wrapper,
- * but still, doesn't hurt */
+ * but still, doesn't hurt.
+ *
+ * Yeah, but non-gencgc platforms that don't really wrap
+ * allocation in PA. MG - 2005-08-29 */
lispobj info_sap,context_sap = alloc_sap(context);
info_sap = alloc_sap(info);
low_level_interrupt_handle_now(int signal, siginfo_t *info, void *void_context)
{
os_context_t *context = (os_context_t*)void_context;
- struct thread *thread=arch_os_get_current_thread();
- struct interrupt_data *data=thread->interrupt_data;
#ifdef LISP_FEATURE_LINUX
os_restore_fp_control(context);
#endif
check_blockables_blocked_or_lose();
check_interrupts_enabled_or_lose(context);
- (*data->interrupt_low_level_handlers[signal])
- (signal, info, void_context);
+ interrupt_low_level_handlers[signal](signal, info, void_context);
#ifdef LISP_FEATURE_DARWIN
/* Work around G5 bug */
DARWIN_FIX_CONTEXT(context);
/* need the context stored so it can have registers scavenged */
fake_foreign_function_call(context);
- sigemptyset(&ss);
- for(i=1;i<NSIG;i++) sigaddset(&ss,i); /* Block everything. */
+ sigfillset(&ss); /* Block everything. */
thread_sigmask(SIG_BLOCK,&ss,0);
/* The GC can't tell if a thread is a zombie, so this would be a
#else
/* this much of the calling convention is common to all
non-x86 ports */
- *os_context_pc_addr(context) = (os_context_register_t)code;
+ *os_context_pc_addr(context) = (os_context_register_t)(unsigned long)code;
*os_context_register_addr(context,reg_NARGS) = 0;
- *os_context_register_addr(context,reg_LIP) = (os_context_register_t)code;
+ *os_context_register_addr(context,reg_LIP) =
+ (os_context_register_t)(unsigned long)code;
*os_context_register_addr(context,reg_CFP) =
- (os_context_register_t)current_control_frame_pointer;
+ (os_context_register_t)(unsigned long)current_control_frame_pointer;
#endif
#ifdef ARCH_HAS_NPC_REGISTER
*os_context_npc_addr(context) =
interrupt_maybe_gc(int signal, siginfo_t *info, void *void_context)
{
os_context_t *context=(os_context_t *) void_context;
- struct thread *th=arch_os_get_current_thread();
- struct interrupt_data *data=th->interrupt_data;
if(!foreign_function_call_active && gc_trigger_hit(signal, info, context)){
struct thread *thread=arch_os_get_current_thread();
os_context_t *context=(os_context_t *) void_context;
struct thread *thread=arch_os_get_current_thread();
- check_blockables_blocked_or_lose();
fake_foreign_function_call(context);
/* SUB-GC may return without GCing if *GC-INHIBIT* is set, in
void*))
{
struct sigaction sa;
- struct thread *th=arch_os_get_current_thread();
- /* It may be before the initial thread is started. */
- struct interrupt_data *data=
- th ? th->interrupt_data : global_interrupt_data;
if (0 > signal || signal >= NSIG) {
lose("bad signal number %d", signal);
else
sa.sa_sigaction = handler;
- sigemptyset(&sa.sa_mask);
- sigaddset_blockable(&sa.sa_mask);
+ sigcopyset(&sa.sa_mask, &blockable_sigset);
sa.sa_flags = SA_SIGINFO | SA_RESTART;
#ifdef LISP_FEATURE_C_STACK_IS_CONTROL_STACK
if((signal==SIG_MEMORY_FAULT)
|| (signal==SIG_INTERRUPT_THREAD)
#endif
)
- sa.sa_flags|= SA_ONSTACK;
+ sa.sa_flags |= SA_ONSTACK;
#endif
sigaction(signal, &sa, NULL);
- data->interrupt_low_level_handlers[signal] =
+ interrupt_low_level_handlers[signal] =
(ARE_SAME_HANDLER(handler, SIG_DFL) ? 0 : handler);
}
struct sigaction sa;
sigset_t old, new;
union interrupt_handler oldhandler;
- struct thread *th=arch_os_get_current_thread();
- /* It may be before the initial thread is started. */
- struct interrupt_data *data=
- th ? th->interrupt_data : global_interrupt_data;
FSHOW((stderr, "/entering POSIX install_handler(%d, ..)\n", signal));
sigaddset(&new, signal);
thread_sigmask(SIG_BLOCK, &new, &old);
- FSHOW((stderr, "/data->interrupt_low_level_handlers[signal]=%x\n",
- (unsigned int)data->interrupt_low_level_handlers[signal]));
- if (data->interrupt_low_level_handlers[signal]==0) {
+ FSHOW((stderr, "/interrupt_low_level_handlers[signal]=%x\n",
+ (unsigned int)interrupt_low_level_handlers[signal]));
+ if (interrupt_low_level_handlers[signal]==0) {
if (ARE_SAME_HANDLER(handler, SIG_DFL) ||
ARE_SAME_HANDLER(handler, SIG_IGN)) {
sa.sa_sigaction = handler;
sa.sa_sigaction = interrupt_handle_now_handler;
}
- sigemptyset(&sa.sa_mask);
- sigaddset_blockable(&sa.sa_mask);
+ sigcopyset(&sa.sa_mask, &blockable_sigset);
sa.sa_flags = SA_SIGINFO | SA_RESTART;
sigaction(signal, &sa, NULL);
}
- oldhandler = data->interrupt_handlers[signal];
- data->interrupt_handlers[signal].c = handler;
+ oldhandler = interrupt_handlers[signal];
+ interrupt_handlers[signal].c = handler;
thread_sigmask(SIG_SETMASK, &old, 0);
sigaddset_deferrable(&deferrable_sigset);
sigaddset_blockable(&blockable_sigset);
- global_interrupt_data=calloc(sizeof(struct interrupt_data), 1);
-
/* Set up high level handler information. */
for (i = 0; i < NSIG; i++) {
- global_interrupt_data->interrupt_handlers[i].c =
+ interrupt_handlers[i].c =
/* (The cast here blasts away the distinction between
* SA_SIGACTION-style three-argument handlers and
* signal(..)-style one-argument handlers, which is OK
projects / sbcl.git / blobdiff