diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2016-03-30 01:12:22 +0300 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2016-03-30 13:55:42 +0300 |
| commit | 279aaeb5c7511cacd5496603a6dbd2901bc8e9af (patch) | |
| tree | 600fb04631806a2c174fcc2e9149e2e8bc99a97d /winsup | |
| parent | fbc4a0827b240df450bae96e8704bed980aec5cc (diff) | |
fenv.h: Change fexcept_t to integral type for compatibility
On Linux and in Mingw-w64, fexcept_t is defined as type unsigned short.
There are packages in the wild which rely on the fact that fexcept_t is
an integral type. We're changing the internal handling to use the bits
just as in GLibc, so only the 6 lowest bits are used to reflect the hw
bits. We even change the header file guard to reflect GLibc for compatibility.
* include/fenv.h (_FENV_H): Rename from _FENV_H_ and set to 1 as in
GLibc's header.
(fexcept_t): Change to __uint16_t to be an integral type as in GLibc.
* fenv.cc (fegetexceptflag): Align to the *flagp's type change.
(fesetexceptflag): Ditto.
Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
Diffstat (limited to 'winsup')
| -rw-r--r-- | winsup/cygwin/fenv.cc | 9 | ||||
| -rw-r--r-- | winsup/cygwin/include/fenv.h | 14 |
2 files changed, 9 insertions, 14 deletions
diff --git a/winsup/cygwin/fenv.cc b/winsup/cygwin/fenv.cc index 5443681f9..f025a1774 100644 --- a/winsup/cygwin/fenv.cc +++ b/winsup/cygwin/fenv.cc @@ -295,9 +295,8 @@ fegetexceptflag (fexcept_t *flagp, int excepts) if (use_sse) __asm__ volatile ("stmxcsr %0" : "=m" (mxcsr) : ); - /* Mask undesired bits out and set result struct. */ - flagp->_fpu_exceptions = (sw & excepts); - flagp->_sse_exceptions = (mxcsr & excepts); + /* Mask undesired bits out and set result. */ + *flagp = (sw | mxcsr) & excepts; return 0; } @@ -317,9 +316,9 @@ fesetexceptflag (const fexcept_t *flagp, int excepts) /* Set/Clear desired exception bits. */ fenv._fpu._fpu_sw &= ~excepts; - fenv._fpu._fpu_sw |= (excepts & flagp->_fpu_exceptions); + fenv._fpu._fpu_sw |= excepts & *flagp; fenv._sse_mxcsr &= ~excepts; - fenv._sse_mxcsr |= (excepts & flagp->_sse_exceptions); + fenv._sse_mxcsr |= excepts & *flagp; /* Set back into FPU state. */ return fesetenv (&fenv); diff --git a/winsup/cygwin/include/fenv.h b/winsup/cygwin/include/fenv.h index 497691374..26464252c 100644 --- a/winsup/cygwin/include/fenv.h +++ b/winsup/cygwin/include/fenv.h @@ -8,8 +8,8 @@ This software is a copyrighted work licensed under the terms of the Cygwin license. Please consult the file "CYGWIN_LICENSE" for details. */ -#ifndef _FENV_H_ -#define _FENV_H_ +#ifndef _FENV_H +#define _FENV_H 1 #include <sys/cdefs.h> @@ -72,13 +72,9 @@ typedef struct _fenv_t of exceptional floating-point arithmetic to provide auxiliary information. A floating-point control mode is a system variable whose value may be set by the user to affect the subsequent behavior of floating-point - arithmetic. */ + arithmetic. */ -typedef struct _fexcept_t -{ - unsigned short _fpu_exceptions; - unsigned short _sse_exceptions; -} fexcept_t; +typedef __uint32_t fexcept_t; /* The <fenv.h> header shall define the following constants if and only if the implementation supports the floating-point exception by means @@ -176,4 +172,4 @@ extern int fegetexcept (void); } #endif -#endif /* _FENV_H_ */ +#endif /* _FENV_H */ |