Module Name:    src
Committed By:   nakayama
Date:           Fri May 20 21:42:49 UTC 2011

Modified Files:
        src/distrib/sets/lists/comp: md.sparc md.sparc64
        src/include: fenv.h
        src/lib/libm: Makefile
        src/lib/libm/arch/sparc64: fenv.c
        src/sys/arch/sparc/include: Makefile ieeefp.h
        src/sys/arch/sparc64/include: fenv.h
        src/tests/lib/libc/stdlib: t_strtod.c
Added Files:
        src/lib/libm/arch/sparc: fenv.c
        src/sys/arch/sparc/include: fenv.h

Log Message:
Add fenv support for sparc.  Mostly copied from sparc64 and share with it.


To generate a diff of this commit:
cvs rdiff -u -r1.72 -r1.73 src/distrib/sets/lists/comp/md.sparc
cvs rdiff -u -r1.97 -r1.98 src/distrib/sets/lists/comp/md.sparc64
cvs rdiff -u -r1.5 -r1.6 src/include/fenv.h
cvs rdiff -u -r1.109 -r1.110 src/lib/libm/Makefile
cvs rdiff -u -r0 -r1.1 src/lib/libm/arch/sparc/fenv.c
cvs rdiff -u -r1.1 -r1.2 src/lib/libm/arch/sparc64/fenv.c
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/sparc/include/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/arch/sparc/include/fenv.h
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/sparc/include/ieeefp.h
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/sparc64/include/fenv.h
cvs rdiff -u -r1.10 -r1.11 src/tests/lib/libc/stdlib/t_strtod.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/sets/lists/comp/md.sparc
diff -u src/distrib/sets/lists/comp/md.sparc:1.72 src/distrib/sets/lists/comp/md.sparc:1.73
--- src/distrib/sets/lists/comp/md.sparc:1.72	Thu Apr 14 10:07:49 2011
+++ src/distrib/sets/lists/comp/md.sparc	Fri May 20 21:42:48 2011
@@ -1,4 +1,4 @@
-# $NetBSD: md.sparc,v 1.72 2011/04/14 10:07:49 mrg Exp $
+# $NetBSD: md.sparc,v 1.73 2011/05/20 21:42:48 nakayama Exp $
 ./usr/include/ieeefp.h				comp-c-include
 ./usr/include/sparc				comp-c-include
 ./usr/include/sparc/_G_config.h			comp-obsolete		obsolete
@@ -20,6 +20,7 @@
 ./usr/include/sparc/endian.h			comp-c-include
 ./usr/include/sparc/endian_machdep.h		comp-c-include
 ./usr/include/sparc/fbio.h			comp-obsolete		obsolete
+./usr/include/sparc/fenv.h			comp-c-include
 ./usr/include/sparc/float.h			comp-c-include
 ./usr/include/sparc/frame.h			comp-c-include
 ./usr/include/sparc/fsr.h			comp-c-include

Index: src/distrib/sets/lists/comp/md.sparc64
diff -u src/distrib/sets/lists/comp/md.sparc64:1.97 src/distrib/sets/lists/comp/md.sparc64:1.98
--- src/distrib/sets/lists/comp/md.sparc64:1.97	Fri May 13 01:56:27 2011
+++ src/distrib/sets/lists/comp/md.sparc64	Fri May 20 21:42:48 2011
@@ -1,4 +1,4 @@
-# $NetBSD: md.sparc64,v 1.97 2011/05/13 01:56:27 christos Exp $
+# $NetBSD: md.sparc64,v 1.98 2011/05/20 21:42:48 nakayama Exp $
 ./usr/include/ieeefp.h				comp-c-include
 ./usr/include/sparc				comp-c-include
 ./usr/include/sparc/_G_config.h			comp-obsolete		obsolete
@@ -20,6 +20,7 @@
 ./usr/include/sparc/endian.h			comp-c-include
 ./usr/include/sparc/endian_machdep.h		comp-c-include
 ./usr/include/sparc/fbio.h			comp-obsolete		obsolete
