Module Name:    src
Committed By:   rin
Date:           Wed Sep 14 05:55:08 UTC 2022

Modified Files:
        src/sys/arch/powerpc/fpu: fpu_implode.c

Log Message:
Fix logic for FPSCR[OX]; set FPSCR[FI] (and therefore FPSCR[XX]).


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/powerpc/fpu/fpu_implode.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_implode.c
diff -u src/sys/arch/powerpc/fpu/fpu_implode.c:1.23 src/sys/arch/powerpc/fpu/fpu_implode.c:1.24
--- src/sys/arch/powerpc/fpu/fpu_implode.c:1.23	Wed Sep 14 05:54:07 2022
+++ src/sys/arch/powerpc/fpu/fpu_implode.c	Wed Sep 14 05:55:08 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: fpu_implode.c,v 1.23 2022/09/14 05:54:07 rin Exp $ */
+/*	$NetBSD: fpu_implode.c,v 1.24 2022/09/14 05:55:08 rin Exp $ */
 
 /*
  * Copyright (c) 1992, 1993
@@ -46,7 +46,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fpu_implode.c,v 1.23 2022/09/14 05:54:07 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fpu_implode.c,v 1.24 2022/09/14 05:55:08 rin Exp $");
 
 #include <sys/types.h>
 #include <sys/systm.h>
@@ -416,7 +416,7 @@ fpu_ftos(struct fpemu *fe, struct fpn *f
 	if (round(fe, fp, cx) && fp->fp_mant[3] == SNG_EXP(2))
 		exp++;
 	if (exp >= SNG_EXP_INFNAN) {
-		*cx |= FPSCR_OX;
+		*cx |= FPSCR_OX | FPSCR_FI;
 		/* overflow to inf or to max single */
 		if (toinf(fe, sign)) {
 			*cx |= FPRF_SIGN(sign) | FPSCR_FU;
@@ -486,7 +486,7 @@ fpu_ftod(struct fpemu *fe, struct fpn *f
 	if (round(fe, fp, cx) && fp->fp_mant[2] == DBL_EXP(2))
 		exp++;
 	if (exp >= DBL_EXP_INFNAN) {
-		*cx |= FPSCR_OX;
+		*cx |= FPSCR_OX | FPSCR_FI;
 		/* overflow to inf or to max double */
 		if (toinf(fe, sign)) {
 			*cx |= FPRF_SIGN(sign) | FPSCR_FU;

Reply via email to