sigset_t change (part 3 of 5)

-----------------------------

By introducing a new sigframe so that the signal handler operates
on the new siginfo_t and on ucontext_t instead of sigcontext, we
now need two version of sendsig and sigreturn.

A flag in struct proc determines whether the process expects an
old sigframe or a new sigframe. The signal trampoline handles
which sigreturn to call. It does this by testing for a magic
cookie in the frame.

The alpha uses osigreturn to implement longjmp. This means that
osigreturn is not only used for compatibility with existing
binaries. To handle the new sigset_t, setjmp saves it in
sc_reserved (see NOTE).

the struct sigframe has been moved from frame.h to sigframe.h
to handle the complex header dependencies that was caused by
the new sigframe.

NOTE: For the i386, the size of jmp_buf has been increased to hold
      the new sigset_t. On the alpha this has been prevented by
      using sc_reserved in sigcontext.

1 files changed, 29 insertions, 27 deletions

diff --git a/sys/amd64/include/signal.h b/sys/amd64/include/signal.h
index deaa06c..e9f739e 100644
--- a/sys/amd64/include/signal.h
+++ b/sys/amd64/include/signal.h
@@ -54,33 +54,35 @@ typedef int sig_atomic_t;
  * to the handler to allow it to restore state properly if
  * a non-standard exit is performed.
  */
-struct	sigcontext {
-	int	sc_onstack;		/* sigstack state to restore */
-	int	sc_mask;		/* signal mask to restore */
-	int	sc_esp;			/* machine state */
-	int	sc_ebp;
-	int	sc_isp;
-	int	sc_eip;
-	int	sc_efl;
-	int	sc_es;
-	int	sc_ds;
-	int	sc_cs;
-	int	sc_ss;
-	int	sc_edi;
-	int	sc_esi;
-	int	sc_ebx;
-	int	sc_edx;
-	int	sc_ecx;
-	int	sc_eax;
-	int	sc_gs;
-	int	sc_fs;
-#  define sc_sp sc_esp
-#  define sc_fp sc_ebp
-#  define sc_pc sc_eip
-#  define sc_ps sc_efl
-#  define sc_eflags	sc_efl
-	int	sc_trapno;
-	int	sc_err;
+typedef unsigned int osigset_t;
+
+struct	osigcontext {
+	int		sc_onstack;	/* sigstack state to restore */
+	osigset_t	sc_mask;	/* signal mask to restore */
+	int		sc_esp;		/* machine state */
+	int		sc_ebp;
+	int		sc_isp;
+	int		sc_eip;
+	int		sc_efl;
+	int		sc_es;
+	int		sc_ds;
+	int		sc_cs;
+	int		sc_ss;
+	int		sc_edi;
+	int		sc_esi;
+	int		sc_ebx;
+	int		sc_edx;
+	int		sc_ecx;
+	int		sc_eax;
+	int		sc_gs;
+	int		sc_fs;
+#define sc_sp		sc_esp
+#define sc_fp		sc_ebp
+#define sc_pc		sc_eip
+#define sc_ps		sc_efl
+#define sc_eflags	sc_efl
+	int		sc_trapno;
+	int		sc_err;
 };
 
 #endif /* !_ANSI_SOURCE && !_POSIX_SOURCE */