+./usr/include/sparc/fenv.h			comp-c-include
 ./usr/include/sparc/float.h			comp-c-include
 ./usr/include/sparc/frame.h			comp-c-include
 ./usr/include/sparc/fsr.h			comp-c-include

Index: src/include/fenv.h
diff -u src/include/fenv.h:1.5 src/include/fenv.h:1.6
--- src/include/fenv.h:1.5	Mon May 16 14:50:36 2011
+++ src/include/fenv.h	Fri May 20 21:42:48 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: fenv.h,v 1.5 2011/05/16 14:50:36 martin Exp $	*/
+/*	$NetBSD: fenv.h,v 1.6 2011/05/20 21:42:48 nakayama Exp $	*/
 /*
  * Copyright (c) 2010 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -25,7 +25,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#if !defined(__i386__) && !defined(__amd64__) && !defined(__sparc_v9__)
+#if !defined(__i386__) && !defined(__amd64__) && !defined(__sparc__)
 #error	"fenv.h is currently not supported for this architecture"
 #endif
 

Index: src/lib/libm/Makefile
diff -u src/lib/libm/Makefile:1.109 src/lib/libm/Makefile:1.110
--- src/lib/libm/Makefile:1.109	Tue May 10 09:07:51 2011
+++ src/lib/libm/Makefile	Fri May 20 21:42:48 2011
@@ -1,4 +1,4 @@
-#  $NetBSD: Makefile,v 1.109 2011/05/10 09:07:51 jruoho Exp $
+#  $NetBSD: Makefile,v 1.110 2011/05/20 21:42:48 nakayama Exp $
 #
 #  @(#)Makefile 5.1beta 93/09/24
 #
@@ -50,6 +50,9 @@
 .if (${MACHINE_ARCH} == "alpha")
 .PATH: ${.CURDIR}/arch/alpha
 ARCH_SRCS = s_copysign.S s_copysignf.S lrint.S
+.elif (${MACHINE_ARCH} == "sparc")
+.PATH: ${.CURDIR}/arch/sparc
+COMMON_SRCS+= fenv.c
 .elif (${MACHINE_ARCH} == "sparc64")
 .PATH: ${.CURDIR}/arch/sparc64
 COMMON_SRCS+= fenv.c

Index: src/lib/libm/arch/sparc64/fenv.c
diff -u src/lib/libm/arch/sparc64/fenv.c:1.1 src/lib/libm/arch/sparc64/fenv.c:1.2
--- src/lib/libm/arch/sparc64/fenv.c:1.1	Mon Jan 31 00:19:33 2011
+++ src/lib/libm/arch/sparc64/fenv.c	Fri May 20 21:42:49 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: fenv.c,v 1.1 2011/01/31 00:19:33 christos Exp $	*/
+/*	$NetBSD: fenv.c,v 1.2 2011/05/20 21:42:49 nakayama Exp $	*/
 
 /*-
  * Copyright (c) 2004-2005 David Schultz <d...@freebsd.org>
@@ -24,11 +24,13 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  */
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: fenv.c,v 1.1 2011/01/31 00:19:33 christos Exp $");
+__RCSID("$NetBSD: fenv.c,v 1.2 2011/05/20 21:42:49 nakayama Exp $");
 
 #include <assert.h>
 #include <fenv.h>
 
+#ifdef __arch64__
+
 /* Load floating-point state register (all 64bits) */
 #define	__ldxfsr(__r)	__asm__	__volatile__		\
 	("ldx %0, %%fsr" : : "m" (__r))
@@ -37,6 +39,18 @@
 #define	__stxfsr(__r)	__asm__	__volatile__		\
 	("stx %%fsr, %0" : "=m" (*(__r)))
 
