Module Name: src
Committed By: rin
Date: Thu Sep 1 06:10:58 UTC 2022
Modified Files:
src/sys/arch/powerpc/fpu: fpu_add.c fpu_div.c fpu_mul.c fpu_sqrt.c
fpu_subr.c
Log Message:
Do not raise SNaN exception for QNaN.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/powerpc/fpu/fpu_add.c \
src/sys/arch/powerpc/fpu/fpu_mul.c src/sys/arch/powerpc/fpu/fpu_subr.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/powerpc/fpu/fpu_div.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/powerpc/fpu/fpu_sqrt.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/powerpc/fpu/fpu_add.c
diff -u src/sys/arch/powerpc/fpu/fpu_add.c:1.5 src/sys/arch/powerpc/fpu/fpu_add.c:1.6
--- src/sys/arch/powerpc/fpu/fpu_add.c:1.5 Sat Jun 27 03:07:57 2020
+++ src/sys/arch/powerpc/fpu/fpu_add.c Thu Sep 1 06:10:58 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: fpu_add.c,v 1.5 2020/06/27 03:07:57 rin Exp $ */
+/* $NetBSD: fpu_add.c,v 1.6 2022/09/01 06:10:58 rin Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -47,7 +47,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fpu_add.c,v 1.5 2020/06/27 03:07:57 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fpu_add.c,v 1.6 2022/09/01 06:10:58 rin Exp $");
#include <sys/types.h>
#if defined(DIAGNOSTIC)||defined(DEBUG)
@@ -95,7 +95,8 @@ fpu_add(struct fpemu *fe)
DPRINTF(FPE_REG, ("=>\n"));
ORDER(x, y);
if (ISNAN(y)) {
- fe->fe_cx |= FPSCR_VXSNAN;
+ if (ISSNAN(y))
+ fe->fe_cx |= FPSCR_VXSNAN;
DUMPFPN(FPE_REG, y);
return (y);
}
Index: src/sys/arch/powerpc/fpu/fpu_mul.c
diff -u src/sys/arch/powerpc/fpu/fpu_mul.c:1.5 src/sys/arch/powerpc/fpu/fpu_mul.c:1.6
--- src/sys/arch/powerpc/fpu/fpu_mul.c:1.5 Sat Jun 27 03:07:57 2020
+++ src/sys/arch/powerpc/fpu/fpu_mul.c Thu Sep 1 06:10:58 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: fpu_mul.c,v 1.5 2020/06/27 03:07:57 rin Exp $ */
+/* $NetBSD: fpu_mul.c,v 1.6 2022/09/01 06:10:58 rin Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fpu_mul.c,v 1.5 2020/06/27 03:07:57 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fpu_mul.c,v 1.6 2022/09/01 06:10:58 rin Exp $");
#include <sys/types.h>
#if defined(DIAGNOSTIC)||defined(DEBUG)
@@ -134,7 +134,8 @@ fpu_mul(struct fpemu *fe)
ORDER(x, y);
if (ISNAN(y)) {
y->fp_sign ^= x->fp_sign;
- fe->fe_cx |= FPSCR_VXSNAN;
+ if (ISSNAN(y))
+ fe->fe_cx |= FPSCR_VXSNAN;
DUMPFPN(FPE_REG, y);
return (y);
}
Index: src/sys/arch/powerpc/fpu/fpu_subr.c
diff -u src/sys/arch/powerpc/fpu/fpu_subr.c:1.5 src/sys/arch/powerpc/fpu/fpu_subr.c:1.6
--- src/sys/arch/powerpc/fpu/fpu_subr.c:1.5 Sat Jun 27 03:07:57 2020
+++ src/sys/arch/powerpc/fpu/fpu_subr.c Thu Sep 1 06:10:58 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: fpu_subr.c,v 1.5 2020/06/27 03:07:57 rin Exp $ */
+/* $NetBSD: fpu_subr.c,v 1.6 2022/09/01 06:10:58 rin Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fpu_subr.c,v 1.5 2020/06/27 03:07:57 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fpu_subr.c,v 1.6 2022/09/01 06:10:58 rin Exp $");
#include <sys/types.h>
#if defined(DIAGNOSTIC)||defined(DEBUG)
@@ -213,7 +213,6 @@ fpu_newnan(struct fpemu *fe)
{
struct fpn *fp;
- fe->fe_cx |= FPSCR_VXSNAN;
fp = &fe->fe_f3;
fp->fp_class = FPC_QNAN;
fp->fp_sign = 0;
Index: src/sys/arch/powerpc/fpu/fpu_div.c
diff -u src/sys/arch/powerpc/fpu/fpu_div.c:1.6 src/sys/arch/powerpc/fpu/fpu_div.c:1.7
--- src/sys/arch/powerpc/fpu/fpu_div.c:1.6 Wed Jul 15 07:47:27 2020
+++ src/sys/arch/powerpc/fpu/fpu_div.c Thu Sep 1 06:10:58 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: fpu_div.c,v 1.6 2020/07/15 07:47:27 rin Exp $ */
+/* $NetBSD: fpu_div.c,v 1.7 2022/09/01 06:10:58 rin Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fpu_div.c,v 1.6 2020/07/15 07:47:27 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fpu_div.c,v 1.7 2022/09/01 06:10:58 rin Exp $");
#include <sys/types.h>
#if defined(DIAGNOSTIC)||defined(DEBUG)
@@ -183,7 +183,8 @@ fpu_div(struct fpemu *fe)
DPRINTF(FPE_REG, ("=>\n"));
if (ISNAN(x) || ISNAN(y)) {
ORDER(x, y);
- fe->fe_cx |= FPSCR_VXSNAN;
+ if (ISSNAN(x) || ISSNAN(y))
+ fe->fe_cx |= FPSCR_VXSNAN;
DUMPFPN(FPE_REG, y);
return (y);
}
Index: src/sys/arch/powerpc/fpu/fpu_sqrt.c
diff -u src/sys/arch/powerpc/fpu/fpu_sqrt.c:1.10 src/sys/arch/powerpc/fpu/fpu_sqrt.c:1.11
--- src/sys/arch/powerpc/fpu/fpu_sqrt.c:1.10 Tue May 24 20:00:49 2022
+++ src/sys/arch/powerpc/fpu/fpu_sqrt.c Thu Sep 1 06:10:58 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: fpu_sqrt.c,v 1.10 2022/05/24 20:00:49 andvar Exp $ */
+/* $NetBSD: fpu_sqrt.c,v 1.11 2022/09/01 06:10:58 rin Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fpu_sqrt.c,v 1.10 2022/05/24 20:00:49 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fpu_sqrt.c,v 1.11 2022/09/01 06:10:58 rin Exp $");
#include <sys/types.h>
#if defined(DIAGNOSTIC)||defined(DEBUG)
@@ -215,7 +215,8 @@ fpu_sqrt(struct fpemu *fe)
DUMPFPN(FPE_REG, x);
DPRINTF(FPE_REG, ("=>\n"));
if (ISNAN(x)) {
- fe->fe_cx |= FPSCR_VXSNAN;
+ if (ISSNAN(x))
+ fe->fe_cx |= FPSCR_VXSNAN;
DUMPFPN(FPE_REG, x);
return (x);
}
