From a16d76cb5680cf0afd1a3be9be9d1f7ea686a96c Mon Sep 17 00:00:00 2001 From: marcel Date: Wed, 29 Sep 1999 15:06:27 +0000 Subject: 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. --- sys/amd64/include/frame.h | 38 -------------------------------------- 1 file changed, 38 deletions(-) (limited to 'sys/amd64/include/frame.h') diff --git a/sys/amd64/include/frame.h b/sys/amd64/include/frame.h index b212d6c..634e690 100644 --- a/sys/amd64/include/frame.h +++ b/sys/amd64/include/frame.h @@ -40,8 +40,6 @@ #ifndef _MACHINE_FRAME_H_ #define _MACHINE_FRAME_H_ 1 -#include - /* * System stack frames. */ @@ -157,42 +155,6 @@ struct clockframe { int cf_ss; }; -/* - * Signal frame, arguments passed to application signal handlers. - */ -struct sigframe { - /* - * The first three members may be used by applications. - */ - - register_t sf_signum; - - /* - * Either 'int' for old-style FreeBSD handler or 'siginfo_t *' - * pointing to sf_siginfo for SA_SIGINFO handlers. - */ - register_t sf_arg2; - - /* Points to sf_siginfo.si_sc. */ - register_t sf_scp; - - /* - * The following arguments are not constrained by the - * function call protocol. - * Applications are not supposed to access these members, - * except using the pointers we provide in the first three - * arguments. - */ - char *sf_addr; - union { - __siginfohandler_t *sf_action; - __sighandler_t *sf_handler; - } sf_ahu; - - /* In the SA_SIGINFO case, sf_arg2 points here. */ - siginfo_t sf_siginfo; -}; - int kdb_trap __P((int, int, struct trapframe *)); extern int (*pmath_emulate) __P((struct trapframe *)); -- cgit v1.1