From 5593c5ec785373f1a5a2f713da156182a38ff5dd Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Sat, 21 Jan 2006 19:41:11 +0000 Subject: * sysdeps/powerpc/powerpc64/fpu/e_sqrt.c: New file. * sysdeps/powerpc/powerpc64/fpu/e_sqrtf.c: New file. * sysdeps/powerpc/fpu/bits/mathinline.h (__CPU_HAS_FSQRT): New macro. (__ieee754_sqrt, __ieee754_sqrtf): Use it. --- ChangeLog | 7 +++++++ sysdeps/powerpc/fpu/bits/mathinline.h | 16 +++++++++++----- sysdeps/powerpc/powerpc64/fpu/e_sqrt.c | 29 +++++++++++++++++++++++++++++ sysdeps/powerpc/powerpc64/fpu/e_sqrtf.c | 29 +++++++++++++++++++++++++++++ 4 files changed, 76 insertions(+), 5 deletions(-) create mode 100644 sysdeps/powerpc/powerpc64/fpu/e_sqrt.c create mode 100644 sysdeps/powerpc/powerpc64/fpu/e_sqrtf.c diff --git a/ChangeLog b/ChangeLog index 33a09f1850..a3cc377113 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2006-01-20 Jakub Jelinek + + * sysdeps/powerpc/powerpc64/fpu/e_sqrt.c: New file. + * sysdeps/powerpc/powerpc64/fpu/e_sqrtf.c: New file. + * sysdeps/powerpc/fpu/bits/mathinline.h (__CPU_HAS_FSQRT): New macro. + (__ieee754_sqrt, __ieee754_sqrtf): Use it. + 2006-01-21 Roland McGrath * time/time.h [__need_timespec et al]: Include here too. diff --git a/sysdeps/powerpc/fpu/bits/mathinline.h b/sysdeps/powerpc/fpu/bits/mathinline.h index 44f7dbec52..15da56384e 100644 --- a/sysdeps/powerpc/fpu/bits/mathinline.h +++ b/sysdeps/powerpc/fpu/bits/mathinline.h @@ -1,5 +1,5 @@ /* Inline math functions for powerpc. - Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2004 + Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2004, 2006 Free Software Foundation, Inc. This file is part of the GNU C Library. @@ -123,12 +123,18 @@ __NTH (fdimf (float __x, float __y)) #endif /* !__NO_MATH_INLINES && __OPTIMIZE__ */ /* This code is used internally in the GNU libc. */ -# ifdef __LIBC_INTERNAL_MATH_INLINES +#ifdef __LIBC_INTERNAL_MATH_INLINES #include #include #include +# if __WORDSIZE == 64 +# define __CPU_HAS_FSQRT 1 +# else +# define __CPU_HAS_FSQRT ((GLRO(dl_hwcap) & PPC_FEATURE_64) != 0) +# endif + extern double __slow_ieee754_sqrt (double); __MATH_INLINE double __NTH (__ieee754_sqrt (double __x)) @@ -136,7 +142,7 @@ __NTH (__ieee754_sqrt (double __x)) double __z; /* If the CPU is 64-bit we can use the optional FP instructions we. */ - if ((GLRO(dl_hwcap) & PPC_FEATURE_64) != 0) + if (__CPU_HAS_FSQRT) { /* Volatile is required to prevent the compiler from moving the fsqrt instruction above the branch. */ @@ -158,7 +164,7 @@ __NTH (__ieee754_sqrtf (float __x)) float __z; /* If the CPU is 64-bit we can use the optional FP instructions we. */ - if ((GLRO(dl_hwcap) & PPC_FEATURE_64) != 0) + if (__CPU_HAS_FSQRT) { /* Volatile is required to prevent the compiler from moving the fsqrts instruction above the branch. */ @@ -172,5 +178,5 @@ __NTH (__ieee754_sqrtf (float __x)) return __z; } -# endif /* __LIBC_INTERNAL_MATH_INLINES */ +#endif /* __LIBC_INTERNAL_MATH_INLINES */ #endif /* __GNUC__ && !_SOFT_FLOAT */ diff --git a/sysdeps/powerpc/powerpc64/fpu/e_sqrt.c b/sysdeps/powerpc/powerpc64/fpu/e_sqrt.c new file mode 100644 index 0000000000..0a229cbe27 --- /dev/null +++ b/sysdeps/powerpc/powerpc64/fpu/e_sqrt.c @@ -0,0 +1,29 @@ +/* Double-precision floating point square root. + Copyright (C) 1997, 2002, 2003, 2004, 2006 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, write to the Free + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA. */ + +#include +#include + +double +__ieee754_sqrt (double x) +{ + double z; + __asm __volatile ("fsqrt %0,%1" : "=f" (z) : "f" (x)); + return z; +} diff --git a/sysdeps/powerpc/powerpc64/fpu/e_sqrtf.c b/sysdeps/powerpc/powerpc64/fpu/e_sqrtf.c new file mode 100644 index 0000000000..0f17a64a8a --- /dev/null +++ b/sysdeps/powerpc/powerpc64/fpu/e_sqrtf.c @@ -0,0 +1,29 @@ +/* Single-precision floating point square root. + Copyright (C) 1997, 2003, 2004, 2006 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, write to the Free + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA. */ + +#include +#include + +float +__ieee754_sqrtf (float x) +{ + double z; + __asm ("fsqrts %0,%1" : "=f" (z) : "f" (x)); + return z; +} -- cgit 1.4.1