mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-21 12:30:06 +00:00
x86: Do not raises floating-point exception traps on fesetexceptflag (BZ 30990)
According to ISO C23 (7.6.4.4), fesetexcept is supposed to set floating-point exception flags without raising a trap (unlike feraiseexcept, which is supposed to raise a trap if feenableexcept was called with the appropriate argument). The flags can be set in the 387 unit or in the SSE unit. When we need to clear a flag, we need to do so in both units, due to the way fetestexcept is implemented. When we need to set a flag, it is sufficient to do it in the SSE unit, because that is guaranteed to not trap. However, on i386 CPUs that have only a 387 unit, set the flags in the 387, as long as this cannot trap. Co-authored-by: Adhemerval Zanella <adhemerval.zanella@linaro.org> Reviewed-by: Carlos O'Donell <carlos@redhat.com>
This commit is contained in:
parent
47a9eeb9ba
commit
787282dede
@ -19,6 +19,7 @@
|
||||
#include <fenv.h>
|
||||
#include <stdio.h>
|
||||
#include <math-tests.h>
|
||||
#include <math-barriers.h>
|
||||
|
||||
static int
|
||||
do_test (void)
|
||||
@ -65,12 +66,32 @@ do_test (void)
|
||||
|
||||
/* The test is that this does not cause exception traps. For architectures
|
||||
where setting the exception might result in traps the function should
|
||||
return a nonzero value. */
|
||||
return a nonzero value.
|
||||
Also check if the function does not alter the exception mask. */
|
||||
ret = fesetexceptflag (&saved, FE_ALL_EXCEPT);
|
||||
|
||||
_Static_assert (!(EXCEPTION_SET_FORCES_TRAP && !EXCEPTION_TESTS(float)),
|
||||
"EXCEPTION_SET_FORCES_TRAP only makes sense if the "
|
||||
"architecture suports exceptions");
|
||||
{
|
||||
int exc_before = fegetexcept ();
|
||||
ret = fesetexceptflag (&saved, FE_ALL_EXCEPT);
|
||||
int exc_after = fegetexcept ();
|
||||
if (exc_before != exc_after)
|
||||
{
|
||||
puts ("fesetexceptflag (FE_ALL_EXCEPT) changed the exceptions mask");
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
|
||||
/* Execute some floating-point operations, since on some CPUs exceptions
|
||||
triggers a trap only at the next floating-point instruction. */
|
||||
volatile double a = 1.0;
|
||||
volatile double b = a + a;
|
||||
math_force_eval (b);
|
||||
volatile long double al = 1.0L;
|
||||
volatile long double bl = al + al;
|
||||
math_force_eval (bl);
|
||||
|
||||
if (ret != 0 && !EXCEPTION_SET_FORCES_TRAP)
|
||||
{
|
||||
|
@ -17,42 +17,63 @@
|
||||
<https://www.gnu.org/licenses/>. */
|
||||
|
||||
#include <fenv.h>
|
||||
#include <math.h>
|
||||
#include <unistd.h>
|
||||
#include <ldsodefs.h>
|
||||
#include <dl-procinfo.h>
|
||||
|
||||
int
|
||||
__fesetexceptflag (const fexcept_t *flagp, int excepts)
|
||||
{
|
||||
/* The flags can be set in the 387 unit or in the SSE unit. When we need to
|
||||
clear a flag, we need to do so in both units, due to the way fetestexcept
|
||||
is implemented.
|
||||
When we need to set a flag, it is sufficient to do it in the SSE unit,
|
||||
because that is guaranteed to not trap. However, on i386 CPUs that have
|
||||
only a 387 unit, set the flags in the 387, as long as this cannot trap. */
|
||||
|
||||
fenv_t temp;
|
||||
|
||||
/* Get the current environment. We have to do this since we cannot
|
||||
separately set the status word. */
|
||||
excepts &= FE_ALL_EXCEPT;
|
||||
|
||||
/* Get the current x87 FPU environment. We have to do this since we
|
||||
cannot separately set the status word.
|
||||
Note: fnstenv masks all floating-point exceptions until the fldenv
|
||||
or fldcw below. */
|
||||
__asm__ ("fnstenv %0" : "=m" (*&temp));
|
||||
|
||||
temp.__status_word &= ~(excepts & FE_ALL_EXCEPT);
|
||||
temp.__status_word |= *flagp & excepts & FE_ALL_EXCEPT;
|
||||
|
||||
/* Store the new status word (along with the rest of the environment.
|
||||
Possibly new exceptions are set but they won't get executed unless
|
||||
the next floating-point instruction. */
|
||||
__asm__ ("fldenv %0" : : "m" (*&temp));
|
||||
|
||||
/* If the CPU supports SSE, we set the MXCSR as well. */
|
||||
if (CPU_FEATURE_USABLE (SSE))
|
||||
{
|
||||
unsigned int xnew_exc;
|
||||
unsigned int mxcsr;
|
||||
|
||||
/* Get the current MXCSR. */
|
||||
__asm__ ("stmxcsr %0" : "=m" (*&xnew_exc));
|
||||
/* Clear relevant flags. */
|
||||
temp.__status_word &= ~(excepts & ~ *flagp);
|
||||
|
||||
/* Set the relevant bits. */
|
||||
xnew_exc &= ~(excepts & FE_ALL_EXCEPT);
|
||||
xnew_exc |= *flagp & excepts & FE_ALL_EXCEPT;
|
||||
/* Store the new status word (along with the rest of the environment). */
|
||||
__asm__ ("fldenv %0" : : "m" (*&temp));
|
||||
|
||||
/* And now similarly for SSE. */
|
||||
__asm__ ("stmxcsr %0" : "=m" (*&mxcsr));
|
||||
|
||||
/* Clear or set relevant flags. */
|
||||
mxcsr ^= (mxcsr ^ *flagp) & excepts;
|
||||
|
||||
/* Put the new data in effect. */
|
||||
__asm__ ("ldmxcsr %0" : : "m" (*&xnew_exc));
|
||||
__asm__ ("ldmxcsr %0" : : "m" (*&mxcsr));
|
||||
}
|
||||
else
|
||||
{
|
||||
/* Clear or set relevant flags. */
|
||||
temp.__status_word ^= (temp.__status_word ^ *flagp) & excepts;
|
||||
|
||||
if ((~temp.__control_word) & temp.__status_word & excepts)
|
||||
{
|
||||
/* Setting the exception flags may trigger a trap (at the next
|
||||
floating-point instruction, but that does not matter).
|
||||
ISO C 23 § 7.6.4.5 does not allow it. */
|
||||
__asm__ volatile ("fldcw %0" : : "m" (*&temp.__control_word));
|
||||
return -1;
|
||||
}
|
||||
|
||||
/* Store the new status word (along with the rest of the environment). */
|
||||
__asm__ ("fldenv %0" : : "m" (*&temp));
|
||||
}
|
||||
|
||||
/* Success. */
|
||||
|
@ -22,30 +22,34 @@
|
||||
int
|
||||
fesetexceptflag (const fexcept_t *flagp, int excepts)
|
||||
{
|
||||
/* The flags can be set in the 387 unit or in the SSE unit.
|
||||
When we need to clear a flag, we need to do so in both units,
|
||||
due to the way fetestexcept() is implemented.
|
||||
When we need to set a flag, it is sufficient to do it in the SSE unit,
|
||||
because that is guaranteed to not trap. */
|
||||
|
||||
fenv_t temp;
|
||||
unsigned int mxcsr;
|
||||
|
||||
/* XXX: Do we really need to set both the exception in both units?
|
||||
Shouldn't it be enough to set only the SSE unit? */
|
||||
excepts &= FE_ALL_EXCEPT;
|
||||
|
||||
/* Get the current x87 FPU environment. We have to do this since we
|
||||
cannot separately set the status word. */
|
||||
__asm__ ("fnstenv %0" : "=m" (*&temp));
|
||||
|
||||
temp.__status_word &= ~(excepts & FE_ALL_EXCEPT);
|
||||
temp.__status_word |= *flagp & excepts & FE_ALL_EXCEPT;
|
||||
/* Clear relevant flags. */
|
||||
temp.__status_word &= ~(excepts & ~ *flagp);
|
||||
|
||||
/* Store the new status word (along with the rest of the environment.
|
||||
Possibly new exceptions are set but they won't get executed unless
|
||||
the next floating-point instruction. */
|
||||
/* Store the new status word (along with the rest of the environment). */
|
||||
__asm__ ("fldenv %0" : : "m" (*&temp));
|
||||
|
||||
/* And now the same for SSE. */
|
||||
/* And now similarly for SSE. */
|
||||
__asm__ ("stmxcsr %0" : "=m" (*&mxcsr));
|
||||
|
||||
mxcsr &= ~(excepts & FE_ALL_EXCEPT);
|
||||
mxcsr |= *flagp & excepts & FE_ALL_EXCEPT;
|
||||
/* Clear or set relevant flags. */
|
||||
mxcsr ^= (mxcsr ^ *flagp) & excepts;
|
||||
|
||||
/* Put the new data in effect. */
|
||||
__asm__ ("ldmxcsr %0" : : "m" (*&mxcsr));
|
||||
|
||||
/* Success. */
|
||||
|
Loading…
Reference in New Issue
Block a user