diff options
Diffstat (limited to 'sysdeps/x86_64/fpu/feholdexcpt.c')
| -rw-r--r-- | sysdeps/x86_64/fpu/feholdexcpt.c | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/sysdeps/x86_64/fpu/feholdexcpt.c b/sysdeps/x86_64/fpu/feholdexcpt.c index a9b21a3c25..d56ab163ca 100644 --- a/sysdeps/x86_64/fpu/feholdexcpt.c +++ b/sysdeps/x86_64/fpu/feholdexcpt.c @@ -1,5 +1,5 @@ /* Store current floating-point environment and clear exceptions. - Copyright (C) 2001, 2005 Free Software Foundation, Inc. + Copyright (C) 2001, 2005, 2007 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -22,19 +22,24 @@ int feholdexcept (fenv_t *envp) { - unsigned short int work; unsigned int mxcsr; + fenv_t temp; /* Store the environment. */ __asm__ ("fnstenv %0\n" - "stmxcsr %1" : "=m" (*envp), "=m" (envp->__mxcsr)); + "stmxcsr %1" : "=m" (temp), "=m" (temp.__mxcsr)); + *envp = temp; /* Now set all exceptions to non-stop, first the x87 FPU. */ - work = envp->__control_word | 0x3f; - __asm__ ("fldcw %0" : : "m" (*&work)); + temp.__control_word |= 0x3f; + + /* And clear all exceptions. */ + temp.__status_word &= ~0x3f; + + __asm__ ("fldenv %0" : : "m" (temp)); /* Set the SSE MXCSR register. */ - mxcsr = envp->__mxcsr | 0x1f80; + mxcsr = (envp->__mxcsr | 0x1f80) & ~0x3f; __asm__ ("ldmxcsr %0" : : "m" (*&mxcsr)); return 0; |