Module Name: src
Committed By: isaki
Date: Sat Mar 23 12:06:24 UTC 2013
Modified Files:
src/sys/arch/m68k/fpe: fpu_hyperb.c fpu_trig.c
Log Message:
Remove about updating fpsr. It was introduced by me but obviously
duplicated with fpu_emul_arith().
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/m68k/fpe/fpu_hyperb.c \
src/sys/arch/m68k/fpe/fpu_trig.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/m68k/fpe/fpu_hyperb.c
diff -u src/sys/arch/m68k/fpe/fpu_hyperb.c:1.6 src/sys/arch/m68k/fpe/fpu_hyperb.c:1.7
--- src/sys/arch/m68k/fpe/fpu_hyperb.c:1.6 Sat Oct 15 15:14:30 2011
+++ src/sys/arch/m68k/fpe/fpu_hyperb.c Sat Mar 23 12:06:24 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: fpu_hyperb.c,v 1.6 2011/10/15 15:14:30 tsutsui Exp $ */
+/* $NetBSD: fpu_hyperb.c,v 1.7 2013/03/23 12:06:24 isaki Exp $ */
/*
* Copyright (c) 1995 Ken Nakata
@@ -57,7 +57,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fpu_hyperb.c,v 1.6 2011/10/15 15:14:30 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fpu_hyperb.c,v 1.7 2013/03/23 12:06:24 isaki Exp $");
#include "fpu_emulate.h"
@@ -81,8 +81,6 @@ fpu_cosh(struct fpemu *fe)
struct fpn *r;
int hyperb = 1;
- fe->fe_fpsr &= ~FPSR_EXCP; /* clear all exceptions */
-
if (ISNAN(&fe->fe_f2))
return &fe->fe_f2;
@@ -95,7 +93,6 @@ fpu_cosh(struct fpemu *fe)
r = fpu_sincos_taylor(fe, &s0, 1, hyperb);
CPYFPN(&fe->fe_f2, r);
- fpu_upd_fpsr(fe, &fe->fe_f2);
return &fe->fe_f2;
}
@@ -106,8 +103,6 @@ fpu_sinh(struct fpemu *fe)
struct fpn *r;
int hyperb = 1;
- fe->fe_fpsr &= ~FPSR_EXCP; /* clear all exceptions */
-
if (ISNAN(&fe->fe_f2))
return &fe->fe_f2;
if (ISINF(&fe->fe_f2))
@@ -117,7 +112,6 @@ fpu_sinh(struct fpemu *fe)
r = fpu_sincos_taylor(fe, &s0, 2, hyperb);
CPYFPN(&fe->fe_f2, r);
- fpu_upd_fpsr(fe, &fe->fe_f2);
return &fe->fe_f2;
}
@@ -129,8 +123,6 @@ fpu_tanh(struct fpemu *fe)
struct fpn *r;
int sign;
- fe->fe_fpsr &= ~FPSR_EXCP; /* clear all exceptions */
-
if (ISNAN(&fe->fe_f2))
return &fe->fe_f2;
@@ -158,6 +150,5 @@ fpu_tanh(struct fpemu *fe)
CPYFPN(&fe->fe_f2, r);
- fpu_upd_fpsr(fe, &fe->fe_f2);
return &fe->fe_f2;
}
Index: src/sys/arch/m68k/fpe/fpu_trig.c
diff -u src/sys/arch/m68k/fpe/fpu_trig.c:1.6 src/sys/arch/m68k/fpe/fpu_trig.c:1.7
--- src/sys/arch/m68k/fpe/fpu_trig.c:1.6 Sat Oct 15 15:14:30 2011
+++ src/sys/arch/m68k/fpe/fpu_trig.c Sat Mar 23 12:06:24 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: fpu_trig.c,v 1.6 2011/10/15 15:14:30 tsutsui Exp $ */
+/* $NetBSD: fpu_trig.c,v 1.7 2013/03/23 12:06:24 isaki Exp $ */
/*
* Copyright (c) 1995 Ken Nakata
@@ -57,7 +57,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fpu_trig.c,v 1.6 2011/10/15 15:14:30 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fpu_trig.c,v 1.7 2013/03/23 12:06:24 isaki Exp $");
#include "fpu_emulate.h"
@@ -239,8 +239,6 @@ fpu_cos(struct fpemu *fe)
struct fpn *r;
int sign;
- fe->fe_fpsr &= ~FPSR_EXCP; /* clear all exceptions */
-
if (ISNAN(&fe->fe_f2))
return &fe->fe_f2;
if (ISINF(&fe->fe_f2))
@@ -319,7 +317,6 @@ fpu_cos(struct fpemu *fe)
CPYFPN(&fe->fe_f2, r);
fe->fe_f2.fp_sign = sign;
- fpu_upd_fpsr(fe, &fe->fe_f2);
return &fe->fe_f2;
}
@@ -354,8 +351,6 @@ fpu_sin(struct fpemu *fe)
struct fpn *r;
int sign;
- fe->fe_fpsr &= ~FPSR_EXCP; /* clear all exceptions */
-
if (ISNAN(&fe->fe_f2))
return &fe->fe_f2;
if (ISINF(&fe->fe_f2))
@@ -433,7 +428,6 @@ fpu_sin(struct fpemu *fe)
CPYFPN(&fe->fe_f2, r);
fe->fe_f2.fp_sign = sign;
- fpu_upd_fpsr(fe, &fe->fe_f2);
return &fe->fe_f2;
}
@@ -447,8 +441,6 @@ fpu_tan(struct fpemu *fe)
struct fpn s;
struct fpn *r;
- fe->fe_fpsr &= ~FPSR_EXCP; /* clear all exceptions */
-
if (ISNAN(&fe->fe_f2))
return &fe->fe_f2;
if (ISINF(&fe->fe_f2))
@@ -471,7 +463,6 @@ fpu_tan(struct fpemu *fe)
CPYFPN(&fe->fe_f2, r);
- fpu_upd_fpsr(fe, &fe->fe_f2);
return &fe->fe_f2;
}
@@ -490,6 +481,5 @@ fpu_sincos(struct fpemu *fe, int regc)
/* sin(x) */
CPYFPN(&fe->fe_f2, &x);
r = fpu_sin(fe);
- fpu_upd_fpsr(fe, r);
return r;
}
