X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Finterrupt.h;h=acf80acc83cbbfeb90ad95abb1907ae0eb5f3838;hb=5563d2712045491695f68c018dbdd1233faca4e5;hp=cb71475f37684ec17c949b8e01efb66313c845b7;hpb=ce0a49644dce03ca07008e8073897e4ed7b247df;p=sbcl.git

diff --git a/src/runtime/interrupt.h b/src/runtime/interrupt.h
index cb71475..acf80ac 100644
--- a/src/runtime/interrupt.h
+++ b/src/runtime/interrupt.h
@@ -14,6 +14,23 @@
 
 #include <signal.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))
+
+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,
@@ -44,16 +61,25 @@ struct interrupt_data {
 extern void interrupt_init();
 extern void fake_foreign_function_call(os_context_t* context);
 extern void undo_fake_foreign_function_call(os_context_t* context);
+extern void arrange_return_to_lisp_function(os_context_t *, lispobj);
 extern void interrupt_handle_now(int, siginfo_t*, void*);
 extern void interrupt_handle_pending(os_context_t*);
 extern void interrupt_internal_error(int, siginfo_t*, os_context_t*,
 				     boolean continuable);
-extern boolean handle_control_stack_guard_triggered(os_context_t *,void *);
+extern boolean handle_guard_page_triggered(os_context_t *,void *);
 extern boolean interrupt_maybe_gc(int, siginfo_t*, void*);
+extern boolean interrupt_maybe_gc_int(int, siginfo_t *, void *);
+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*);
-extern void thread_exit_handler(int, siginfo_t*, void*);
 #endif
 extern void undoably_install_low_level_interrupt_handler (int signal,
 							  void