X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Finterrupt.h;h=d26df2855c43510310922a23ad449ccbfd5eba8d;hb=e87722978bc9993cc5a862964366ee7cd0b7fb4c;hp=73ab2d2c72ffdd4f34c903fd2350cfbda5dc7a5a;hpb=358cad8bdef5c670e1bbe94c430bd27544995433;p=sbcl.git

diff --git a/src/runtime/interrupt.h b/src/runtime/interrupt.h
index 73ab2d2..d26df28 100644
--- a/src/runtime/interrupt.h
+++ b/src/runtime/interrupt.h
@@ -13,41 +13,90 @@
 #define _INCLUDE_INTERRUPT_H_
 
 #include <signal.h>
+#include <string.h>
+
+/*
+ * This is a workaround for some slightly silly Linux/GNU Libc
+ * behaviour: glibc defines sigset_t to support 1024 signals, which is
+ * more than the kernel.  This is usually not a problem, but becomes
+ * one when we want to save a signal mask from a ucontext, and restore
+ * it later into another ucontext: the ucontext is allocated on the
+ * stack by the kernel, so copying a libc-sized sigset_t into it will
+ * overflow and cause other data on the stack to be corrupted */
+/* FIXME: do not rely on NSIG being a multiple of 8 */
+#define REAL_SIGSET_SIZE_BYTES ((NSIG/8))
+
+extern void check_blockables_blocked_or_lose(void);
+extern void check_gc_signals_unblocked_or_lose(void);
+extern void unblock_gc_signals(void);
+
+static inline void
+sigcopyset(sigset_t *new, sigset_t *old)
+{
+    memcpy(new, old, REAL_SIGSET_SIZE_BYTES);
+}
 
 /* maximum signal nesting depth
  *
  * Note: In CMU CL, this was 4096, but there was no explanation given,
  * and it's hard to see why we'd need that many nested interrupts, so
- * I've scaled it back to see what happens. -- WHN 20000730 */
-#define MAX_INTERRUPTS 256
+ * I've scaled it back (to 256) to see what happens. -- WHN 20000730
 
-extern os_context_t *lisp_interrupt_contexts[MAX_INTERRUPTS];
+ * Nothing happened, so let's creep it back a bit further -- dan 20030411 */
+#define MAX_INTERRUPTS 32
 
 union interrupt_handler {
-	lispobj lisp;
-	void (*c)(int, siginfo_t*, void*);
+    lispobj lisp;
+    void (*c)(int, siginfo_t*, void*);
 };
 
+extern union interrupt_handler interrupt_handlers[NSIG];
+
+struct interrupt_data {
+    /* signal information for pending signal.  pending_signal=0 when there
+     * is no pending signal. */
+    void (*pending_handler) (int, siginfo_t*, void*) ;
+    int pending_signal;
+    siginfo_t pending_info;
+    sigset_t pending_mask;
+};
+
+
 extern void interrupt_init(void);
 extern void fake_foreign_function_call(os_context_t* context);
 extern void undo_fake_foreign_function_call(os_context_t* context);
-extern void interrupt_handle_now(int, siginfo_t*, void*);
+extern void arrange_return_to_lisp_function(os_context_t *, lispobj);
+extern void interrupt_handle_now(int, siginfo_t*, os_context_t*);
 extern void interrupt_handle_pending(os_context_t*);
-extern void interrupt_internal_error(int, siginfo_t*, os_context_t*,
-				     boolean continuable);
-extern boolean interrupt_maybe_gc(int, siginfo_t*, void*);
-extern void undoably_install_low_level_interrupt_handler (int signal,
-							  void
-							  handler(int,
-								  siginfo_t*,
-								  void*));
+extern void interrupt_internal_error(os_context_t*, boolean continuable);
+extern boolean handle_guard_page_triggered(os_context_t *,os_vm_address_t);
+extern boolean maybe_defer_handler(void *handler, struct interrupt_data *data,
+                                   int signal, siginfo_t *info,
+                                   os_context_t *context);
+#if defined LISP_FEATURE_GENCGC
+/* assembly language stub that executes trap_PendingInterrupt */
+extern void do_pending_interrupt(void);
+#endif
+
+#ifdef LISP_FEATURE_SB_THREAD
+extern void interrupt_thread_handler(int, siginfo_t*, void*);
+extern void sig_stop_for_gc_handler(int, siginfo_t*, void*);
+#endif
+typedef void (*interrupt_handler_t)(int, siginfo_t *, void *);
+extern void undoably_install_low_level_interrupt_handler (
+                        int signal,
+                        interrupt_handler_t handler);
 extern unsigned long install_handler(int signal,
-				     void handler(int, siginfo_t*, void*));
+                                     interrupt_handler_t handler);
 
 extern union interrupt_handler interrupt_handlers[NSIG];
 
+/* Set all deferrable signals into *s. */
+extern void sigaddset_deferrable(sigset_t *s);
 /* Set all blockable signals into *s. */
-void sigaddset_blockable(sigset_t *s);
+extern void sigaddset_blockable(sigset_t *s);
+
+extern void block_blockable_signals(void);
 
 /* The void* casting here avoids having to mess with the various types
  * of function argument lists possible for signal handlers:
@@ -55,4 +104,11 @@ void sigaddset_blockable(sigset_t *s);
  * signal(..) handlers have another, and attempting to represent them
  * "cleanly" with union types is in fact a mess. */
 #define ARE_SAME_HANDLER(x, y) ((void*)(x) == (void*)(y))
+
+extern void handle_trap(os_context_t *context, int trap);
+
+#ifndef LISP_FEATURE_WIN32
+extern void lisp_memory_fault_error(os_context_t *context, os_vm_address_t addr);
+#endif
+
 #endif