+#else /* !__arch64__ */
+
+/* Load floating-point state register (32bits) */
+#define	__ldxfsr(__r)	__asm__	__volatile__		\
+	("ld %0, %%fsr" : : "m" (__r))
+
+/* Save floating-point state register (32bits) */
+#define	__stxfsr(__r)	__asm__	__volatile__		\
+	("st %%fsr, %0" : "=m" (*(__r)))
+
+#endif /* __arch64__ */
+
 /*
  * The feclearexcept() function clears the supported floating-point exceptions
  * represented by `excepts'.

Index: src/sys/arch/sparc/include/Makefile
diff -u src/sys/arch/sparc/include/Makefile:1.29 src/sys/arch/sparc/include/Makefile:1.30
--- src/sys/arch/sparc/include/Makefile:1.29	Fri Feb  9 21:55:12 2007
+++ src/sys/arch/sparc/include/Makefile	Fri May 20 21:42:49 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.29 2007/02/09 21:55:12 ad Exp $
+#	$NetBSD: Makefile,v 1.30 2011/05/20 21:42:49 nakayama Exp $
 
 INCSDIR= /usr/include/sparc
 
@@ -7,7 +7,7 @@
 	cdefs.h cgtworeg.h cpu.h cpuconf.h \
 	disklabel.h \
 	eeprom.h elf_machdep.h endian.h endian_machdep.h \
-	float.h frame.h fsr.h \
+	fenv.h float.h frame.h fsr.h \
 	idprom.h ieee.h ieeefp.h \
 	int_const.h int_fmtio.h int_limits.h int_mwgwtypes.h int_types.h \
 	kbd.h kbio.h kcore.h \

Index: src/sys/arch/sparc/include/ieeefp.h
diff -u src/sys/arch/sparc/include/ieeefp.h:1.6 src/sys/arch/sparc/include/ieeefp.h:1.7
--- src/sys/arch/sparc/include/ieeefp.h:1.6	Sun Apr 24 11:32:36 2011
+++ src/sys/arch/sparc/include/ieeefp.h	Fri May 20 21:42:49 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: ieeefp.h,v 1.6 2011/04/24 11:32:36 tron Exp $	*/
+/*	$NetBSD: ieeefp.h,v 1.7 2011/05/20 21:42:49 nakayama Exp $	*/
 
 /*
  * Written by J.T. Conklin, Apr 6, 1995
@@ -12,11 +12,6 @@
 
 #if defined(_NETBSD_SOURCE) || defined(_ISOC99_SOURCE)
 
-#if !defined(__sparc64__)
-typedef int fenv_t;
-typedef int fexcept_t;
-#endif
-
 #define	FE_INEXACT	0x01	/* imprecise (loss of precision) */
 #define	FE_DIVBYZERO	0x02	/* divide-by-zero exception */
 #define	FE_UNDERFLOW	0x04	/* overflow exception */

Index: src/sys/arch/sparc64/include/fenv.h
diff -u src/sys/arch/sparc64/include/fenv.h:1.1 src/sys/arch/sparc64/include/fenv.h:1.2
--- src/sys/arch/sparc64/include/fenv.h:1.1	Mon Jan 31 00:19:34 2011
+++ src/sys/arch/sparc64/include/fenv.h	Fri May 20 21:42:49 2011
@@ -1,80 +1,3 @@
-/*	$NetBSD: fenv.h,v 1.1 2011/01/31 00:19:34 christos Exp $	*/
+/*	$NetBSD: fenv.h,v 1.2 2011/05/20 21:42:49 nakayama Exp $	*/
 
