diff options
| -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 */ |