Merge changes from NetBSD, up to 3/19/97; undoes some local changes.

Changed to match new arch/m68k code.
genassym.cf is currently just a place holder.

1 files changed, 33 insertions, 4 deletions

diff --git a/sys/arch/hp300/include/hpux_machdep.h b/sys/arch/hp300/include/hpux_machdep.h
index 35dc0172934..7c6f14f1e9e 100644
--- a/sys/arch/hp300/include/hpux_machdep.h
+++ b/sys/arch/hp300/include/hpux_machdep.h
@@ -1,8 +1,8 @@
-/*	$OpenBSD: hpux_machdep.h,v 1.3 1997/01/12 15:13:36 downsj Exp $	*/
-/*	$NetBSD: hpux_machdep.h,v 1.3 1996/02/28 01:05:57 thorpej Exp $	*/
+/*	$OpenBSD: hpux_machdep.h,v 1.4 1997/03/26 08:32:46 downsj Exp $	*/
+/*	$NetBSD: hpux_machdep.h,v 1.6 1997/03/16 10:02:40 thorpej Exp $	*/
 
 /*-
- * Copyright (c) 1996 The NetBSD Foundation, Inc.
+ * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
  * All rights reserved.
  *
  * This code is derived from software contributed to The NetBSD Foundation
@@ -40,12 +40,41 @@
 #ifndef _MACHINE_HPUX_MACHDEP_H_
 #define _MACHINE_HPUX_MACHDEP_H_
 
+/*    
+ * Information pushed on stack when a signal is delivered.
+ * This is used by the kernel to restore state following
+ * execution of the signal handler.  It is also made available
+ * to the handler to allow it to restore state properly if
+ * a non-standard exit is performed. 
+ */
+struct hpuxsigcontext {
+	int	hsc_syscall;		/* ??? (syscall number?) */
+	char	hsc_action;		/* ??? */
+	char	hsc_pad1;
+	char	hsc_pad2;
+	char	hsc_onstack;		/* sigstack state to restore */
+	int	hsc_mask;		/* signal mask to restore */
+	int	hsc_sp;			/* sp to restore */
+	short	hsc_ps;			/* psl to restore */
+	int	hsc_pc;			/* pc to restore */
+
+	/*
+	 * The following are not actually used by HP-UX.  They exist
+	 * for the convenience of the compatibility code.
+	 */
+	short	_hsc_pad;
+	int	_hsc_ap;		/* pointer to hpuxsigstate */
+};
+
 int	hpux_cpu_makecmds __P((struct proc *, struct exec_package *));
 int	hpux_cpu_vmcmd __P((struct proc *, struct exec_vmcmd *));
 void	hpux_cpu_bsd_to_hpux_stat __P((struct stat *, struct hpux_stat *));
 void	hpux_cpu_uname __P((struct hpux_utsname *));
 int	hpux_cpu_sysconf_arch __P((void));
 int	hpux_to_bsd_uoff __P((int *, int *, struct proc *));
-int	hpux_dumpu __P((struct vnode *, struct ucred *));
+
+void	hpux_sendsig __P((sig_t, int, int, u_long, int, union sigval));
+void	hpux_setregs __P((struct proc *, struct exec_package *,
+	    u_long, register_t *));
 
 #endif /* ! _MACHINE_HPUX_MACHDEP_H_ */