diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2012-06-01 19:02:21 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2012-06-01 19:02:21 +0000 |
| commit | 4842e4fe5fcb90312f330b0a98cf73f082aefd01 (patch) | |
| tree | 343bf41267307f8e504155a9a006b468ff9379b7 | |
| parent | efb734887e10cb5adb0e722012fd65df8d1f8ff5 (diff) | |
| download | glibc-4842e4fe5fcb90312f330b0a98cf73f082aefd01.tar.gz glibc-4842e4fe5fcb90312f330b0a98cf73f082aefd01.tar.xz glibc-4842e4fe5fcb90312f330b0a98cf73f082aefd01.zip | |
Ensure additions are not scheduled after fetestexcept in fmaf and fmal.
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | sysdeps/ieee754/dbl-64/s_fmaf.c | 4 | ||||
| -rw-r--r-- | sysdeps/ieee754/ldbl-128/s_fmal.c | 5 | ||||
| -rw-r--r-- | sysdeps/ieee754/ldbl-96/s_fmal.c | 5 |
4 files changed, 20 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog index f794e9ff4f..deb1c0a5c4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2012-06-01 Joseph Myers <joseph@codesourcery.com> + + * sysdeps/ieee754/dbl-64/s_fmaf.c (__fmaf): Ensure temp + (double) + z computation is not scheduled after fetestexcept. + * sysdeps/ieee754/ldbl-128/s_fmal.c: Include <math_private.h>. + Use math_force_eval instead of asm to ensure calculation scheduled + before exception test. + * sysdeps/ieee754/ldbl-96/s_fmal.c: Include <math_private.h>. + Ensure a1 + u.d computation is not scheduled after fetestexcept. + 2012-06-01 Aurelien Jarno <aurelien@aurel32.net> * sysdeps/ieee754/dbl-64/s_fma.c (__fma): Ensure a1 + u.d diff --git a/sysdeps/ieee754/dbl-64/s_fmaf.c b/sysdeps/ieee754/dbl-64/s_fmaf.c index 7a939aaed1..e7a0650f0f 100644 --- a/sysdeps/ieee754/dbl-64/s_fmaf.c +++ b/sysdeps/ieee754/dbl-64/s_fmaf.c @@ -1,5 +1,5 @@ /* Compute x * y + z as ternary operation. - Copyright (C) 2010, 2011 Free Software Foundation, Inc. + Copyright (C) 2010-2012 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Jakub Jelinek <jakub@redhat.com>, 2010. @@ -40,6 +40,8 @@ __fmaf (float x, float y, float z) /* Perform addition with round to odd. */ u.d = temp + (double) z; + /* Ensure the addition is not scheduled after fetestexcept call. */ + math_force_eval (u.d); /* Reset rounding mode and test for inexact simultaneously. */ int j = libc_feupdateenv_test (&env, FE_INEXACT) != 0; diff --git a/sysdeps/ieee754/ldbl-128/s_fmal.c b/sysdeps/ieee754/ldbl-128/s_fmal.c index 3b85b17faf..963bbd7345 100644 --- a/sysdeps/ieee754/ldbl-128/s_fmal.c +++ b/sysdeps/ieee754/ldbl-128/s_fmal.c @@ -1,5 +1,5 @@ /* Compute x * y + z as ternary operation. - Copyright (C) 2010 Free Software Foundation, Inc. + Copyright (C) 2010-2012 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Jakub Jelinek <jakub@redhat.com>, 2010. @@ -21,6 +21,7 @@ #include <math.h> #include <fenv.h> #include <ieee754.h> +#include <math_private.h> /* This implementation uses rounding to odd to avoid problems with double rounding. See a paper by Boldo and Melquiond: @@ -175,7 +176,7 @@ __fmal (long double x, long double y, long double z) u.ieee.mantissa3 |= fetestexcept (FE_INEXACT) != 0; v.d = a1 + u.d; /* Ensure the addition is not scheduled after fetestexcept call. */ - asm volatile ("" : : "m" (v)); + math_force_eval (v.d); int j = fetestexcept (FE_INEXACT) != 0; feupdateenv (&env); /* Ensure the following computations are performed in default rounding diff --git a/sysdeps/ieee754/ldbl-96/s_fmal.c b/sysdeps/ieee754/ldbl-96/s_fmal.c index 76866fbfaa..ca1e0905a7 100644 --- a/sysdeps/ieee754/ldbl-96/s_fmal.c +++ b/sysdeps/ieee754/ldbl-96/s_fmal.c @@ -1,5 +1,5 @@ /* Compute x * y + z as ternary operation. - Copyright (C) 2010 Free Software Foundation, Inc. + Copyright (C) 2010-2012 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Jakub Jelinek <jakub@redhat.com>, 2010. @@ -21,6 +21,7 @@ #include <math.h> #include <fenv.h> #include <ieee754.h> +#include <math_private.h> /* This implementation uses rounding to odd to avoid problems with double rounding. See a paper by Boldo and Melquiond: @@ -174,6 +175,8 @@ __fmal (long double x, long double y, long double z) if ((u.ieee.mantissa1 & 1) == 0) u.ieee.mantissa1 |= fetestexcept (FE_INEXACT) != 0; v.d = a1 + u.d; + /* Ensure the addition is not scheduled after fetestexcept call. */ + math_force_eval (v.d); int j = fetestexcept (FE_INEXACT) != 0; feupdateenv (&env); /* Ensure the following computations are performed in default rounding |