From ca3aac57efa89fc62813c86955a6b0f8dce8b3e7 Mon Sep 17 00:00:00 2001 From: Wilco Dijkstra Date: Fri, 24 Aug 2018 15:31:25 +0100 Subject: Remove unused math files Remove empty files due to the sin/cos improvements: k_sinf.c, k_cosf.c, k_cos.c, k_sin.c. After the tanf change s_rem_pio2f.c and k_rem_pio2f.c (and the ia64, m68k and powerpc equivalents) are no longer used, so remove them. All e_rem_pio2.c files were already empty or commented out, so remove them too. Passes build-many-glibcs. * math/Makefile: Remove empty files k_sin(f).c, k_cos(f).c. Remove unused files e_rem_pio2(f).c, k_rem_pio2f.c. * sysdeps/i386/fpu/e_rem_pio2.c: Delete file. * sysdeps/ia64/fpu/e_rem_pio2.c: Likewise. * sysdeps/ia64/fpu/e_rem_pio2f.c: Likewise. * sysdeps/ia64/fpu/k_rem_pio2f.c: Likewise. * sysdeps/ieee754/dbl-64/e_rem_pio2.c: Likewise. * sysdeps/ieee754/dbl-64/k_cos.c: Likewise. * sysdeps/ieee754/dbl-64/k_sin.c: Likewise. * sysdeps/ieee754/flt-32/e_rem_pio2f.c: Likewise. * sysdeps/ieee754/flt-32/k_cosf.c: Likewise. * sysdeps/ieee754/flt-32/k_rem_pio2f.c: Likewise. * sysdeps/ieee754/flt-32/k_sinf.c: Likewise. * sysdeps/m68k/m680x0/fpu/e_rem_pio2.c: Likewise * sysdeps/m68k/m680x0/fpu/e_rem_pio2f.c: Likewise * sysdeps/m68k/m680x0/fpu/k_rem_pio2f.c: Likewise * sysdeps/powerpc/fpu/e_rem_pio2f.c: Likewise. * sysdeps/powerpc/fpu/k_rem_pio2f.c: Likewise. --- sysdeps/powerpc/fpu/e_rem_pio2f.c | 188 -------------------------- sysdeps/powerpc/fpu/k_rem_pio2f.c | 273 -------------------------------------- 2 files changed, 461 deletions(-) delete mode 100644 sysdeps/powerpc/fpu/e_rem_pio2f.c delete mode 100644 sysdeps/powerpc/fpu/k_rem_pio2f.c (limited to 'sysdeps/powerpc/fpu') diff --git a/sysdeps/powerpc/fpu/e_rem_pio2f.c b/sysdeps/powerpc/fpu/e_rem_pio2f.c deleted file mode 100644 index 30fd53ee2c..0000000000 --- a/sysdeps/powerpc/fpu/e_rem_pio2f.c +++ /dev/null @@ -1,188 +0,0 @@ -/* e_rem_pio2f.c -- float version of e_rem_pio2.c - Copyright (C) 2011-2018 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Adhemerval Zanella , 2011 - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public License as - published by the Free Software Foundation; either version 2 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 - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with the GNU C Library; see the file COPYING.LIB. If - not, see . */ - -#include - -#include -#include "s_float_bitwise.h" - -/* defined in sysdeps/powerpc/fpu/k_rem_pio2f.c */ -int __fp_kernel_rem_pio2f (float *x, float *y, float e0, int32_t nx); - -/* __ieee754_rem_pio2f(x,y) - * - * return the remainder of x rem pi/2 in y[0]+y[1] - */ - -static const float npio2_hw[] = { - 1.57077026e+00, 3.14154053e+00, 4.71228027e+00, 6.28308105e+00, - 7.85388184e+00, 9.42456055e+00, 1.09953613e+01, 1.25661621e+01, - 1.41369629e+01, 1.57077637e+01, 1.72783203e+01, 1.88491211e+01, - 2.04199219e+01, 2.19907227e+01, 2.35615234e+01, 2.51323242e+01, - 2.67031250e+01, 2.82739258e+01, 2.98447266e+01, 3.14155273e+01, - 3.29863281e+01, 3.45566406e+01, 3.61279297e+01, 3.76982422e+01, - 3.92695312e+01, 4.08398438e+01, 4.24111328e+01, 4.39814453e+01, - 4.55527344e+01, 4.71230469e+01, 4.86943359e+01, 5.02646484e+01 -}; - - -static const float zero = 0.0000000000e+00; -static const float two8 = 2.5600000000e+02; - -static const float half = 5.0000000000e-01; -static const float invpio2 = 6.3661980629e-01; -static const float pio2_1 = 1.5707855225e+00; -static const float pio2_1t = 1.0804334124e-05; -static const float pio2_2 = 1.0804273188e-05; -static const float pio2_2t = 6.0770999344e-11; -static const float pio2_3 = 6.0770943833e-11; -static const float pio2_3t = 6.1232342629e-17; - -static const float pio4 = 7.8539801e-01; -static const float pio3_4 = 2.3561945e+00; -static const float pio2_24b = 1.5707951e+00; -static const float pio2_2e7 = 2.0106054e+02; - - -int32_t -__ieee754_rem_pio2f (float x, float *y) -{ - float ax, z, n, r, w, t, e0; - float tx[3]; - int32_t i, nx; - - ax = __builtin_fabsf (x); - if (ax <= pio4) - { - y[0] = x; - y[1] = 0; - return 0; - } - if (ax < pio3_4) - { - if (x > 0) - { - z = x - pio2_1; - if (!__float_and_test28 (ax, pio2_24b)) - { - y[0] = z - pio2_1t; - y[1] = (z - y[0]) - pio2_1t; - } - else - { - z -= pio2_2; - y[0] = z - pio2_2t; - y[1] = (z - y[0]) - pio2_2t; - } - return 1; - } - else - { - z = x + pio2_1; - if (!__float_and_test28 (ax, pio2_24b)) - { - y[0] = z + pio2_1t; - y[1] = (z - y[0]) + pio2_1t; - } - else - { - z += pio2_2; - y[0] = z + pio2_2t; - y[1] = (z - y[0]) + pio2_2t; - } - return -1; - } - } - if (ax <= pio2_2e7) - { - n = __floorf (ax * invpio2 + half); - i = (int32_t) n; - r = ax - n * pio2_1; - w = n * pio2_1t; /* 1st round good to 40 bit */ - if (i < 32 && !__float_and_test24 (ax, npio2_hw[i - 1])) - { - y[0] = r - w; - } - else - { - float i, j; - j = __float_and8 (ax); - y[0] = r - w; - i = __float_and8 (y[0]); - if (j / i > 256.0 || j / i < 3.9062500e-3) - { /* 2nd iterations needed, good to 57 */ - t = r; - w = n * pio2_2; - r = t - w; - w = n * pio2_2t - ((t - r) - w); - y[0] = r - w; - i = __float_and8 (y[0]); - if (j / i > 33554432 || j / i < 2.9802322e-8) - { /* 3rd iteration needed, 74 bits acc */ - t = r; - w = n * pio2_3; - r = t - w; - w = n * pio2_3t - ((t - r) - w); - y[0] = r - w; - } - } - } - y[1] = (r - y[0]) - w; - if (x < 0) - { - y[0] = -y[0]; - y[1] = -y[1]; - return -i; - } - else - { - return i; - } - } - - /* all other (large) arguments */ - if (isnanf (x) || isinff (x)) - { - y[0] = y[1] = x - x; - return 0; - } - - /* set z = scalbn(|x|,ilogb(x)-7) */ - e0 = __float_and8 (ax / 128.0); - z = ax / e0; - - tx[0] = __floorf (z); - z = (z - tx[0]) * two8; - tx[1] = __floorf (z); - z = (z - tx[1]) * two8; - tx[2] = __floorf (z); - - nx = 3; - while (tx[nx - 1] == zero) - nx--; - - i = __fp_kernel_rem_pio2f (tx, y, e0, nx); - if (x < 0) - { - y[0] = -y[0]; - y[1] = -y[1]; - return -i; - } - return i; -} diff --git a/sysdeps/powerpc/fpu/k_rem_pio2f.c b/sysdeps/powerpc/fpu/k_rem_pio2f.c deleted file mode 100644 index 7e5a08ba5a..0000000000 --- a/sysdeps/powerpc/fpu/k_rem_pio2f.c +++ /dev/null @@ -1,273 +0,0 @@ -/* k_rem_pio2f.c -- float version of e_rem_pio2.c - Copyright (C) 2011-2018 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Adhemerval Zanella , 2011 - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public License as - published by the Free Software Foundation; either version 2 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 - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with the GNU C Library; see the file COPYING.LIB. If - not, see . */ - -#include - -#include -#include "s_float_bitwise.h" - - -static const float two_over_pi[] = { - 1.62000000e+02, 2.49000000e+02, 1.31000000e+02, 1.10000000e+02, - 7.80000000e+01, 6.80000000e+01, 2.10000000e+01, 4.10000000e+01, - 2.52000000e+02, 3.90000000e+01, 8.70000000e+01, 2.09000000e+02, - 2.45000000e+02, 5.20000000e+01, 2.21000000e+02, 1.92000000e+02, - 2.19000000e+02, 9.80000000e+01, 1.49000000e+02, 1.53000000e+02, - 6.00000000e+01, 6.70000000e+01, 1.44000000e+02, 6.50000000e+01, - 2.54000000e+02, 8.10000000e+01, 9.90000000e+01, 1.71000000e+02, - 2.22000000e+02, 1.87000000e+02, 1.97000000e+02, 9.70000000e+01, - 1.83000000e+02, 3.60000000e+01, 1.10000000e+02, 5.80000000e+01, - 6.60000000e+01, 7.70000000e+01, 2.10000000e+02, 2.24000000e+02, - 6.00000000e+00, 7.30000000e+01, 4.60000000e+01, 2.34000000e+02, - 9.00000000e+00, 2.09000000e+02, 1.46000000e+02, 2.80000000e+01, - 2.54000000e+02, 2.90000000e+01, 2.35000000e+02, 2.80000000e+01, - 1.77000000e+02, 4.10000000e+01, 1.67000000e+02, 6.20000000e+01, - 2.32000000e+02, 1.30000000e+02, 5.30000000e+01, 2.45000000e+02, - 4.60000000e+01, 1.87000000e+02, 6.80000000e+01, 1.32000000e+02, - 2.33000000e+02, 1.56000000e+02, 1.12000000e+02, 3.80000000e+01, - 1.80000000e+02, 9.50000000e+01, 1.26000000e+02, 6.50000000e+01, - 5.70000000e+01, 1.45000000e+02, 2.14000000e+02, 5.70000000e+01, - 1.31000000e+02, 8.30000000e+01, 5.70000000e+01, 2.44000000e+02, - 1.56000000e+02, 1.32000000e+02, 9.50000000e+01, 1.39000000e+02, - 1.89000000e+02, 2.49000000e+02, 4.00000000e+01, 5.90000000e+01, - 3.10000000e+01, 2.48000000e+02, 1.51000000e+02, 2.55000000e+02, - 2.22000000e+02, 5.00000000e+00, 1.52000000e+02, 1.50000000e+01, - 2.39000000e+02, 4.70000000e+01, 1.70000000e+01, 1.39000000e+02, - 9.00000000e+01, 1.00000000e+01, 1.09000000e+02, 3.10000000e+01, - 1.09000000e+02, 5.40000000e+01, 1.26000000e+02, 2.07000000e+02, - 3.90000000e+01, 2.03000000e+02, 9.00000000e+00, 1.83000000e+02, - 7.90000000e+01, 7.00000000e+01, 6.30000000e+01, 1.02000000e+02, - 1.58000000e+02, 9.50000000e+01, 2.34000000e+02, 4.50000000e+01, - 1.17000000e+02, 3.90000000e+01, 1.86000000e+02, 1.99000000e+02, - 2.35000000e+02, 2.29000000e+02, 2.41000000e+02, 1.23000000e+02, - 6.10000000e+01, 7.00000000e+00, 5.70000000e+01, 2.47000000e+02, - 1.38000000e+02, 8.20000000e+01, 1.46000000e+02, 2.34000000e+02, - 1.07000000e+02, 2.51000000e+02, 9.50000000e+01, 1.77000000e+02, - 3.10000000e+01, 1.41000000e+02, 9.30000000e+01, 8.00000000e+00, - 8.60000000e+01, 3.00000000e+00, 4.80000000e+01, 7.00000000e+01, - 2.52000000e+02, 1.23000000e+02, 1.07000000e+02, 1.71000000e+02, - 2.40000000e+02, 2.07000000e+02, 1.88000000e+02, 3.20000000e+01, - 1.54000000e+02, 2.44000000e+02, 5.40000000e+01, 2.90000000e+01, - 1.69000000e+02, 2.27000000e+02, 1.45000000e+02, 9.70000000e+01, - 9.40000000e+01, 2.30000000e+02, 2.70000000e+01, 8.00000000e+00, - 1.01000000e+02, 1.53000000e+02, 1.33000000e+02, 9.50000000e+01, - 2.00000000e+01, 1.60000000e+02, 1.04000000e+02, 6.40000000e+01, - 1.41000000e+02, 2.55000000e+02, 2.16000000e+02, 1.28000000e+02, - 7.70000000e+01, 1.15000000e+02, 3.90000000e+01, 4.90000000e+01, - 6.00000000e+00, 6.00000000e+00, 2.10000000e+01, 8.60000000e+01, - 2.02000000e+02, 1.15000000e+02, 1.68000000e+02, 2.01000000e+02, - 9.60000000e+01, 2.26000000e+02, 1.23000000e+02, 1.92000000e+02, - 1.40000000e+02, 1.07000000e+02 -}; - - -static const float PIo2[] = { - 1.5703125000e+00, /* 0x3fc90000 */ - 4.5776367188e-04, /* 0x39f00000 */ - 2.5987625122e-05, /* 0x37da0000 */ - 7.5437128544e-08, /* 0x33a20000 */ - 6.0026650317e-11, /* 0x2e840000 */ - 7.3896444519e-13, /* 0x2b500000 */ - 5.3845816694e-15, /* 0x27c20000 */ - 5.6378512969e-18, /* 0x22d00000 */ - 8.3009228831e-20, /* 0x1fc40000 */ - 3.2756352257e-22, /* 0x1bc60000 */ - 6.3331015649e-25, /* 0x17440000 */ -}; - - -static const float zero = 0.0000000000e+00; -static const float one = 1.0000000000; -static const float twon8 = 3.9062500000e-03; -static const float two8 = 2.5600000000e+02; - - -int32_t -__fp_kernel_rem_pio2f (float *x, float *y, float e0, int32_t nx) -{ - int32_t jz, jx, jv, jp, jk, carry, n, iq[20], i, j, k, m, q0, ih, exp; - float z, fw, f[20], fq[20], q[20]; - - /* initialize jk */ - jp = jk = 9; - - /* determine jx,jv,q0, note that 3>q0 */ - jx = nx - 1; - exp = __float_get_exp (e0) - 127; - jv = (exp - 3) / 8; - if (jv < 0) - jv = 0; - q0 = exp - 8 * (jv + 1); - - /* set up f[0] to f[jx+jk] where f[jx+jk] = two_over_pi[jv+jk] */ - j = jv - jx; - m = jx + jk; - for (i = 0; i <= m; i++, j++) - f[i] = (j < 0) ? zero : two_over_pi[j]; - - /* compute q[0],q[1],...q[jk] */ - for (i = 0; i <= jk; i++) - { - for (j = 0, fw = 0.0; j <= jx; j++) - fw += x[j] * f[jx + i - j]; - q[i] = fw; - } - - jz = jk; -recompute: - /* distill q[] into iq[] reversingly */ - for (i = 0, j = jz, z = q[jz]; j > 0; i++, j--) - { - fw = __truncf (twon8 * z); - iq[i] = (int32_t) (z - two8 * fw); - z = q[j - 1] + fw; - } - - /* compute n */ - z = __scalbnf (z, q0); /* actual value of z */ - z -= 8.0 * __floorf (z * 0.125); /* trim off integer >= 8 */ - n = (int32_t) z; - z -= __truncf (z); - ih = 0; - if (q0 > 0) - { /* need iq[jz-1] to determine n */ - i = (iq[jz - 1] >> (8 - q0)); - n += i; - iq[jz - 1] -= i << (8 - q0); - ih = iq[jz - 1] >> (7 - q0); - } - else if (q0 == 0) - ih = iq[jz - 1] >> 7; - else if (z >= 0.5) - ih = 2; - - if (ih > 0) - { /* q > 0.5 */ - n += 1; - carry = 0; - for (i = 0; i < jz; i++) - { /* compute 1-q */ - j = iq[i]; - if (carry == 0) - { - if (j != 0) - { - carry = 1; - iq[i] = 0x100 - j; - } - } - else - iq[i] = 0xff - j; - } - if (q0 > 0) - { /* rare case: chance is 1 in 12 */ - switch (q0) - { - case 1: - iq[jz - 1] &= 0x7f; - break; - case 2: - iq[jz - 1] &= 0x3f; - break; - } - } - if (ih == 2) - { - z = one - z; - if (carry != 0) - z -= __scalbnf (one, q0); - } - } - - /* check if recomputation is needed */ - if (z == zero) - { - j = 0; - for (i = jz - 1; i >= jk; i--) - j |= iq[i]; - if (j == 0) - { /* need recomputation */ - for (k = 1; iq[jk - k] == 0; k++); /* k = no. of terms needed */ - - for (i = jz + 1; i <= jz + k; i++) - { /* add q[jz+1] to q[jz+k] */ - f[jx + i] = two_over_pi[jv + i]; - for (j = 0, fw = 0.0; j <= jx; j++) - fw += x[j] * f[jx + i - j]; - q[i] = fw; - } - jz += k; - goto recompute; - } - } - - /* chop off zero terms */ - if (z == 0.0) - { - jz -= 1; - q0 -= 8; - while (iq[jz] == 0) - { - jz--; - q0 -= 8; - } - } - else - { /* break z into 8-bit if necessary */ - z = __scalbnf (z, -q0); - if (z >= two8) - { - fw = __truncf (twon8 * z); - iq[jz] = (int32_t) (z - two8 * fw); - jz += 1; - q0 += 8; - iq[jz] = (int32_t) fw; - } - else - iq[jz] = (int32_t) z; - } - - /* convert integer "bit" chunk to floating-point value */ - fw = __scalbnf (one, q0); - for (i = jz; i >= 0; i--) - { - q[i] = fw * (float) iq[i]; - fw *= twon8; - } - - /* compute PIo2[0,...,jp]*q[jz,...,0] */ - for (i = jz; i >= 0; i--) - { - for (fw = 0.0, k = 0; k <= jp && k <= jz - i; k++) - fw += PIo2[k] * q[i + k]; - fq[jz - i] = fw; - } - - /* compress fq[] into y[] */ - fw = 0.0; - for (i = jz; i >= 0; i--) - fw += fq[i]; - y[0] = (ih == 0) ? fw : -fw; - fw = fq[0] - fw; - for (i = 1; i <= jz; i++) - fw += fq[i]; - y[1] = (ih == 0) ? fw : -fw; - - return n & 7; -} -- cgit 1.4.1