 @@ -1,14 +1,14 @@
-/*	$NetBSD: fpu_add.c,v 1.6 2022/09/01 06:10:58 rin Exp $ */
+/*	$NetBSD: fpu_add.c,v 1.7 2022/09/06 23:04:08 rin Exp $ */
 /*
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This software was developed by the Computer Systems Engineering group
  * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
  * contributed to Berkeley.
+ *
  * All advertising materials mentioning features or use of this software
  * must display the following acknowledgement:
  *	This product includes software developed by the University of
  *	California, Lawrence Berkeley Laboratory.
 @@ -37,27 +37,27 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)fpu_add.c	8.1 (Berkeley) 6/11/93
  */
 /*
  * Perform an FPU add (return x + y).
+ *
  * To subtract, negate y and call add.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fpu_add.c,v 1.6 2022/09/01 06:10:58 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fpu_add.c,v 1.7 2022/09/06 23:04:08 rin Exp $");
 #include <sys/types.h>
 #if defined(DIAGNOSTIC)||defined(DEBUG)
 #include <sys/systm.h>
 #endif
 #include <powerpc/instr.h>
 #include <machine/fpu.h>
 #include <machine/reg.h>
 #include <powerpc/fpu/fpu_arith.h>
 #include <powerpc/fpu/fpu_emu.h>
 #include <powerpc/fpu/fpu_extern.h>
 @@ -83,33 +83,35 @@ fpu_add(struct fpemu *fe)
 	 *  - y is 0.  Implied: x = 0.
 	 *	If x and y differ in sign (one positive, one negative),
 	 *	the result is +0 except when rounding to -Inf.  If same:
 	 *	+0 + +0 = +0; -0 + -0 = -0.
 	 *  - x is 0.  Implied: y != 0.
 	 *	Result is y.
 	 *  - other.  Implied: both x and y are numbers.
 	 *	Do addition a la Hennessey & Patterson.
 	 */
 	DPRINTF(FPE_REG, ("fpu_add:\n"));
 	DUMPFPN(FPE_REG, x);
 	DUMPFPN(FPE_REG, y);
 	DPRINTF(FPE_REG, ("=>\n"));
