Module Name: src
Committed By: martin
Date: Sat Dec 27 16:54:03 UTC 2014
Modified Files:
src/distrib/sets/lists/comp: md.hppa
src/include: fenv.h
src/lib/libm: Makefile
src/sys/arch/hppa/include: Makefile ieeefp.h
src/tests/lib/libm: Makefile
Added Files:
src/lib/libm/arch/hppa: fenv.c
src/sys/arch/hppa/include: fenv.h
Log Message:
fenv(3) support for hppa
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/distrib/sets/lists/comp/md.hppa
cvs rdiff -u -r1.12 -r1.13 src/include/fenv.h
cvs rdiff -u -r1.167 -r1.168 src/lib/libm/Makefile
cvs rdiff -u -r0 -r1.1 src/lib/libm/arch/hppa/fenv.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/hppa/include/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/arch/hppa/include/fenv.h
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/hppa/include/ieeefp.h
cvs rdiff -u -r1.28 -r1.29 src/tests/lib/libm/Makefile
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.hppa
diff -u src/distrib/sets/lists/comp/md.hppa:1.2 src/distrib/sets/lists/comp/md.hppa:1.3
--- src/distrib/sets/lists/comp/md.hppa:1.2 Thu Mar 6 12:17:12 2014
+++ src/distrib/sets/lists/comp/md.hppa Sat Dec 27 16:54:02 2014
@@ -1,4 +1,4 @@
-# $NetBSD: md.hppa,v 1.2 2014/03/06 12:17:12 skrll Exp $
+# $NetBSD: md.hppa,v 1.3 2014/12/27 16:54:02 martin Exp $
./usr/include/gcc-4.5/tgmath.h comp-c-include gcccmds,gcc=45
./usr/include/gcc-4.8/tgmath.h comp-c-include gcccmds,gcc=48
./usr/include/hp700 comp-obsolete obsolete
@@ -79,6 +79,7 @@
./usr/include/hppa/endian.h comp-c-include
./usr/include/hppa/endian_machdep.h comp-c-include
./usr/include/hppa/exec.h comp-c-include
+./usr/include/hppa/fenv.h comp-c-include
./usr/include/hppa/float.h comp-c-include
./usr/include/hppa/frame.h comp-c-include
./usr/include/hppa/ieee.h comp-c-include
Index: src/include/fenv.h
diff -u src/include/fenv.h:1.12 src/include/fenv.h:1.13
--- src/include/fenv.h:1.12 Fri Sep 19 17:39:15 2014
+++ src/include/fenv.h Sat Dec 27 16:54:02 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: fenv.h,v 1.12 2014/09/19 17:39:15 matt Exp $ */
+/* $NetBSD: fenv.h,v 1.13 2014/12/27 16:54:02 martin Exp $ */
/*
* Copyright (c) 2010 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -26,6 +26,7 @@
*/
#if !defined(__aarch64__) && !defined(__arm__) && !defined(__i386__) \
+ && !defined(__hppa__) \
&& !defined(__or1k__) && !defined(__riscv__) && !defined(__sparc__) \
&& !defined(__x86_64__)
#error "fenv.h is currently not supported for this architecture"
Index: src/lib/libm/Makefile
diff -u src/lib/libm/Makefile:1.167 src/lib/libm/Makefile:1.168
--- src/lib/libm/Makefile:1.167 Mon Nov 17 16:53:23 2014
+++ src/lib/libm/Makefile Sat Dec 27 16:54:02 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.167 2014/11/17 16:53:23 christos Exp $
+# $NetBSD: Makefile,v 1.168 2014/12/27 16:54:02 martin Exp $
#
# @(#)Makefile 5.1beta 93/09/24
#
@@ -75,6 +75,11 @@ COPTS.fenv.c+= -mfpu=vfp
.PATH.S: ${.CURDIR}/arch/arm
ARCH_SRCS = e_sqrt.S e_sqrtf.S lrint.S lrintf.S s_fabsf.S s_fma.S s_fmaf.S
.endif
+.elif (${LIBC_MACHINE_ARCH} == "hppa")
+.PATH.c: ${.CURDIR}/arch/hppa
+COMMON_SRCS+= fenv.c s_nexttowardf.c \
+ s_nearbyint.c s_rintl.c
+COPTS.e_sqrtl.c += -DHAVE_FENV_H
.elif (${LIBC_MACHINE_ARCH} == "sparc")
.PATH: ${.CURDIR}/arch/sparc
COMMON_SRCS+= fenv.c
Index: src/sys/arch/hppa/include/Makefile
diff -u src/sys/arch/hppa/include/Makefile:1.11 src/sys/arch/hppa/include/Makefile:1.12
--- src/sys/arch/hppa/include/Makefile:1.11 Mon Feb 24 07:23:43 2014
+++ src/sys/arch/hppa/include/Makefile Sat Dec 27 16:54:03 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2014/02/24 07:23:43 skrll Exp $
+# $NetBSD: Makefile,v 1.12 2014/12/27 16:54:03 martin Exp $
INCSDIR= /usr/include/hppa
@@ -7,7 +7,7 @@ INCS= ansi.h aout_machdep.h asm.h autoco
cdefs.h cpu.h cpufunc.h \
disklabel.h \
eisa_machdep.h elf_machdep.h endian.h endian_machdep.h exec.h \
- float.h frame.h \
+ fenv.h float.h frame.h \
ieee.h ieeefp.h intr.h intrdefs.h iomod.h isa_machdep.h \
int_const.h int_fmtio.h int_limits.h int_mwgwtypes.h int_types.h \
kcore.h \
Index: src/sys/arch/hppa/include/ieeefp.h
diff -u src/sys/arch/hppa/include/ieeefp.h:1.4 src/sys/arch/hppa/include/ieeefp.h:1.5
--- src/sys/arch/hppa/include/ieeefp.h:1.4 Tue Aug 5 16:47:42 2008
+++ src/sys/arch/hppa/include/ieeefp.h Sat Dec 27 16:54:03 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ieeefp.h,v 1.4 2008/08/05 16:47:42 matt Exp $ */
+/* $NetBSD: ieeefp.h,v 1.5 2014/12/27 16:54:03 martin Exp $ */
/*
* Written by J.T. Conklin, Apr 6, 1995
@@ -12,8 +12,8 @@
#if defined(_NETBSD_SOURCE) || defined(_ISOC99_SOURCE)
-typedef int fenv_t;
-typedef int fexcept_t;
+typedef uint32_t fenv_t;
+typedef uint32_t fexcept_t;
#define FE_INEXACT 0x01 /* imprecise (loss of precision) */
#define FE_UNDERFLOW 0x02 /* underflow exception */
Index: src/tests/lib/libm/Makefile
diff -u src/tests/lib/libm/Makefile:1.28 src/tests/lib/libm/Makefile:1.29
--- src/tests/lib/libm/Makefile:1.28 Mon Dec 22 11:21:08 2014
+++ src/tests/lib/libm/Makefile Sat Dec 27 16:54:03 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2014/12/22 11:21:08 martin Exp $
+# $NetBSD: Makefile,v 1.29 2014/12/27 16:54:03 martin Exp $
.include <bsd.own.mk>
@@ -6,6 +6,7 @@ TESTSDIR= ${TESTSBASE}/lib/libm
# ARM fenv is incomplete, so we can not enable that here
.if ${MACHINE_CPU} == "aarch64" \
+ || ${MACHINE_ARCH} == "hppa" \
|| ${MACHINE_ARCH} == "sparc" || ${MACHINE_ARCH} == "sparc64" \
|| ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
CPPFLAGS+= -DHAVE_FENV_H
Added files:
Index: src/lib/libm/arch/hppa/fenv.c
diff -u /dev/null src/lib/libm/arch/hppa/fenv.c:1.1
--- /dev/null Sat Dec 27 16:54:03 2014
+++ src/lib/libm/arch/hppa/fenv.c Sat Dec 27 16:54:02 2014
@@ -0,0 +1,355 @@
+/* $NetBSD: fenv.c,v 1.1 2014/12/27 16:54:02 martin Exp $ */
+
+/*-
+ * Copyright (c) 2004-2005 David Schultz <[email protected]>
+ * 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 2014/12/27 16:54:02 martin Exp $");
+
+#include <assert.h>
+#include <fenv.h>
+
+/*
+ * Convert from exception flags (__BITS(27,32)) to exception enable bits
+ * (__BITS(5,0)) by right-shifting this much:
+ */
+#define FE_FLAGS_SHIFT 27
+
+/*
+ * Mask all rounding mode bits
+ */
+#define FE_ROUND_MASK (FE_TONEAREST | FE_DOWNWARD | \
+ FE_UPWARD | FE_TOWARDZERO)
+
+/*
+ * Our constants start at bit 0, while the fpsr bitfield starts at 9
+ */
+#define FE_ROUND_SHIFT 9
+
+/* Load lower 32 bits from floating-point state register */
+static inline uint32_t
+readfpsr(void)
+{
+ uint32_t rv;
+
+ __asm__ __volatile__ ("fstws %%fr0, %0" : "=m"(rv));
+ return rv;
+}
+
+/* Save floating-point state register */
+static inline void
+writefpsr(uint32_t val)
+{
+ __asm__ __volatile__("fldws %0,%%fr0" : : "m"(val));
+}
+
+/*
+ * 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) << FE_FLAGS_SHIFT;
+
+ r = readfpsr();
+ r &= ~ex;
+ writefpsr(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) << FE_FLAGS_SHIFT;
+
+ r = readfpsr();
+ *flagp = (r & ex) >> FE_FLAGS_SHIFT;
+
+ /* 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) << FE_FLAGS_SHIFT;
+
+ r = readfpsr();
+ r &= ~ex;
+ r |= (*flagp << FE_FLAGS_SHIFT) & ex;
+ writefpsr(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);
+
+ r = readfpsr();
+
+ return (r >> FE_FLAGS_SHIFT) & (excepts & FE_ALL_EXCEPT);
+}
+
+/*
+ * The fegetround() function gets the current rounding direction.
+ */
+int
+fegetround(void)
+{
+ fenv_t r;
+
+ r = readfpsr();
+
+ return (r>>FE_ROUND_SHIFT) & FE_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 & ~FE_ROUND_MASK) == 0);
+ if (round & ~FE_ROUND_MASK)
+ return -1;
+
+ r = readfpsr();
+ r &= ~(FE_ROUND_MASK << FE_ROUND_SHIFT);
+ r |= round << FE_ROUND_SHIFT;
+ writefpsr(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);
+
+ *envp = readfpsr();
+
+ /* 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);
+
+ r = readfpsr();
+ *envp = r;
+ r &= ~FE_ALL_EXCEPT;
+ writefpsr(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);
+
+ writefpsr(*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);
+
+ r = readfpsr();
+ writefpsr(*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;
+
+ old_r = readfpsr();
+ new_r = old_r | (mask & FE_ALL_EXCEPT);
+ writefpsr(new_r);
+
+ return old_r & FE_ALL_EXCEPT;
+}
+
+int
+fedisableexcept(int mask)
+{
+ fenv_t old_r, new_r;
+
+ old_r = readfpsr();
+ new_r = old_r & ~(mask & FE_ALL_EXCEPT);
+ writefpsr(new_r);
+
+ return old_r & FE_ALL_EXCEPT;
+}
+
+int
+fegetexcept(void)
+{
+ fenv_t r;
+
+ r = readfpsr();
+ return r & FE_ALL_EXCEPT;
+}
Index: src/sys/arch/hppa/include/fenv.h
diff -u /dev/null src/sys/arch/hppa/include/fenv.h:1.1
--- /dev/null Sat Dec 27 16:54:03 2014
+++ src/sys/arch/hppa/include/fenv.h Sat Dec 27 16:54:03 2014
@@ -0,0 +1,44 @@
+/* $NetBSD: fenv.h,v 1.1 2014/12/27 16:54:03 martin Exp $ */
+
+/*-
+ * Copyright (c) 2014 The NetBSD Foundation, Inc.
+ * 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.
+ *
+ */
+
+#ifndef _HPPA_FENV_H_
+#define _HPPA_FENV_H_
+
+#include <sys/stdint.h>
+#include <machine/ieeefp.h>
+
+__BEGIN_DECLS
+
+/* Default floating-point environment */
+extern const fenv_t __fe_dfl_env;
+#define FE_DFL_ENV (&__fe_dfl_env)
+
+__END_DECLS
+
+#endif /* !_HPPA_FENV_H_ */
