From 06d97e5e6100641df2c379459e41b26bb4d7648b Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Fri, 9 Oct 2015 21:02:19 +0000 Subject: Fix lrint, llrint, lround, llround missing exceptions for MIPS (bug 16399). For 32-bit MIPS and some other systems, various of the lrint, llrint, lround, llround functions can be missing exceptions on overflow because casts do not (in current GCC) result in the proper exceptions. In the MIPS case there are two problems here: MIPS I code generation uses an assembler macro that doesn't raise exceptions, while the libgcc conversions of floating-point values to long long also do not raise "invalid" on all overflow cases (and can raise spurious "inexact"). This patch adds support in the generic code (only the functions for which this problem has actually been seen) for forcing the "invalid" exception in the problem cases, and enables that support for the affected MIPS cases. Tested for MIPS; also tested for x86_64 and x86 that installed stripped shared libraries are unchanged by this patch. [BZ #16399] * sysdeps/generic/fix-fp-int-convert-overflow.h: New file. * sysdeps/ieee754/dbl-64/s_llrint.c: Include , and . (__llrint) [FE_INVALID]: Force FE_INVALID exception as needed if FIX_DBL_LLONG_CONVERT_OVERFLOW. * sysdeps/ieee754/dbl-64/s_llround.c: Include , and . (__llround) [FE_INVALID]: Force FE_INVALID exception as needed if FIX_DBL_LLONG_CONVERT_OVERFLOW. * sysdeps/ieee754/dbl-64/s_lrint.c: Include . (__lrint) [FE_INVALID]: Force FE_INVALID exception as needed if FIX_DBL_LLONG_CONVERT_OVERFLOW. * sysdeps/ieee754/dbl-64/s_lround.c: Include . (__lround) [FE_INVALID]: Force FE_INVALID exception as needed if FIX_DBL_LLONG_CONVERT_OVERFLOW. * sysdeps/ieee754/flt-32/s_llrintf.c: Include , and . (__llrintf) [FE_INVALID]: Force FE_INVALID exception as needed if FIX_DBL_LLONG_CONVERT_OVERFLOW. * sysdeps/ieee754/flt-32/s_llroundf.c: Include , and . (__llroundf) [FE_INVALID]: Force FE_INVALID exception as needed if FIX_DBL_LLONG_CONVERT_OVERFLOW. * sysdeps/ieee754/flt-32/s_lrintf.c: Include , and . (__lrintf) [FE_INVALID]: Force FE_INVALID exception as needed if FIX_DBL_LLONG_CONVERT_OVERFLOW. * sysdeps/ieee754/flt-32/s_lroundf.c: Include , and . (__lroundf) [FE_INVALID]: Force FE_INVALID exception as needed if FIX_DBL_LLONG_CONVERT_OVERFLOW. * sysdeps/mips/mips32/fpu/fix-fp-int-convert-overflow.h: New file. --- sysdeps/ieee754/dbl-64/s_llrint.c | 15 +++++++++++++-- sysdeps/ieee754/dbl-64/s_llround.c | 15 +++++++++++++-- sysdeps/ieee754/dbl-64/s_lrint.c | 6 ++++++ sysdeps/ieee754/dbl-64/s_lround.c | 15 +++++++++++++-- 4 files changed, 45 insertions(+), 6 deletions(-) (limited to 'sysdeps/ieee754/dbl-64') diff --git a/sysdeps/ieee754/dbl-64/s_llrint.c b/sysdeps/ieee754/dbl-64/s_llrint.c index 048331e9a7..1673527ba4 100644 --- a/sysdeps/ieee754/dbl-64/s_llrint.c +++ b/sysdeps/ieee754/dbl-64/s_llrint.c @@ -18,9 +18,12 @@ License along with the GNU C Library; if not, see . */ +#include +#include #include #include +#include static const double two52[2] = { @@ -77,8 +80,16 @@ __llrint (double x) } else { - /* The number is too large. It is left implementation defined - what happens. */ +#ifdef FE_INVALID + /* The number is too large. Unless it rounds to LLONG_MIN, + FE_INVALID must be raised and the return value is + unspecified. */ + if (FIX_DBL_LLONG_CONVERT_OVERFLOW && x != (double) LLONG_MIN) + { + feraiseexcept (FE_INVALID); + return sx == 0 ? LLONG_MAX : LLONG_MIN; + } +#endif return (long long int) x; } diff --git a/sysdeps/ieee754/dbl-64/s_llround.c b/sysdeps/ieee754/dbl-64/s_llround.c index c8b3c190b5..77ad3c3e89 100644 --- a/sysdeps/ieee754/dbl-64/s_llround.c +++ b/sysdeps/ieee754/dbl-64/s_llround.c @@ -17,9 +17,12 @@ License along with the GNU C Library; if not, see . */ +#include +#include #include #include +#include long long int @@ -65,8 +68,16 @@ __llround (double x) } else { - /* The number is too large. It is left implementation defined - what happens. */ +#ifdef FE_INVALID + /* The number is too large. Unless it rounds to LLONG_MIN, + FE_INVALID must be raised and the return value is + unspecified. */ + if (FIX_DBL_LLONG_CONVERT_OVERFLOW && x != (double) LLONG_MIN) + { + feraiseexcept (FE_INVALID); + return sign == 1 ? LLONG_MAX : LLONG_MIN; + } +#endif return (long long int) x; } diff --git a/sysdeps/ieee754/dbl-64/s_lrint.c b/sysdeps/ieee754/dbl-64/s_lrint.c index d004594bc2..3fdb05ecf7 100644 --- a/sysdeps/ieee754/dbl-64/s_lrint.c +++ b/sysdeps/ieee754/dbl-64/s_lrint.c @@ -23,6 +23,7 @@ #include #include +#include static const double two52[2] = { @@ -107,6 +108,11 @@ __lrint (double x) feraiseexcept (t == LONG_MIN ? FE_INEXACT : FE_INVALID); return LONG_MIN; } + else if (FIX_DBL_LONG_CONVERT_OVERFLOW && x != (double) LONG_MIN) + { + feraiseexcept (FE_INVALID); + return sx == 0 ? LONG_MAX : LONG_MIN; + } #endif return (long int) x; } diff --git a/sysdeps/ieee754/dbl-64/s_lround.c b/sysdeps/ieee754/dbl-64/s_lround.c index 91b17b0de9..699eafb010 100644 --- a/sysdeps/ieee754/dbl-64/s_lround.c +++ b/sysdeps/ieee754/dbl-64/s_lround.c @@ -22,6 +22,7 @@ #include #include +#include long int @@ -80,8 +81,18 @@ __lround (double x) FE_INVALID must be raised and the return value is unspecified. */ #ifdef FE_INVALID - if (sizeof (long int) == 4 - && x <= (double) LONG_MIN - 0.5) + if (FIX_DBL_LONG_CONVERT_OVERFLOW + && !(sign == -1 + && (sizeof (long int) == 4 + ? x > (double) LONG_MIN - 0.5 + : x >= (double) LONG_MIN))) + { + feraiseexcept (FE_INVALID); + return sign == 1 ? LONG_MAX : LONG_MIN; + } + else if (!FIX_DBL_LONG_CONVERT_OVERFLOW + && sizeof (long int) == 4 + && x <= (double) LONG_MIN - 0.5) { /* If truncation produces LONG_MIN, the cast will not raise the exception, but may raise "inexact". */ -- cgit 1.4.1