-	ORDER(x, y);
+	if (ISNAN(x) || ISNAN(y)) {
-	if (ISNAN(y)) {
+		if (ISSNAN(x) || ISSNAN(y))
 		if (ISSNAN(y))
 			fe->fe_cx |= FPSCR_VXSNAN;
 		if (ISNAN(x))
 			y = x;
 		DUMPFPN(FPE_REG, y);
 		return (y);
+	}
 	ORDER(x, y);
 	if (ISINF(y)) {
 		if (ISINF(x) && x->fp_sign != y->fp_sign) {
 			fe->fe_cx |= FPSCR_VXISI;
 			return (fpu_newnan(fe));
+		}
 		DUMPFPN(FPE_REG, y);
 		return (y);
+	}
 	rd = ((fe->fe_fpscr) & FPSCR_RN);
 	if (ISZERO(y)) {
 		if (rd != FSR_RD_RM)	/* only -0 + -0 gives -0 */
 			y->fp_sign &= x->fp_sign;
 		else			/* any -0 operand gives -0 */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: fpu_mul.c,v 1.6 2022/09/01 06:10:58 rin Exp $ */
+/*	$NetBSD: fpu_mul.c,v 1.7 2022/09/06 23:04:08 rin Exp $ */
 /*
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This software was developed by the Computer Systems Engineering group
  * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
  * contributed to Berkeley.
+ *
  * All advertising materials mentioning features or use of this software
  * must display the following acknowledgement:
  *	This product includes software developed by the University of
  *	California, Lawrence Berkeley Laboratory.
 @@ -35,27 +35,27 @@
  * 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.
+ *
  *	@(#)fpu_mul.c	8.1 (Berkeley) 6/11/93
  */
 /*
  * Perform an FPU multiply (return x * y).
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fpu_mul.c,v 1.6 2022/09/01 06:10:58 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fpu_mul.c,v 1.7 2022/09/06 23:04:08 rin Exp $");
 #include <sys/types.h>
 #if defined(DIAGNOSTIC)||defined(DEBUG)
 #include <sys/systm.h>
 #endif
 #include <machine/fpu.h>
 #include <machine/reg.h>
 #include <powerpc/fpu/fpu_arith.h>
 #include <powerpc/fpu/fpu_emu.h>
 /*
 @@ -121,34 +121,36 @@ fpu_mul(struct fpemu *fe)
 	 *    case was taken care of earlier).
 	 *	If x = 0, the result is NaN.  Otherwise the result
 	 *	is y, with its sign reversed if x is negative.
 	 *  - x = 0.  Implied: y is 0 or number.
 	 *	The result is 0 (with XORed sign as usual).
 	 *  - other.  Implied: both x and y are numbers.
 	 *	The result is x * y (XOR sign, multiply bits, add exponents).
 	 */
 	DPRINTF(FPE_REG, ("fpu_mul:\n"));
 	DUMPFPN(FPE_REG, x);
 	DUMPFPN(FPE_REG, y);
 	DPRINTF(FPE_REG, ("=>\n"));
-	ORDER(x, y);
+	if (ISNAN(x) || ISNAN(y)) {
-	if (ISNAN(y)) {
+		if (ISSNAN(x) || ISSNAN(y))
 		y->fp_sign ^= x->fp_sign;
 		if (ISSNAN(y))
 			fe->fe_cx |= FPSCR_VXSNAN;
 		if (ISNAN(x))
 			SWAP(x, y);
 		y->fp_sign ^= x->fp_sign;
 		DUMPFPN(FPE_REG, y);
 		return (y);
+	}
 	ORDER(x, y);
 	if (ISINF(y)) {
 		if (ISZERO(x)) {
 			fe->fe_cx |= FPSCR_VXIMZ;
 			return (fpu_newnan(fe));
+		}
 		y->fp_sign ^= x->fp_sign;
 			DUMPFPN(FPE_REG, y);
 		return (y);
+	}
 	if (ISZERO(x)) {
 		x->fp_sign ^= y->fp_sign;
 		DUMPFPN(FPE_REG, x);
 		return (x);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: fpu_div.c,v 1.8 2022/09/04 13:32:14 rin Exp $ */
+/*	$NetBSD: fpu_div.c,v 1.9 2022/09/06 23:04:08 rin Exp $ */
 /*
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This software was developed by the Computer Systems Engineering group
  * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
  * contributed to Berkeley.
+ *
  * All advertising materials mentioning features or use of this software
  * must display the following acknowledgement:
  *	This product includes software developed by the University of
  *	California, Lawrence Berkeley Laboratory.
 @@ -35,27 +35,27 @@
  * 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.
+ *
  *	@(#)fpu_div.c	8.1 (Berkeley) 6/11/93
  */
 /*
  * Perform an FPU divide (return x / y).
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fpu_div.c,v 1.8 2022/09/04 13:32:14 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fpu_div.c,v 1.9 2022/09/06 23:04:08 rin Exp $");
 #include <sys/types.h>
 #if defined(DIAGNOSTIC)||defined(DEBUG)
 #include <sys/systm.h>
 #endif
 #include <machine/fpu.h>
 #include <machine/reg.h>
 #include <powerpc/fpu/fpu_arith.h>
 #include <powerpc/fpu/fpu_emu.h>
 /*
 @@ -172,29 +172,30 @@ fpu_div(struct fpemu *fe)
 	 *	Inf / 0   = Inf [i.e., return x]
 	 *	0 / Inf = 0 [i.e., return x]
 	 *	0 / num = 0 [i.e., return x]
 	 *	0 / 0   = NaN, plus NV exception
 	 *	num / Inf = 0
 	 *	num / num = num (do the divide)
 	 *	num / 0   = Inf, plus DZ exception
 	 */
 	DPRINTF(FPE_REG, ("fpu_div:\n"));
 	DUMPFPN(FPE_REG, x);
 	DUMPFPN(FPE_REG, y);
 	DPRINTF(FPE_REG, ("=>\n"));
 	if (ISNAN(x) || ISNAN(y)) {
 		ORDER(x, y);
 		if (ISSNAN(x) || ISSNAN(y))
 			fe->fe_cx |= FPSCR_VXSNAN;
 		if (ISNAN(x))
 			y = x;
 		DUMPFPN(FPE_REG, y);
 		return (y);
+	}
 	/*
 	 * Need to split the following out cause they generate different
 	 * exceptions.
 	 */
 	if (ISINF(x)) {
 		if (x->fp_class == y->fp_class) {
 			fe->fe_cx |= FPSCR_VXIDI;
 			return (fpu_newnan(fe));
+		}
 		DUMPFPN(FPE_REG, x);