From 2d6a47ba4ca899746db7fb5ba75a82f2cda93a91 Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Thu, 9 Oct 2014 00:58:42 +0000 Subject: soft-fp: Remove FP_CLEAR_EXCEPTIONS. As noted in , the soft-fp macro FP_CLEAR_EXCEPTIONS should not be necessary, as soft-fp code should never set an exception and later clear it. In fact, all four uses in glibc (for SPARC) are indeed unnecessary: they appear in files that convert 32-bit or 64-bit integers to IEEE binary128, an operation that can never raise any exceptions. If this was intended to enable the compiler to optimize away any FP_FROM_INT code testing for exceptional cases, we now have a better way of doing this: defining FP_NO_EXCEPTIONS before including soft-fp.h causes all code handling exceptions to be stubbed out, and the rounding mode to be hardwired for round-to-zero, to allow such optimizations for source files where (a) the operation in question, for the particular types in question, can never raise exceptions, but (b) some instances of the operation for other types can, so the macros used in the file do contain references to rounding or exceptions, albeit dead in that particular file. The uses in the Linux kernel are also unnecessary (clearing exceptions at a point where they are already cleared). This patch duly removes FP_CLEAR_EXCEPTIONS, making the SPARC code in question use FP_NO_EXCEPTIONS and stop using exception-related macros. * soft-fp/soft-fp.h (FP_CLEAR_EXCEPTIONS): Remove macro. * sysdeps/sparc/sparc32/soft-fp/q_itoq.c: Define FP_NO_EXCEPTIONS. (_Q_itoq): Do not use FP_DECL_EX, FP_CLEAR_EXCEPTIONS or FP_HANDLE_EXCEPTIONS. * sysdeps/sparc/sparc32/soft-fp/q_lltoq.c: Define FP_NO_EXCEPTIONS. (_Q_lltoq): Do not use FP_DECL_EX, FP_CLEAR_EXCEPTIONS or FP_HANDLE_EXCEPTIONS. * sysdeps/sparc/sparc32/soft-fp/q_ulltoq.c: Define FP_NO_EXCEPTIONS. (_Q_ulltoq): Do not use FP_DECL_EX, FP_CLEAR_EXCEPTIONS or FP_HANDLE_EXCEPTIONS. * sysdeps/sparc/sparc32/soft-fp/q_utoq.c: Define FP_NO_EXCEPTIONS. (_Q_utoq): Do not use FP_DECL_EX, FP_CLEAR_EXCEPTIONS or FP_HANDLE_EXCEPTIONS. --- ChangeLog | 16 ++++++++++++++++ soft-fp/soft-fp.h | 3 --- sysdeps/sparc/sparc32/soft-fp/q_itoq.c | 4 +--- sysdeps/sparc/sparc32/soft-fp/q_lltoq.c | 4 +--- sysdeps/sparc/sparc32/soft-fp/q_ulltoq.c | 4 +--- sysdeps/sparc/sparc32/soft-fp/q_utoq.c | 4 +--- 6 files changed, 20 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index a24865e06b..b5faff4fe7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,19 @@ +2014-10-09 Joseph Myers + + * soft-fp/soft-fp.h (FP_CLEAR_EXCEPTIONS): Remove macro. + * sysdeps/sparc/sparc32/soft-fp/q_itoq.c: Define FP_NO_EXCEPTIONS. + (_Q_itoq): Do not use FP_DECL_EX, FP_CLEAR_EXCEPTIONS or + FP_HANDLE_EXCEPTIONS. + * sysdeps/sparc/sparc32/soft-fp/q_lltoq.c: Define FP_NO_EXCEPTIONS. + (_Q_lltoq): Do not use FP_DECL_EX, FP_CLEAR_EXCEPTIONS or + FP_HANDLE_EXCEPTIONS. + * sysdeps/sparc/sparc32/soft-fp/q_ulltoq.c: Define FP_NO_EXCEPTIONS. + (_Q_ulltoq): Do not use FP_DECL_EX, FP_CLEAR_EXCEPTIONS or + FP_HANDLE_EXCEPTIONS. + * sysdeps/sparc/sparc32/soft-fp/q_utoq.c: Define FP_NO_EXCEPTIONS. + (_Q_utoq): Do not use FP_DECL_EX, FP_CLEAR_EXCEPTIONS or + FP_HANDLE_EXCEPTIONS. + 2014-10-08 Joseph Myers [BZ #14132] diff --git a/soft-fp/soft-fp.h b/soft-fp/soft-fp.h index 5fb7358cfa..ead9c97874 100644 --- a/soft-fp/soft-fp.h +++ b/soft-fp/soft-fp.h @@ -128,9 +128,6 @@ #define FP_SET_EXCEPTION(ex) \ _fex |= (ex) -#define FP_CLEAR_EXCEPTIONS \ - _fex = 0 - #define FP_CUR_EXCEPTIONS \ (_fex) diff --git a/sysdeps/sparc/sparc32/soft-fp/q_itoq.c b/sysdeps/sparc/sparc32/soft-fp/q_itoq.c index 3640506973..1ebb2de58e 100644 --- a/sysdeps/sparc/sparc32/soft-fp/q_itoq.c +++ b/sysdeps/sparc/sparc32/soft-fp/q_itoq.c @@ -19,19 +19,17 @@ License along with the GNU C Library; if not, see . */ +#define FP_NO_EXCEPTIONS #include "soft-fp.h" #include "quad.h" long double _Q_itoq(const int a) { - FP_DECL_EX; FP_DECL_Q(C); int b = a; long double c; FP_FROM_INT_Q(C, b, 32, unsigned int); FP_PACK_RAW_Q(c, C); - FP_CLEAR_EXCEPTIONS; - FP_HANDLE_EXCEPTIONS; return c; } diff --git a/sysdeps/sparc/sparc32/soft-fp/q_lltoq.c b/sysdeps/sparc/sparc32/soft-fp/q_lltoq.c index 52b2712161..b60d26dbce 100644 --- a/sysdeps/sparc/sparc32/soft-fp/q_lltoq.c +++ b/sysdeps/sparc/sparc32/soft-fp/q_lltoq.c @@ -19,19 +19,17 @@ License along with the GNU C Library; if not, see . */ +#define FP_NO_EXCEPTIONS #include "soft-fp.h" #include "quad.h" long double _Q_lltoq(const long long a) { - FP_DECL_EX; FP_DECL_Q(C); long double c; long long b = a; FP_FROM_INT_Q(C, b, 64, unsigned long long); FP_PACK_RAW_Q(c, C); - FP_CLEAR_EXCEPTIONS; - FP_HANDLE_EXCEPTIONS; return c; } diff --git a/sysdeps/sparc/sparc32/soft-fp/q_ulltoq.c b/sysdeps/sparc/sparc32/soft-fp/q_ulltoq.c index 7512557f9a..524fcb945b 100644 --- a/sysdeps/sparc/sparc32/soft-fp/q_ulltoq.c +++ b/sysdeps/sparc/sparc32/soft-fp/q_ulltoq.c @@ -19,19 +19,17 @@ License along with the GNU C Library; if not, see . */ +#define FP_NO_EXCEPTIONS #include "soft-fp.h" #include "quad.h" long double _Q_ulltoq(const unsigned long long a) { - FP_DECL_EX; FP_DECL_Q(C); long double c; unsigned long long b = a; FP_FROM_INT_Q(C, b, 64, unsigned long long); FP_PACK_RAW_Q(c, C); - FP_CLEAR_EXCEPTIONS; - FP_HANDLE_EXCEPTIONS; return c; } diff --git a/sysdeps/sparc/sparc32/soft-fp/q_utoq.c b/sysdeps/sparc/sparc32/soft-fp/q_utoq.c index 0fb645c5de..0ba823ed03 100644 --- a/sysdeps/sparc/sparc32/soft-fp/q_utoq.c +++ b/sysdeps/sparc/sparc32/soft-fp/q_utoq.c @@ -19,19 +19,17 @@ License along with the GNU C Library; if not, see . */ +#define FP_NO_EXCEPTIONS #include "soft-fp.h" #include "quad.h" long double _Q_utoq(const unsigned int a) { - FP_DECL_EX; FP_DECL_Q(C); long double c; unsigned int b = a; FP_FROM_INT_Q(C, b, 32, unsigned int); FP_PACK_RAW_Q(c, C); - FP_CLEAR_EXCEPTIONS; - FP_HANDLE_EXCEPTIONS; return c; } -- cgit v1.2.3