patch-2.1.29 linux/include/asm-sparc64/sigcontext.h

Next file: linux/include/asm-sparc64/signal.h
Previous file: linux/include/asm-sparc64/semaphore.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.28/linux/include/asm-sparc64/sigcontext.h linux/include/asm-sparc64/sigcontext.h
@@ -1,6 +1,6 @@
-/* $Id: sigcontext.h,v 1.2 1997/01/19 22:32:15 ecd Exp $ */
-#ifndef _ASMsparc64_SIGCONTEXT_H
-#define _ASMsparc64_SIGCONTEXT_H
+/* $Id: sigcontext.h,v 1.3 1997/03/03 16:51:55 jj Exp $ */
+#ifndef __SPARC64_SIGCONTEXT_H
+#define __SPARC64_SIGCONTEXT_H
 
 #include <asm/ptrace.h>
 
@@ -15,7 +15,7 @@
 };
 
 /* This is what SunOS does, so shall I. */
-struct sigcontext {
+struct sigcontext32 {
 	int sigc_onstack;      /* state to restore */
 	int sigc_mask;         /* sigmask to restore */
 	int sigc_sp;           /* stack pointer */
@@ -32,19 +32,42 @@
 
 	/* stack ptrs for each regwin buf */
 	/* XXX 32-bit ptrs pinhead... */
-	char *sigc_spbuf[SUNOS_MAXWIN];
+	unsigned sigc_spbuf[SUNOS_MAXWIN];
 
 	/* Windows to restore after signal */
 	struct reg_window32 sigc_wbuf[SUNOS_MAXWIN];
 };
 
+/* This is what SunOS doesn't, so we have to write this alone. */
+struct sigcontext {
+	int sigc_onstack;      /* state to restore */
+	int sigc_mask;         /* sigmask to restore */
+	int sigc_sp;           /* stack pointer */
+	int sigc_pc;           /* program counter */
+	int sigc_npc;          /* next program counter */
+	int sigc_psr;          /* for condition codes etc */
+	int sigc_g1;           /* User uses these two registers */
+	int sigc_o0;           /* within the trampoline code. */
+
+	/* Now comes information regarding the users window set
+	 * at the time of the signal.
+	 */
+	int sigc_oswins;       /* outstanding windows */
+
+	/* stack ptrs for each regwin buf */
+	char *sigc_spbuf[SUNOS_MAXWIN];
+
+	/* Windows to restore after signal */
+	struct reg_window sigc_wbuf[SUNOS_MAXWIN];
+};
+
 typedef struct {
 	struct pt_regs32	si_regs;
 	int			si_mask;
 } __siginfo32_t;
 
 typedef struct {
-	unsigned int si_float_regs [64];
+	unsigned int si_float_regs [32];
 	unsigned int si_fsr;
 	unsigned int si_fpqdepth;
 	struct {
@@ -60,7 +83,7 @@
 } __siginfo_t;
 
 typedef struct {
-	unsigned   long si_float_regs [64];
+	unsigned   int si_float_regs [64];
 	unsigned   long si_fsr;
 	unsigned   int si_fpqdepth;
 	struct {
@@ -71,4 +94,4 @@
 
 #endif /* !(__ASSEMBLY__) */
 
-#endif /* !(_ASMsparc64_SIGCONTEXT_H) */
+#endif /* !(__SPARC64_SIGCONTEXT_H) */

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov