6 files changed, 160 insertions, 66 deletions

diff --git a/sys/amd64/include/db_machdep.h b/sys/amd64/include/db_machdep.h
index d5022d81e92d..719c5564a3c1 100644
--- a/sys/amd64/include/db_machdep.h
+++ b/sys/amd64/include/db_machdep.h
@@ -30,6 +30,7 @@
 #define	_MACHINE_DB_MACHDEP_H_
 
 #include <machine/frame.h>
+#include <machine/trap.h>
 #include <machine/psl.h>
 
 #define i386_saved_state trapframe
diff --git a/sys/amd64/include/frame.h b/sys/amd64/include/frame.h
index b212d6c7b77f..634e6909e908 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 <sys/signal.h>
-
 /*
  * 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 *));
 
diff --git a/sys/amd64/include/setjmp.h b/sys/amd64/include/setjmp.h
index 173ea2d92f8c..3097df77f0a3 100644
--- a/sys/amd64/include/setjmp.h
+++ b/sys/amd64/include/setjmp.h
@@ -32,7 +32,7 @@
  *
  */
 
-#define	_JBLEN	8		/* Size of the jmp_buf on x86. */
+#define	_JBLEN	11		/* Size of the jmp_buf on x86. */
 
 /*
  * jmp_buf and sigjmp_buf are encapsulated in different structs to force
diff --git a/sys/amd64/include/sigframe.h b/sys/amd64/include/sigframe.h
new file mode 100644
index 000000000000..9c47915902c3
--- /dev/null
+++ b/sys/amd64/include/sigframe.h
@@ -0,0 +1,86 @@
+/*-
+ * Copyright (c) 1999 Marcel Moolenaar
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer 
+ *    in this position and unchanged.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * $FreeBSD$
+ */
+
+#ifndef _MACHINE_SIGFRAME_H_
+#define _MACHINE_SIGFRAME_H_ 1
+
+struct	osigframe {
+	/*
+	 * 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 {
+		__osiginfohandler_t	*sf_action;
+		__sighandler_t		*sf_handler;
+	} sf_ahu;
+
+	/* In the SA_SIGINFO case, sf_arg2 points here. */
+	osiginfo_t	sf_siginfo;
+};
+
+struct sigframe {
+	/*
+	 * The first three members may be used by applications.
+	 */
+	register_t	sf_signum;
+	register_t	sf_siginfo;		/* code or pointer to sf_si */
+	register_t	sf_ucontext;		/* points to sf_uc */
+	register_t	__spare__;		/* Align sf_ahu */
+	union {
+		__siginfohandler_t	*sf_action;
+		__sighandler_t		*sf_handler;
+	} sf_ahu;
+	register_t	sf_sigreturn;	/* sigreturn to use */
+	siginfo_t	sf_si;		/* = *sf_siginfo (SA_SIGINFO case) */
+	ucontext_t	sf_uc;		/* = *sf_ucontext */
+};
+
+#endif /* _MACHINE_SIGFRAME_H_ */
diff --git a/sys/amd64/include/signal.h b/sys/amd64/include/signal.h
index deaa06ca7923..e9f739e3a0b9 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 */
diff --git a/sys/amd64/include/ucontext.h b/sys/amd64/include/ucontext.h
new file mode 100644
index 000000000000..bdf2e1df2307
--- /dev/null
+++ b/sys/amd64/include/ucontext.h
@@ -0,0 +1,43 @@
+/*-
+ * Copyright (c) 1999 Marcel Moolenaar
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer 
+ *    in this position and unchanged.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * $FreeBSD$
+ */
+
+#ifndef _MACHINE_UCONTEXT_H_
+#define _MACHINE_UCONTEXT_H_ 1
+
+#include <machine/frame.h>
+
+typedef struct {
+	int		mc_gs;		/* %gs */
+	struct trapframe mc_tf;		/* trapframe */
+	int		mc_fpregs[28];	/* env87 + fpacc87 + u_long */
+	int		__spare__[17];
+} mcontext_t;
+
+#endif /* _MACHINE_UCONTEXT_H_ */