-/*-
- * Copyright (c) 2004-2005 David Schultz <d...@freebsd.org>
- * All rights reserved.
- *
- * 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
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * 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.
- *
- * $FreeBSD$
- */
-
-#ifndef	_SPARC64_FENV_H_
-#define	_SPARC64_FENV_H_
-
-#include <sys/stdint.h>
-
-typedef	uint64_t	fenv_t;
-typedef	uint64_t	fexcept_t;
-
-/*
- * Exception flags
- *
- * Symbols are defined in such a way, to correspond to the accrued
- * exception bits (aexc) fields of FSR.
- */
-#define	FE_INEXACT      0x00000020	/* 0000100000 */
-#define	FE_DIVBYZERO    0x00000040	/* 0001000000 */
-#define	FE_UNDERFLOW    0x00000080	/* 0010000000 */
-#define	FE_OVERFLOW     0x00000100	/* 0100000000 */
-#define	FE_INVALID	0x00000200	/* 1000000000 */
-
-#define	FE_ALL_EXCEPT	(FE_DIVBYZERO | FE_INEXACT | \
-    FE_INVALID | FE_OVERFLOW | FE_UNDERFLOW)
-
-/*
- * Rounding modes
- *
- * We can't just use the hardware bit values here, because that would
- * make FE_UPWARD and FE_DOWNWARD negative, which is not allowed.
- */
-#define	FE_TONEAREST	0x0
-#define	FE_TOWARDZERO	0x1
-#define	FE_UPWARD	0x2
-#define	FE_DOWNWARD	0x3
-#define	_ROUND_MASK	(FE_TONEAREST | FE_DOWNWARD | \
-    FE_UPWARD | FE_TOWARDZERO)
-#define	_ROUND_SHIFT	30
-
-__BEGIN_DECLS
-
-/* Default floating-point environment */
-extern const fenv_t	__fe_dfl_env;
-#define	FE_DFL_ENV	(&__fe_dfl_env)
-
-/* We need to be able to map status flag positions to mask flag positions */
-#define	_FPUSW_SHIFT	18
-#define	_ENABLE_MASK	(FE_ALL_EXCEPT << _FPUSW_SHIFT)
-
-__END_DECLS
-
-#endif	/* !_SPARC64_FENV_H_ */
+#include <sparc/fenv.h>

Index: src/tests/lib/libc/stdlib/t_strtod.c
diff -u src/tests/lib/libc/stdlib/t_strtod.c:1.10 src/tests/lib/libc/stdlib/t_strtod.c:1.11
--- src/tests/lib/libc/stdlib/t_strtod.c:1.10	Mon May 16 07:59:18 2011
+++ src/tests/lib/libc/stdlib/t_strtod.c	Fri May 20 21:42:49 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: t_strtod.c,v 1.10 2011/05/16 07:59:18 he Exp $ */
+/*	$NetBSD: t_strtod.c,v 1.11 2011/05/20 21:42:49 nakayama Exp $ */
 
 /*-
  * Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
 /* Public domain, Otto Moerbeek <o...@drijf.net>, 2006. */
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: t_strtod.c,v 1.10 2011/05/16 07:59:18 he Exp $");
+__RCSID("$NetBSD: t_strtod.c,v 1.11 2011/05/20 21:42:49 nakayama Exp $");
 
 #include <errno.h>
 #include <math.h>
@@ -43,7 +43,7 @@
 #include <atf-c.h>
 #include <atf-c/config.h>
 
-#if defined(__i386__) || defined(__amd64__) || defined(__sparc64__)
+#if defined(__i386__) || defined(__amd64__) || defined(__sparc__)
 #include <fenv.h>
 #endif
 
