[powerpc] Use __builtin_{mffs,mtfsf}

Replace inline asm uses of the "mffs" and "mtfsf" instructions with
the analogous GCC builtins.

__builtin_mffs and __builtin_mtfsf are both available in GCC 5 and above.
Given the minimum GCC level for GLibC is now GCC 6.2, it is safe to use
these builtins without restriction.

2019-03-29  Paul A. Clarke  <pc@us.ibm.com>

	* sysdeps/powerpc/fpu/fenv_libc.h (fegetenv_register): Replace inline
	asm with builtin.
	* sysdeps/powerpc/powerpc64/le/fpu/sfp-machine.h (FP_INIT_ROUNDMODE):
	Likewise.
	* sysdeps/powerpc/fpu/tst-setcontext-fpscr.c (_GET_DI_FPSCR): Likewise.
	(_GET_SI_FPSCR): Likewise.
	(_SET_SI_FPSCR): Likewise.

diff --git a/ChangeLog b/ChangeLog
index 19d3e9079c0c771af8d4b114151e3d74eba635f4..60f76450e5feaf823ad126662674a95c168a3f7e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2019-03-29  Paul A. Clarke  <pc@us.ibm.com>
+
+       * sysdeps/powerpc/fpu/fenv_libc.h (fegetenv_register): Replace inline
+       asm with builtin.
+       * sysdeps/powerpc/powerpc64/le/fpu/sfp-machine.h (FP_INIT_ROUNDMODE):
+       Likewise.
+       * sysdeps/powerpc/fpu/tst-setcontext-fpscr.c (_GET_DI_FPSCR): Likewise.
+       (_GET_SI_FPSCR): Likewise.
+       (_SET_SI_FPSCR): Likewise.
+
 2019-03-26  Adhemerval Zanella  <adhemerval.zanella@linaro.org>
 
        * math/math.h (fpclassify, isfinite, isnormal, isnan): Use builtin for

diff --git a/sysdeps/powerpc/fpu/fenv_libc.h b/sysdeps/powerpc/fpu/fenv_libc.h
index 67a9c9a51a9af277e7741bbbbf31b0d698f8a7a2..8a0bace84d1b49161dabd5d136941e7713939b83 100644 (file)
--- a/sysdeps/powerpc/fpu/fenv_libc.h
+++ b/sysdeps/powerpc/fpu/fenv_libc.h
@@ -32,8 +32,7 @@ extern const fenv_t *__fe_mask_env (void) attribute_hidden;
 
 /* Equivalent to fegetenv, but returns a fenv_t instead of taking a
    pointer.  */
-#define fegetenv_register() \
-        ({ fenv_t env; asm volatile ("mffs %0" : "=f" (env)); env; })
+#define fegetenv_register() __builtin_mffs()
 
 /* Equivalent to fesetenv, but takes a fenv_t instead of a pointer.  */
 #define fesetenv_register(env) \
@@ -45,7 +44,7 @@ extern const fenv_t *__fe_mask_env (void) attribute_hidden;
                          "mtfsf 0xff,%0,1,0; " \
                          ".machine pop" : : "f" (d)); \
          else \
-           asm volatile ("mtfsf 0xff,%0" : : "f" (d)); \
+           __builtin_mtfsf (0xff, d); \
        } while(0)
 
 /* This very handy macro:

diff --git a/sysdeps/powerpc/fpu/tst-setcontext-fpscr.c b/sysdeps/powerpc/fpu/tst-setcontext-fpscr.c
index 958afffc0b4cf1ec4d3486d6f2dbbb7333cec352..7dfd5a9e74f1e0cd2650b2318401be16034279e3 100644 (file)
--- a/sysdeps/powerpc/fpu/tst-setcontext-fpscr.c
+++ b/sysdeps/powerpc/fpu/tst-setcontext-fpscr.c
@@ -97,9 +97,7 @@ typedef unsigned int si_fpscr_t __attribute__ ((__mode__ (__SI__)));
 /* Macros for accessing the hardware control word on Power6[x].  */
 #define _GET_DI_FPSCR(__fpscr)                                         \
   ({union { double d; di_fpscr_t fpscr; } u;                           \
-    register double fr;                                                        \
-    __asm__ ("mffs %0" : "=f" (fr));                                   \
-    u.d = fr;                                                          \
+    u.d = __builtin_mffs ();                                           \
     (__fpscr) = u.fpscr;                                               \
     u.fpscr;                                                           \
   })
@@ -121,9 +119,7 @@ typedef unsigned int si_fpscr_t __attribute__ ((__mode__ (__SI__)));
 
 # define _GET_SI_FPSCR(__fpscr)                                                \
   ({union { double d; di_fpscr_t fpscr; } u;                           \
-    register double fr;                                                        \
-    __asm__ ("mffs %0" : "=f" (fr));                                   \
-    u.d = fr;                                                          \
+    u.d = __builtin_mffs ();                                           \
     (__fpscr) = (si_fpscr_t) u.fpscr;                                  \
     (si_fpscr_t) u.fpscr;                                              \
   })
@@ -137,7 +133,7 @@ typedef unsigned int si_fpscr_t __attribute__ ((__mode__ (__SI__)));
     u.fpscr = 0xfff80000ULL << 32;                                     \
     u.fpscr |= __fpscr & 0xffffffffULL;                                        \
     fr = u.d;                                                          \
-    __asm__ ("mtfsf 255,%0" : : "f" (fr));                             \
+    __builtin_mtfsf (255, fr);                                         \
     fr = 0.0;                                                          \
   }
 

diff --git a/sysdeps/powerpc/powerpc64/le/fpu/sfp-machine.h b/sysdeps/powerpc/powerpc64/le/fpu/sfp-machine.h
index ac74097d44701e955a8e767c77b3090b7b09682a..b4b27f95f4c8a39d9164c5f7dbb614457ed34a53 100644 (file)
--- a/sysdeps/powerpc/powerpc64/le/fpu/sfp-machine.h
+++ b/sysdeps/powerpc/powerpc64/le/fpu/sfp-machine.h
@@ -107,8 +107,7 @@ void __sfp_handle_exceptions (int);
 
 #define FP_INIT_ROUNDMODE                      \
   do {                                         \
-    __asm__ __volatile__ ("mffs %0"            \
-                         : "=f" (_fpscr.d));   \
+    _fpscr.d = __builtin_mffs ();              \
   } while (0)
 
 # define FP_ROUNDMODE  (_fpscr.i & FP_RND_MASK)