Module Name: src Committed By: scole Date: Thu Feb 23 02:03:27 UTC 2017
Modified Files: src/sys/arch/ia64/include: Makefile ieeefp.h Added Files: src/sys/arch/ia64/include: fenv.h Log Message: Add fenv.h for ia64, imported from FreeBSD, compile tested only. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/arch/ia64/include/Makefile cvs rdiff -u -r0 -r1.1 src/sys/arch/ia64/include/fenv.h cvs rdiff -u -r1.1 -r1.2 src/sys/arch/ia64/include/ieeefp.h 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/ia64/include/Makefile diff -u src/sys/arch/ia64/include/Makefile:1.7 src/sys/arch/ia64/include/Makefile:1.8 --- src/sys/arch/ia64/include/Makefile:1.7 Fri Aug 5 16:56:43 2016 +++ src/sys/arch/ia64/include/Makefile Thu Feb 23 02:03:27 2017 @@ -1,11 +1,11 @@ -# $NetBSD: Makefile,v 1.7 2016/08/05 16:56:43 scole Exp $ +# $NetBSD: Makefile,v 1.8 2017/02/23 02:03:27 scole Exp $ INCSDIR= /usr/include/ia64 INCS= _regset.h acpi_machdep.h ansi.h \ aout_machdep.h asm.h atomic.h bootinfo.h bswap.h cdefs.h \ - cpu.h cpufunc.h dig64.h disklabel.h efi.h \ - elf_machdep.h endian.h endian_machdep.h float.h fpu.h frame.h \ + cpu.h cpufunc.h dig64.h disklabel.h efi.h elf_machdep.h \ + endian.h endian_machdep.h fenv.h float.h fpu.h frame.h \ ia64_cpu.h ieee.h ieeefp.h int_const.h int_fmtio.h int_limits.h \ int_mwgwtypes.h int_types.h intr.h limits.h \ loadfile_machdep.h lock.h math.h mca_machdep.h mcontext.h md_var.h \ Index: src/sys/arch/ia64/include/ieeefp.h diff -u src/sys/arch/ia64/include/ieeefp.h:1.1 src/sys/arch/ia64/include/ieeefp.h:1.2 --- src/sys/arch/ia64/include/ieeefp.h:1.1 Wed Dec 26 19:43:10 2012 +++ src/sys/arch/ia64/include/ieeefp.h Thu Feb 23 02:03:27 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: ieeefp.h,v 1.1 2012/12/26 19:43:10 martin Exp $ */ +/* $NetBSD: ieeefp.h,v 1.2 2017/02/23 02:03:27 scole Exp $ */ /* * Written by J.T. Conklin, Apr 28, 1995 @@ -12,26 +12,19 @@ #if defined(_NETBSD_SOURCE) || defined(_ISOC99_SOURCE) -typedef int fenv_t; -typedef int fexcept_t; - -#define FE_INVALID 0x01 /* invalid operation exception */ -#define FE_DIVBYZERO 0x02 /* divide-by-zero exception */ -#define FE_OVERFLOW 0x04 /* overflow exception */ -#define FE_UNDERFLOW 0x08 /* underflow exception */ -#define FE_INEXACT 0x10 /* imprecise (loss of precision; "inexact") */ -#define FE_IOVERFLOW 0x20 /* integer overflow */ - -#define FE_ALL_EXCEPT 0x3f +#include <ia64/fenv.h> /* * These bits match the fpcr as well as bits 12:11 * in fp operate instructions */ +/* XXX remove since fenv.h now contains (but with different values)? */ +#if 0 #define FE_TOWARDZERO 0 /* round to zero (truncate) */ #define FE_DOWNWARD 1 /* round toward negative infinity */ #define FE_TONEAREST 2 /* round to nearest representable number */ #define FE_UPWARD 3 /* round toward positive infinity */ +#endif #if !defined(_ISOC99_SOURCE) Added files: Index: src/sys/arch/ia64/include/fenv.h diff -u /dev/null src/sys/arch/ia64/include/fenv.h:1.1 --- /dev/null Thu Feb 23 02:03:27 2017 +++ src/sys/arch/ia64/include/fenv.h Thu Feb 23 02:03:27 2017 @@ -0,0 +1,248 @@ +/*- + * 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: releng/10.1/lib/msun/ia64/fenv.h 226218 2011-10-10 15:43:09Z das $ + */ + +#ifndef _IA64_FENV_H_ +#define _IA64_FENV_H_ + +#include <sys/stdint.h> + +#ifndef __fenv_static +#define __fenv_static static +#endif + +typedef __uint64_t fenv_t; +typedef __uint16_t fexcept_t; + +/* Exception flags */ +#define FE_INVALID 0x01 +#define FE_DENORMAL 0x02 +#define FE_DIVBYZERO 0x04 +#define FE_OVERFLOW 0x08 +#define FE_UNDERFLOW 0x10 +#define FE_INEXACT 0x20 +#define FE_ALL_EXCEPT (FE_DIVBYZERO | FE_DENORMAL | FE_INEXACT | \ + FE_INVALID | FE_OVERFLOW | FE_UNDERFLOW) + +/* Rounding modes */ +#define FE_TONEAREST 0x0000 +#define FE_DOWNWARD 0x0400 +#define FE_UPWARD 0x0800 +#define FE_TOWARDZERO 0x0c00 +#define _ROUND_MASK (FE_TONEAREST | FE_DOWNWARD | \ + FE_UPWARD | FE_TOWARDZERO) + +__BEGIN_DECLS + +/* Default floating-point environment */ +extern const fenv_t __fe_dfl_env; +#define FE_DFL_ENV (&__fe_dfl_env) + +#define _FPUSW_SHIFT 13 + +#define __stfpsr(__r) __asm __volatile("mov %0=ar.fpsr" : "=r" (*(__r))) +#define __ldfpsr(__r) __asm __volatile("mov ar.fpsr=%0;;" : : "r" (__r)) + +__fenv_static inline int +feclearexcept(int __excepts) +{ + fenv_t __fpsr; + + __stfpsr(&__fpsr); + __fpsr &= ~((fenv_t)__excepts << _FPUSW_SHIFT); + __ldfpsr(__fpsr); + return (0); +} + +__fenv_static inline int +fegetexceptflag(fexcept_t *__flagp, int __excepts) +{ + fenv_t __fpsr; + + __stfpsr(&__fpsr); + *__flagp = (fexcept_t)(__fpsr >> _FPUSW_SHIFT) & __excepts; + return (0); +} + +__fenv_static inline int +fesetexceptflag(const fexcept_t *__flagp, int __excepts) +{ + fenv_t __fpsr; + + __stfpsr(&__fpsr); + __fpsr &= ~((fenv_t)__excepts << _FPUSW_SHIFT); + __fpsr |= (fenv_t)(__excepts & *__flagp) << _FPUSW_SHIFT; + __ldfpsr(__fpsr); + return (0); +} + +/* + * It is worthwhile to use the inline version of this function iff it + * is called with arguments that are compile-time constants (due to + * dead code elimination). Unfortunately, gcc isn't smart enough to + * figure this out automatically, and there's no way to tell it. + * We assume that constant arguments will be the common case. + */ +__fenv_static inline int +feraiseexcept(int __excepts) +{ + volatile double d; + + /* + * 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 (__excepts & FE_INVALID) { + d = 0.0; + d = 0.0 / d; + } + if (__excepts & FE_DIVBYZERO) { + d = 0.0; + d = 1.0 / d; + } + if (__excepts & FE_OVERFLOW) { + d = 0x1.ffp1023; + d *= 2.0; + } + if (__excepts & FE_UNDERFLOW) { + d = 0x1p-1022; + d /= 0x1p1023; + } + if (__excepts & FE_INEXACT) { + d = 0x1p-1022; + d += 1.0; + } + return (0); +} + +__fenv_static inline int +fetestexcept(int __excepts) +{ + fenv_t __fpsr; + + __stfpsr(&__fpsr); + return ((__fpsr >> _FPUSW_SHIFT) & __excepts); +} + + +__fenv_static inline int +fegetround(void) +{ + fenv_t __fpsr; + + __stfpsr(&__fpsr); + return (__fpsr & _ROUND_MASK); +} + +__fenv_static inline int +fesetround(int __round) +{ + fenv_t __fpsr; + + if (__round & ~_ROUND_MASK) + return (-1); + __stfpsr(&__fpsr); + __fpsr &= ~_ROUND_MASK; + __fpsr |= __round; + __ldfpsr(__fpsr); + return (0); +} + +__fenv_static inline int +fegetenv(fenv_t *__envp) +{ + + __stfpsr(__envp); + return (0); +} + +__fenv_static inline int +feholdexcept(fenv_t *__envp) +{ + fenv_t __fpsr; + + __stfpsr(&__fpsr); + *__envp = __fpsr; + __fpsr &= ~((fenv_t)FE_ALL_EXCEPT << _FPUSW_SHIFT); + __fpsr |= FE_ALL_EXCEPT; + __ldfpsr(__fpsr); + return (0); +} + +__fenv_static inline int +fesetenv(const fenv_t *__envp) +{ + + __ldfpsr(*__envp); + return (0); +} + +int feupdateenv(const fenv_t *__envp); + +#if defined(_NETBSD_SOURCE) || defined(_GNU_SOURCE) + +/* We currently provide no external definitions of the functions below. */ + +static inline int +feenableexcept(int __mask) +{ + fenv_t __newfpsr, __oldfpsr; + + __stfpsr(&__oldfpsr); + __newfpsr = __oldfpsr & ~(__mask & FE_ALL_EXCEPT); + __ldfpsr(__newfpsr); + return (~__oldfpsr & FE_ALL_EXCEPT); +} + +static inline int +fedisableexcept(int __mask) +{ + fenv_t __newfpsr, __oldfpsr; + + __stfpsr(&__oldfpsr); + __newfpsr = __oldfpsr | (__mask & FE_ALL_EXCEPT); + __ldfpsr(__newfpsr); + return (~__oldfpsr & FE_ALL_EXCEPT); +} + +static inline int +fegetexcept(void) +{ + fenv_t __fpsr; + + __stfpsr(&__fpsr); + return (~__fpsr & FE_ALL_EXCEPT); +} + +#endif /* _NETBSD_SOURCE || _GNU_SOURCE */ + +__END_DECLS + +#endif /* !_IA64_FENV_H_ */