 @@ -1,14 +1,14 @@
-/*	$NetBSD: trap.c,v 1.138 2019/11/21 19:23:58 ad Exp $	*/
+/*	$NetBSD: trap.c,v 1.139 2020/08/10 10:51:21 rin Exp $	*/
 /*
  * Copyright (c) 1988 University of Utah.
  * Copyright (c) 1982, 1986, 1990 The Regents of the University of California.
  * All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * the Systems Programming Group of the University of Utah Computer
  * Science Department.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
 @@ -35,27 +35,27 @@
+ *
  * from: Utah $Hdr: trap.c 1.32 91/04/06$
+ *
  *	@(#)trap.c	7.15 (Berkeley) 8/2/91
  */
 #include "opt_ddb.h"
 #include "opt_execfmt.h"
 #include "opt_compat_sunos.h"
 #include "opt_fpu_emulate.h"
 #include "opt_m68k_arch.h"
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.138 2019/11/21 19:23:58 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.139 2020/08/10 10:51:21 rin Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
 #include <sys/acct.h>
 #include <sys/kernel.h>
 #include <sys/signalvar.h>
 #include <sys/resourcevar.h>
 #include <sys/syslog.h>
 #include <sys/syscall.h>
 #include <sys/userret.h>
 #include <sys/kauth.h>
 @@ -563,27 +563,27 @@ trap(struct frame *fp, int type, u_int c
 	 */
 	case T_ILLINST|T_USER:
 	case T_PRIVINST|T_USER:
 		ksi.ksi_addr = (void *)(int)fp->f_format;
 				/* XXX was ILL_PRIVIN_FAULT */
 		ksi.ksi_signo = SIGILL;
 		ksi.ksi_code = (type == (T_PRIVINST|T_USER)) ?
 			ILL_PRVOPC : ILL_ILLOPC;
 		break;
 	/*
 	 * divde by zero, CHK/TRAPV inst
 	 */
 	case T_ZERODIV|T_USER:
-		ksi.ksi_code = FPE_FLTDIV;
+		ksi.ksi_code = FPE_INTDIV;
 	case T_CHKINST|T_USER:
 	case T_TRAPVINST|T_USER:
 		ksi.ksi_addr = (void *)(int)fp->f_format;
 		ksi.ksi_signo = SIGFPE;
 		break;
 	case T_FPEMULI|T_USER:
 	case T_FPEMULD|T_USER:
 #ifdef FPU_EMULATE
 		if (fpu_emulate(fp, &pcb->pcb_fpregs, &ksi) == 0)
 			; /* XXX - Deal with tracing? (fp->f_sr & PSL_T) */
 #else
 		printf("pid %d killed: no floating point support\n", p->p_pid);
 @@ -664,27 +664,32 @@ trap(struct frame *fp, int type, u_int c
 	case T_TRAP15|T_USER:
 #ifdef COMPAT_SUNOS
 		/*
 		 * SunOS uses Trap #2 for a "CPU cache flush".
 		 * Just flush the on-chip caches and return.
 		 */
 		if (p->p_emul == &emul_sunos) {
 			ICIA();
 			DCIU();
 			return;
+		}
 #endif
 		fp->f_sr &= ~PSL_T;
 		ksi.ksi_addr = (void *)fp->f_pc;
 		ksi.ksi_signo = SIGTRAP;
 		if (type == (T_TRAP15|T_USER))
 			ksi.ksi_code = TRAP_BRKPT;
 		else
 			ksi.ksi_code = TRAP_TRACE;
 		break;
 	/*
 	 * Kernel AST (should not happen)
 	 */
 	case T_ASTFLT:
 		panictrap(type, code, v, fp);
 	/*
 	 * User AST
 	 */
 	case T_ASTFLT|T_USER:
 		astpending = 0;
 		spl0();
 		if (l->l_pflag & LP_OWEUPC) {

 @@ -1,14 +1,14 @@
-/*	$NetBSD: trap.c,v 1.150 2019/11/21 19:24:00 ad Exp $	*/
+/*	$NetBSD: trap.c,v 1.151 2020/08/10 10:51:21 rin Exp $	*/
 /*
  * Copyright (c) 1988 University of Utah.
  * Copyright (c) 1982, 1986, 1990, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * the Systems Programming Group of the University of Utah Computer
  * Science Department.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
 @@ -29,27 +29,27 @@
  * 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.
+ *
  * from: Utah $Hdr: trap.c 1.37 92/12/20$
+ *
  *	@(#)trap.c	8.5 (Berkeley) 1/4/94
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.150 2019/11/21 19:24:00 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.151 2020/08/10 10:51:21 rin Exp $");
 #include "opt_ddb.h"
 #include "opt_execfmt.h"
 #include "opt_fpu_emulate.h"
 #include "opt_kgdb.h"
 #include "opt_compat_sunos.h"
 #include "opt_m68k_arch.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
 #include <sys/acct.h>
 #include <sys/kernel.h>
 @@ -322,28 +322,28 @@ copyfault:
 		break;
 	case T_ILLINST|T_USER:	/* Illegal instruction fault */
 	case T_PRIVINST|T_USER:	/* Privileged instruction fault */
 		ksi.ksi_addr = (void *)(int)fp->f_format;
 				/* XXX was ILL_PRIVIN_FAULT */
 		ksi.ksi_signo = SIGILL;
 		ksi.ksi_code = (type == (T_PRIVINST|T_USER)) ?
 			ILL_PRVOPC : ILL_ILLOPC;
 		break;
 	/*
 	 * divde by zero, CHK/TRAPV inst
 	 */
-	case T_ZERODIV|T_USER:		/* Divide by zero trap */
+	case T_ZERODIV|T_USER:		/* Integer divide by zero trap */
-		ksi.ksi_code = FPE_FLTDIV;
+		ksi.ksi_code = FPE_INTDIV;
 	case T_CHKINST|T_USER:		/* CHK instruction trap */
 	case T_TRAPVINST|T_USER:	/* TRAPV instruction trap */
 		ksi.ksi_addr = (void *)(int)fp->f_format;
 		ksi.ksi_signo = SIGFPE;
 		break;
 	/*
 	 * User coprocessor violation
 	 */
 	case T_COPERR|T_USER:
 	/* XXX What is a proper response here? */
 		ksi.ksi_signo = SIGFPE;
 		ksi.ksi_code = FPE_FLTINV;
 @@ -447,27 +447,32 @@ copyfault:
 		 * SunOS uses Trap #2 for a "CPU cache flush".
 		 * Just flush the on-chip caches and return.
 		 */
 		if (p->p_emul == &emul_sunos) {
 			ICIA();
 			DCIU();
 			return;
+		}
 #endif
 		/* FALLTHROUGH */
 	case T_TRACE:		/* tracing a trap instruction */
 	case T_TRAP15|T_USER:	/* SUN user trace trap */
 		fp->f_sr &= ~PSL_T;
 		ksi.ksi_addr = (void *)fp->f_pc;
 		ksi.ksi_signo = SIGTRAP;
 		if (type == (T_TRAP15|T_USER))
 			ksi.ksi_code = TRAP_BRKPT;
 		else
 			ksi.ksi_code = TRAP_TRACE;
 		break;
 	case T_ASTFLT:		/* System async trap, cannot happen */
 		goto dopanic;
 	case T_ASTFLT|T_USER:	/* User async trap. */
 		astpending = 0;
 		/*
 		 * We check for software interrupts first.  This is because
 		 * they are at a higher level than ASTs, and on a VAX would
 		 * interrupt the AST.  We assume that if we are processing
 		 * an AST that we must be at IPL0 so we don't bother to
 		 * check.  Note that we ensure that we are at least at SIR

 @@ -1,14 +1,14 @@
-/*	$NetBSD: trap.c,v 1.146 2019/11/21 19:24:01 ad Exp $	*/
+/*	$NetBSD: trap.c,v 1.147 2020/08/10 10:51:21 rin Exp $	*/
 /*
  * Copyright (c) 1982, 1986, 1990, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * the Systems Programming Group of the University of Utah Computer
  * Science Department.
+ *
  * 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
 @@ -68,27 +68,27 @@
  * 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.
+ *
  *	from: Utah Hdr: trap.c 1.37 92/12/20
  *	from: @(#)trap.c	8.5 (Berkeley) 1/4/94
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.146 2019/11/21 19:24:01 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.147 2020/08/10 10:51:21 rin Exp $");
 #include "opt_ddb.h"
 #include "opt_execfmt.h"
 #include "opt_fpu_emulate.h"
 #include "opt_kgdb.h"
 #include "opt_compat_aout_m68k.h"
 #include "opt_compat_sunos.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
 #include <sys/acct.h>
 #include <sys/kernel.h>
 @@ -394,28 +394,28 @@ trap(struct trapframe *tf, int type, u_i
 		ksi.ksi_signo = SIGILL;
 		ksi.ksi_code = ILL_ILLOPC;
 #endif
 		break;
 	case T_ILLINST|T_USER:	/* illegal instruction fault */
 	case T_PRIVINST|T_USER:	/* privileged instruction fault */
 		ksi.ksi_addr = (void *)(int)tf->tf_format;
 		ksi.ksi_signo = SIGILL;
 		ksi.ksi_code = (type == (T_PRIVINST|T_USER)) ?
 			ILL_PRVOPC : ILL_ILLOPC;
 		break;
-	case T_ZERODIV|T_USER:	/* Divide by zero */
+	case T_ZERODIV|T_USER:	/* Integer divide by zero */
-		ksi.ksi_code = FPE_FLTDIV;
+		ksi.ksi_code = FPE_INTDIV;
 	case T_CHKINST|T_USER:	/* CHK instruction trap */
 	case T_TRAPVINST|T_USER:	/* TRAPV instruction trap */
 		ksi.ksi_addr = (void *)(int)tf->tf_format;
 		ksi.ksi_signo = SIGFPE;
 		break;
 	/*
 	 * XXX: Trace traps are a nightmare.
+	 *
 	 *	HP-UX uses trap #1 for breakpoints,
 	 *	NetBSD/m68k uses trap #2,
 	 *	SUN 3.x uses trap #15,
 	 *	DDB and KGDB uses trap #15 (for kernel breakpoints;
 @@ -440,27 +440,32 @@ trap(struct trapframe *tf, int type, u_i
 		 * XXX - Too bad NetBSD uses trap 2...
 		 */
 		if (p->p_emul == &emul_sunos) {
 			ICIA();
 			DCIU();
 			/* get out fast */
 			goto done;
+		}
 #endif
 		/* FALLTHROUGH */
 	case T_TRACE:		/* tracing a trap instruction */
 	case T_TRAP15|T_USER:	/* SUN user trace trap */
 		tf->tf_sr &= ~PSL_T;
 		ksi.ksi_addr = (void *)tf->tf_pc;
 		ksi.ksi_signo = SIGTRAP;
 		if (type == (T_TRAP15|T_USER))
 			ksi.ksi_code = TRAP_BRKPT;
 		else
 			ksi.ksi_code = TRAP_TRACE;
 		break;
 	case T_ASTFLT:		/* system async trap, cannot happen */
 		goto dopanic;
 	case T_ASTFLT|T_USER:	/* user async trap */
 		astpending = 0;
 		/* T_SSIR is not used on a Sun3. */
 		if (l->l_pflag & LP_OWEUPC) {
 			l->l_pflag &= ~LP_OWEUPC;
 			ADDUPROF(l);
+		}
 		goto douret;