@@ -136,7 +136,7 @@
 
 ATF_TC_BODY(strtod_round, tc)
 {
-#if defined(__i386__) || defined(__amd64__) || defined(__sparc64__)
+#if defined(__i386__) || defined(__amd64__) || defined(__sparc__)
 
 	const char *val;
 	double d1, d2;

Added files:

Index: src/lib/libm/arch/sparc/fenv.c
diff -u /dev/null src/lib/libm/arch/sparc/fenv.c:1.1
--- /dev/null	Fri May 20 21:42:49 2011
+++ src/lib/libm/arch/sparc/fenv.c	Fri May 20 21:42:49 2011
@@ -0,0 +1,329 @@
+/*	$NetBSD: fenv.c,v 1.1 2011/05/20 21:42:49 nakayama Exp $	*/
+
+/*-
+ * Copyright (c) 2004-2005 David Schultz <d...@freebsd.org>
+ * All rights reserved.
+ *
+ * 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
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * 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
+ */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: fenv.c,v 1.1 2011/05/20 21:42:49 nakayama Exp $");
+
+#include <assert.h>
+#include <fenv.h>
+
+/* Load floating-point state register (32bits) */
+#define	__ldfsr(__r)	__asm__	__volatile__		\
+	("ld %0, %%fsr" : : "m" (__r))
+
+/* Save floating-point state register (32bits) */
+#define	__stfsr(__r)	__asm__	__volatile__		\
+	("st %%fsr, %0" : "=m" (*(__r)))
+
+/*
+ * The feclearexcept() function clears the supported floating-point exceptions
+ * represented by `excepts'.
+ */
+int
+feclearexcept(int excepts)
+{
+	fexcept_t r;
+	int ex;
+
+	_DIAGASSERT((excepts & ~FE_ALL_EXCEPT) == 0);
+
+	ex = excepts & FE_ALL_EXCEPT;
+
+	__stfsr(&r);
+	r &= ~ex;
+	__ldfsr(r);
+
+	/* Success */
+	return 0;
+}
+
+/*
+ * The fegetexceptflag() function stores an implementation-defined
+ * representation of the states of the floating-point status flags indicated
+ * by the argument excepts in the object pointed to by the argument flagp.
+ */
+int
+fegetexceptflag(fexcept_t *flagp, int excepts)
+{
+	fexcept_t r;
+	int ex;
+
+	_DIAGASSERT(flagp != NULL);
+	_DIAGASSERT((excepts & ~_FE_ALL_EXCEPT) == 0);
+
+	ex = excepts & FE_ALL_EXCEPT;
+
+	__stfsr(&r);
+	*flagp = r & ex;
+
+	/* Success */
+	return 0;
+}
+
+
+/*
+ * This function sets the floating-point status flags indicated by the argument
+ * `excepts' to the states stored in the object pointed to by `flagp'. It does
+ * NOT raise any floating-point exceptions, but only sets the state of the flags.
+ */
+int
+fesetexceptflag(const fexcept_t *flagp, int excepts)
+{
+	fexcept_t r;
+	int ex;
+
+	_DIAGASSERT(flagp != NULL);
+	_DIAGASSERT((excepts & ~FE_ALL_EXCEPT) == 0);
+
+	ex = excepts & FE_ALL_EXCEPT;
+
+	__stfsr(&r);
+	r &= ~ex;
+	r |= *flagp & ex;
+	__ldfsr(r);
+
+	/* Success */
+	return 0;
+}
+
+/*
+ * The feraiseexcept() function raises the supported floating-point exceptions
+ * represented by the argument `excepts'.
+ *
+ * The order in which these floating-point exceptions are raised is unspecified
+ * (by the standard).
+ */
+int
+feraiseexcept(int excepts)
+{
+	volatile double d;
+	int ex;
+
+	_DIAGASSERT((excepts & ~FE_ALL_EXCEPT) == 0);
+
+	ex = excepts & FE_ALL_EXCEPT;
+
+	/*
+	 * With a compiler that supports the FENV_ACCESS pragma properly, simple
+	 * expressions like '0.0 / 0.0' should be sufficient to generate traps.
+	 * Unfortunately, we need to bring a volatile variable into the equation
+	 * to prevent incorrect optimizations.
+	 */
+	if (ex & FE_INVALID) {
+		d = 0.0;
+		d = 0.0 / d;
+	}
+	if (ex & FE_DIVBYZERO) {
+		d = 0.0;
+		d = 1.0 / d;
+	}
+	if (ex & FE_OVERFLOW) {
+		d = 0x1.ffp1023;
+		d *= 2.0;
+	}
+	if (ex & FE_UNDERFLOW) {
+		d = 0x1p-1022;
+		d /= 0x1p1023;
+	}
+	if (ex & FE_INEXACT) {
+		d = 0x1p-1022;
+		d += 1.0;
+	}
+
+	/* Success */
+	return 0;
+}
+
+/*
+ * The fetestexcept() function determines which of a specified subset of the
+ * floating-point exception flags are currently set. The `excepts' argument
+ * specifies the floating-point status flags to be queried.
+ */
+int
+fetestexcept(int excepts)
+{
+	fexcept_t r;
+
+	_DIAGASSERT((excepts & ~FE_ALL_EXCEPT) == 0);
+
+	__stfsr(&r);
+
+	return r & (excepts & FE_ALL_EXCEPT);
+}
+
+/*
+ * The fegetround() function gets the current rounding direction.
+ */
+int
+fegetround(void)
+{
+	fenv_t r;
+
+	__stfsr(&r);
+
+	return (r >> _ROUND_SHIFT) & _ROUND_MASK;
+}
+
+/*
+ * The fesetround() function establishes the rounding direction represented by
+ * its argument `round'. If the argument is not equal to the value of a rounding
+ * direction macro, the rounding direction is not changed.
+ */
+int
+fesetround(int round)
+{
+	fenv_t r;
+
+	_DIAGASSERT((round & ~_ROUND_MASK) == 0);
+	if (round & ~_ROUND_MASK)
+		return -1;
+
+	__stfsr(&r);
+	r &= ~(_ROUND_MASK << _ROUND_SHIFT);
+	r |= round << _ROUND_SHIFT;
+	__ldfsr(r);
+
+	/* Success */
+	return 0;
+}
+
+/*
+ * The fegetenv() function attempts to store the current floating-point
+ * environment in the object pointed to by envp.
+ */
+int
+fegetenv(fenv_t *envp)
+{
+	_DIAGASSERT(envp != NULL);
+
+	__stfsr(envp);
+
+	/* Success */
+	return 0;
+}
+
+
+/*
+ * The feholdexcept() function saves the current floating-point environment
+ * in the object pointed to by envp, clears the floating-point status flags, and
+ * then installs a non-stop (continue on floating-point exceptions) mode, if
+ * available, for all floating-point exceptions.
+ */
+int
+feholdexcept(fenv_t *envp)
+{
+	fenv_t r;
+
+	_DIAGASSERT(envp != NULL);
+
+	__stfsr(&r);
+	*envp = r;
+	r &= ~(FE_ALL_EXCEPT | _ENABLE_MASK);
+	__ldfsr(r);
+
+	/* Success */
+	return 0;
+}
+
+/*
+ * The fesetenv() function attempts to establish the floating-point environment
+ * represented by the object pointed to by envp. The argument `envp' points
+ * to an object set by a call to fegetenv() or feholdexcept(), or equal a
+ * floating-point environment macro. The fesetenv() function does not raise
+ * floating-point exceptions, but only installs the state of the floating-point
+ * status flags represented through its argument.
+ */
+int
+fesetenv(const fenv_t *envp)
+{
+	_DIAGASSERT(envp != NULL);
+
+	__ldfsr(*envp);
+
+	/* Success */
+	return 0;
+}
+
+
+/*
+ * The feupdateenv() function saves the currently raised floating-point
+ * exceptions in its automatic storage, installs the floating-point environment
+ * represented by the object pointed to by `envp', and then raises the saved
+ * floating-point exceptions. The argument `envp' shall point to an object set
+ * by a call to feholdexcept() or fegetenv(), or equal a floating-point
+ * environment macro.
+ */
+int
+feupdateenv(const fenv_t *envp)
+{
+	fexcept_t r;
+
+	_DIAGASSERT(envp != NULL);
+
+	__stfsr(&r);
+	__ldfsr(*envp);
+
+	_DIAGASSERT((r & ~FE_ALL_EXCEPT) == 0);
+	feraiseexcept(r & FE_ALL_EXCEPT);
+
+	/* Success */
+	return 0;
+}
+
+/*
+ * The following functions are extentions to the standard
+ */
+int
+feenableexcept(int mask)
+{
+	fenv_t old_r, new_r;
+
+	__stfsr(&old_r);
+	new_r = old_r | ((mask & FE_ALL_EXCEPT) << _FPUSW_SHIFT);
+	__ldfsr(new_r);
+
+	return (old_r >> _FPUSW_SHIFT) & FE_ALL_EXCEPT;
+}
+
+int
+fedisableexcept(int mask)
+{
+	fenv_t old_r, new_r;
+
+	__stfsr(&old_r);
+	new_r = old_r & ~((mask & FE_ALL_EXCEPT) << _FPUSW_SHIFT);
+	__ldfsr(new_r);
+
+	return (old_r >> _FPUSW_SHIFT) & FE_ALL_EXCEPT;
+}
+
+int
+fegetexcept(void)
+{
+	fenv_t r;
+
+	__stfsr(&r);
+	return (r & _ENABLE_MASK) >> _FPUSW_SHIFT;
+}

Index: src/sys/arch/sparc/include/fenv.h
diff -u /dev/null src/sys/arch/sparc/include/fenv.h:1.1
--- /dev/null	Fri May 20 21:42:49 2011
+++ src/sys/arch/sparc/include/fenv.h	Fri May 20 21:42:49 2011
@@ -0,0 +1,85 @@
+/*	$NetBSD: fenv.h,v 1.1 2011/05/20 21:42:49 nakayama Exp $	*/
+
+/*-
+ * Copyright (c) 2004-2005 David Schultz <d...@freebsd.org>
+ * All rights reserved.
+ *
+ * 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
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * 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.
+ *
+ * $FreeBSD$
+ */
+
+#ifndef	_SPARC_FENV_H_
+#define	_SPARC_FENV_H_
+
+#include <sys/stdint.h>
+
+#ifdef __arch64__
+typedef	uint64_t	fenv_t;
+typedef	uint64_t	fexcept_t;
+#else
+typedef	uint32_t	fenv_t;
+typedef	uint32_t	fexcept_t;
+#endif
+
+/*
+ * Exception flags
+ *
+ * Symbols are defined in such a way, to correspond to the accrued
+ * exception bits (aexc) fields of FSR.
+ */
+#define	FE_INEXACT      0x00000020	/* 0000100000 */
+#define	FE_DIVBYZERO    0x00000040	/* 0001000000 */
+#define	FE_UNDERFLOW    0x00000080	/* 0010000000 */
+#define	FE_OVERFLOW     0x00000100	/* 0100000000 */
+#define	FE_INVALID	0x00000200	/* 1000000000 */
+
+#define	FE_ALL_EXCEPT	(FE_DIVBYZERO | FE_INEXACT | \
+    FE_INVALID | FE_OVERFLOW | FE_UNDERFLOW)
+
+/*
+ * Rounding modes
+ *
+ * We can't just use the hardware bit values here, because that would
+ * make FE_UPWARD and FE_DOWNWARD negative, which is not allowed.
+ */
+#define	FE_TONEAREST	0x0
+#define	FE_TOWARDZERO	0x1
+#define	FE_UPWARD	0x2
+#define	FE_DOWNWARD	0x3
+#define	_ROUND_MASK	(FE_TONEAREST | FE_DOWNWARD | \
+    FE_UPWARD | FE_TOWARDZERO)
+#define	_ROUND_SHIFT	30
+
+__BEGIN_DECLS
+
+/* Default floating-point environment */
+extern const fenv_t	__fe_dfl_env;
+#define	FE_DFL_ENV	(&__fe_dfl_env)
+
+/* We need to be able to map status flag positions to mask flag positions */
+#define	_FPUSW_SHIFT	18
+#define	_ENABLE_MASK	(FE_ALL_EXCEPT << _FPUSW_SHIFT)
+
+__END_DECLS
+
+#endif	/* !_SPARC_FENV_H_ */

Reply via email to