Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/netbsd-7]: src Pull up following revision(s) (requested by martin in tic...
details: https://anonhg.NetBSD.org/src/rev/3c17c0919bf5
branches: netbsd-7
changeset: 798871:3c17c0919bf5
user: snj <snj%NetBSD.org@localhost>
date: Tue Jan 20 20:57:24 2015 +0000
description:
Pull up following revision(s) (requested by martin in ticket #416):
distrib/sets/lists/comp/md.hppa: revision 1.3
include/fenv.h: revision 1.13 via patch
lib/libm/Makefile: revision 1.168
lib/libm/arch/hppa/fenv.c: revisions 1.1, 1.2
sys/arch/hppa/include/Makefile: revision 1.12
sys/arch/hppa/include/fenv.h: revisions 1.1, 1.2
sys/arch/hppa/include/ieeefp.h: revisions 1.5-1.7
tests/lib/libm/Makefile: revision 1.29 via patch
fenv(3) support for hppa
--
use unsigned over uint32_t so that this file works without stdint.h
being included before hand.
fixes mknative-gcc problems, and likely others.
--
Properly separate fenv.h and ieeefp.h by moving all fenv defines
over to the former.
Now that they are decoupled, make rounding modes match the hardware bits.
--
Simplify, now that rounding mode defines match the hardware bits.
diffstat:
distrib/sets/lists/comp/md.hppa | 3 +-
include/fenv.h | 3 +-
lib/libm/Makefile | 7 +-
lib/libm/arch/hppa/fenv.c | 350 ++++++++++++++++++++++++++++++++++++++++
sys/arch/hppa/include/Makefile | 4 +-
sys/arch/hppa/include/fenv.h | 60 ++++++
sys/arch/hppa/include/ieeefp.h | 36 +--
tests/lib/libm/Makefile | 3 +-
8 files changed, 434 insertions(+), 32 deletions(-)
diffs (truncated from 562 to 300 lines):
diff -r cfc4d804c14d -r 3c17c0919bf5 distrib/sets/lists/comp/md.hppa
--- a/distrib/sets/lists/comp/md.hppa Tue Jan 20 20:42:27 2015 +0000
+++ b/distrib/sets/lists/comp/md.hppa Tue Jan 20 20:57:24 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: md.hppa,v 1.2 2014/03/06 12:17:12 skrll Exp $
+# $NetBSD: md.hppa,v 1.2.6.1 2015/01/20 20:57:24 snj 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
diff -r cfc4d804c14d -r 3c17c0919bf5 include/fenv.h
--- a/include/fenv.h Tue Jan 20 20:42:27 2015 +0000
+++ b/include/fenv.h Tue Jan 20 20:57:24 2015 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: fenv.h,v 1.10 2014/08/10 05:57:30 matt Exp $ */
+/* $NetBSD: fenv.h,v 1.10.2.1 2015/01/20 20:57:24 snj 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(__sparc__) && !defined(__x86_64__)
#error "fenv.h is currently not supported for this architecture"
#endif
diff -r cfc4d804c14d -r 3c17c0919bf5 lib/libm/Makefile
--- a/lib/libm/Makefile Tue Jan 20 20:42:27 2015 +0000
+++ b/lib/libm/Makefile Tue Jan 20 20:57:24 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.164.2.1 2014/10/13 19:34:58 martin Exp $
+# $NetBSD: Makefile,v 1.164.2.2 2015/01/20 20:57:24 snj Exp $
#
# @(#)Makefile 5.1beta 93/09/24
#
@@ -75,6 +75,11 @@
.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
diff -r cfc4d804c14d -r 3c17c0919bf5 lib/libm/arch/hppa/fenv.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/lib/libm/arch/hppa/fenv.c Tue Jan 20 20:57:24 2015 +0000
@@ -0,0 +1,350 @@
+/* $NetBSD: fenv.c,v 1.2.2.2 2015/01/20 20:57:24 snj Exp $ */
+
+/*-
+ * Copyright (c) 2004-2005 David Schultz <das%FreeBSD.ORG@localhost>
+ * 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.2.2.2 2015/01/20 20:57:24 snj 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)
+
+/* 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_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;
+ r |= round;
+ 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);
+
Home |
Main Index |
Thread Index |
Old Index