diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2016-03-09 00:30:59 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2016-03-09 00:30:59 +0000 |
| commit | 613c92b3b59df6a06784cde1d4f410cef0b6da96 (patch) | |
| tree | efdcc70a56baf3ed21f7278b72efed5d2e8a9b27 /sysdeps/powerpc/fpu/fenv_private.h | |
| parent | 3bd80c0de2f8e7ca8020d37739339636d169957e (diff) | |
| download | glibc-613c92b3b59df6a06784cde1d4f410cef0b6da96.tar.gz | |
Fix ldbl-128ibm nearbyintl in non-default rounding modes (bug 19790).
The ldbl-128ibm implementation of nearbyintl uses logic that only
works in round-to-nearest mode. This contrasts with rintl, which
works in all rounding modes.
Now, arguably nearbyintl could simply be aliased to rintl, given that
spurious "inexact" is generally allowed for ldbl-128ibm, even for the
underlying arithmetic operations. But given that the only point of
nearbyintl is to avoid "inexact", this patch follows the more
conservative approach of adding conditionals to the rintl
implementation to make it suitable for use to implement nearbyintl,
then builds it for nearbyintl with USE_AS_NEARBYINTL defined. The
test test-nearbyint-except-2 shows up issues when traps on "inexact"
are enabled, which turn out to be problems with the powerpc
fenv_private.h implementation (two functions that should disable
exception traps potentially failing to do so in some cases); this
patch duly fixes that as well (I don't see any other existing cases
where this would be user-visible; there isn't much use of *_NOEX,
*hold* etc. in libm that requires exceptions to be discarded and not
trapped on).
Tested for powerpc.
[BZ #19790]
* sysdeps/ieee754/ldbl-128ibm/s_rintl.c [USE_AS_NEARBYINTL]
(rintl): Define as macro.
[USE_AS_NEARBYINTL] (__rintl): Likewise.
(__rintl) [USE_AS_NEARBYINTL]: Use SET_RESTORE_ROUND_NOEX instead
of fesetround. Ensure results are evaluated before end of scope.
* sysdeps/ieee754/ldbl-128ibm/s_nearbyintl.c: Define
USE_AS_NEARBYINTL and include s_rintl.c.
* sysdeps/powerpc/fpu/fenv_private.h (libc_feholdsetround_ppc):
Disable exception traps in new environment.
(libc_feholdsetround_ppc_ctx): Likewise.
Diffstat (limited to 'sysdeps/powerpc/fpu/fenv_private.h')
| -rw-r--r-- | sysdeps/powerpc/fpu/fenv_private.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sysdeps/powerpc/fpu/fenv_private.h b/sysdeps/powerpc/fpu/fenv_private.h index e1b02a3f80..02ac980909 100644 --- a/sysdeps/powerpc/fpu/fenv_private.h +++ b/sysdeps/powerpc/fpu/fenv_private.h @@ -146,7 +146,7 @@ libc_feholdsetround_ppc (fenv_t *e, int r) old.fenv = fegetenv_register (); /* Clear current precision and set newer one. */ - new.l = (old.l & ~0x3) | r; + new.l = (old.l & ~0x3 & ~_FPU_MASK_ALL) | r; *e = old.fenv; if ((old.l & _FPU_MASK_ALL) != 0) @@ -240,7 +240,7 @@ libc_feholdsetround_ppc_ctx (struct rm_ctx *ctx, int r) fenv_union_t old, new; old.fenv = fegetenv_register (); - new.l = (old.l & ~0x3) | r; + new.l = (old.l & ~0x3 & ~_FPU_MASK_ALL) | r; ctx->env = old.fenv; if (__glibc_unlikely (new.l != old.l)) { |