Format s_sin.c

2 files changed, 1214 insertions, 904 deletions

diff --git a/ChangeLog b/ChangeLog
index afeadd7525..9a9be01a16 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2013-04-30  Siddhesh Poyarekar  <siddhesh@redhat.com>
 
+	* sysdeps/ieee754/dbl-64/s_sin.c: Format code.
+
 	* benchtests/Makefile (bench): Remove slow benchmarks.
 	* benchtests/atan-inputs: Add slow benchmark inputs.
 	* benchtests/bench-modf.c (NUM_VARIANTS): Define.
diff --git a/sysdeps/ieee754/dbl-64/s_sin.c b/sysdeps/ieee754/dbl-64/s_sin.c
index 5038b72612..5c388c8b93 100644
--- a/sysdeps/ieee754/dbl-64/s_sin.c
+++ b/sysdeps/ieee754/dbl-64/s_sin.c
@@ -66,299 +66,359 @@ extern const union
 } __sincostab attribute_hidden;
 
 static const double
-	  sn3 = -1.66666666666664880952546298448555E-01,
-	  sn5 =  8.33333214285722277379541354343671E-03,
-	  cs2 =  4.99999999999999999999950396842453E-01,
-	  cs4 = -4.16666666666664434524222570944589E-02,
-	  cs6 =  1.38888874007937613028114285595617E-03;
-
-void __dubsin(double x, double dx, double w[]);
-void __docos(double x, double dx, double w[]);
-double __mpsin(double x, double dx);
-double __mpcos(double x, double dx);
-double __mpsin1(double x);
-double __mpcos1(double x);
-static double slow(double x);
-static double slow1(double x);
-static double slow2(double x);
-static double sloww(double x, double dx, double orig);
-static double sloww1(double x, double dx, double orig);
-static double sloww2(double x, double dx, double orig, int n);
-static double bsloww(double x, double dx, double orig, int n);
-static double bsloww1(double x, double dx, double orig, int n);
-static double bsloww2(double x, double dx, double orig, int n);
-int __branred(double x, double *a, double *aa);
-static double cslow2(double x);
-static double csloww(double x, double dx, double orig);
-static double csloww1(double x, double dx, double orig);
-static double csloww2(double x, double dx, double orig, int n);
+  sn3 = -1.66666666666664880952546298448555E-01,
+  sn5 = 8.33333214285722277379541354343671E-03,
+  cs2 = 4.99999999999999999999950396842453E-01,
+  cs4 = -4.16666666666664434524222570944589E-02,
+  cs6 = 1.38888874007937613028114285595617E-03;
+
+void __dubsin (double x, double dx, double w[]);
+void __docos (double x, double dx, double w[]);
+double __mpsin (double x, double dx);
+double __mpcos (double x, double dx);
+double __mpsin1 (double x);
+double __mpcos1 (double x);
+static double slow (double x);
+static double slow1 (double x);
+static double slow2 (double x);
+static double sloww (double x, double dx, double orig);
+static double sloww1 (double x, double dx, double orig);
+static double sloww2 (double x, double dx, double orig, int n);
+static double bsloww (double x, double dx, double orig, int n);
+static double bsloww1 (double x, double dx, double orig, int n);
+static double bsloww2 (double x, double dx, double orig, int n);
+int __branred (double x, double *a, double *aa);
+static double cslow2 (double x);
+static double csloww (double x, double dx, double orig);
+static double csloww1 (double x, double dx, double orig);
+static double csloww2 (double x, double dx, double orig, int n);
+
 /*******************************************************************/
 /* An ultimate sin routine. Given an IEEE double machine number x   */
 /* it computes the correctly rounded (to nearest) value of sin(x)  */
 /*******************************************************************/
 double
 SECTION
-__sin(double x){
-	double xx,res,t,cor,y,s,c,sn,ssn,cs,ccs,xn,a,da,db,eps,xn1,xn2;
-	mynumber u,v;
-	int4 k,m,n;
-	double retval = 0;
-
-	SET_RESTORE_ROUND_53BIT (FE_TONEAREST);
-
-	u.x = x;
-	m = u.i[HIGH_HALF];
-	k = 0x7fffffff&m;              /* no sign           */
-	if (k < 0x3e500000)            /* if x->0 =>sin(x)=x */
-	  { retval = x; goto ret; }
+__sin (double x)
+{
+  double xx, res, t, cor, y, s, c, sn, ssn, cs, ccs, xn, a, da, db, eps, xn1,
+    xn2;
+  mynumber u, v;
+  int4 k, m, n;
+  double retval = 0;
+
+  SET_RESTORE_ROUND_53BIT (FE_TONEAREST);
+
+  u.x = x;
+  m = u.i[HIGH_HALF];
+  k = 0x7fffffff & m;		/* no sign           */
+  if (k < 0x3e500000)		/* if x->0 =>sin(x)=x */
+    {
+      retval = x;
+      goto ret;
+    }
  /*---------------------------- 2^-26 < |x|< 0.25 ----------------------*/
-	else  if (k < 0x3fd00000){
-	  xx = x*x;
-	  /*Taylor series */
-	  t = ((((s5.x*xx + s4.x)*xx + s3.x)*xx + s2.x)*xx + s1.x)*(xx*x);
-	  res = x+t;
-	  cor = (x-res)+t;
-	  retval = (res == res + 1.07*cor)? res : slow(x);
-	  goto ret;
-	}    /*  else  if (k < 0x3fd00000)    */
+  else if (k < 0x3fd00000)
+    {
+      xx = x * x;
+      /*Taylor series.  */
+      t = (((((s5.x * xx + s4.x) * xx + s3.x) * xx + s2.x) * xx + s1.x)
+	   * (xx * x));
+      res = x + t;
+      cor = (x - res) + t;
+      retval = (res == res + 1.07 * cor) ? res : slow (x);
+      goto ret;
+    }				/*  else  if (k < 0x3fd00000)    */
 /*---------------------------- 0.25<|x|< 0.855469---------------------- */
-	else if (k < 0x3feb6000)  {
-	  u.x=(m>0)?big.x+x:big.x-x;
-	  y=(m>0)?x-(u.x-big.x):x+(u.x-big.x);
-	  xx=y*y;
-	  s = y + y*xx*(sn3 +xx*sn5);
-	  c = xx*(cs2 +xx*(cs4 + xx*cs6));
-	  k=u.i[LOW_HALF]<<2;
-	  sn=(m>0)?__sincostab.x[k]:-__sincostab.x[k];
-	  ssn=(m>0)?__sincostab.x[k+1]:-__sincostab.x[k+1];
-	  cs=__sincostab.x[k+2];
-	  ccs=__sincostab.x[k+3];
-	  cor=(ssn+s*ccs-sn*c)+cs*s;
-	  res=sn+cor;
-	  cor=(sn-res)+cor;
-	  retval = (res==res+1.096*cor)? res : slow1(x);
-	  goto ret;
-	}    /*   else  if (k < 0x3feb6000)    */
+  else if (k < 0x3feb6000)
+    {
+      u.x = (m > 0) ? big.x + x : big.x - x;
+      y = (m > 0) ? x - (u.x - big.x) : x + (u.x - big.x);
+      xx = y * y;
+      s = y + y * xx * (sn3 + xx * sn5);
+      c = xx * (cs2 + xx * (cs4 + xx * cs6));
+      k = u.i[LOW_HALF] << 2;
+      sn = (m > 0) ? __sincostab.x[k] : -__sincostab.x[k];
+      ssn = (m > 0) ? __sincostab.x[k + 1] : -__sincostab.x[k + 1];
+      cs = __sincostab.x[k + 2];
+      ccs = __sincostab.x[k + 3];
+      cor = (ssn + s * ccs - sn * c) + cs * s;
+      res = sn + cor;
+      cor = (sn - res) + cor;
+      retval = (res == res + 1.096 * cor) ? res : slow1 (x);
+      goto ret;
+    }				/*   else  if (k < 0x3feb6000)    */
 
 /*----------------------- 0.855469  <|x|<2.426265  ----------------------*/
-	else if (k <  0x400368fd ) {
-
-	  y = (m>0)? hp0.x-x:hp0.x+x;
-	  if (y>=0) {
-	    u.x = big.x+y;
-	    y = (y-(u.x-big.x))+hp1.x;
-	  }
-	  else {
-	    u.x = big.x-y;
-	    y = (-hp1.x) - (y+(u.x-big.x));
-	  }
-	  xx=y*y;
-	  s = y + y*xx*(sn3 +xx*sn5);
-	  c = xx*(cs2 +xx*(cs4 + xx*cs6));
-	  k=u.i[LOW_HALF]<<2;
-	  sn=__sincostab.x[k];
-	  ssn=__sincostab.x[k+1];
-	  cs=__sincostab.x[k+2];
-	  ccs=__sincostab.x[k+3];
-	  cor=(ccs-s*ssn-cs*c)-sn*s;
-	  res=cs+cor;
-	  cor=(cs-res)+cor;
-	  retval = (res==res+1.020*cor)? ((m>0)?res:-res) : slow2(x);
-	  goto ret;
-	} /*   else  if (k < 0x400368fd)    */
+  else if (k < 0x400368fd)
+    {
+
+      y = (m > 0) ? hp0.x - x : hp0.x + x;
+      if (y >= 0)
+	{
+	  u.x = big.x + y;
+	  y = (y - (u.x - big.x)) + hp1.x;
+	}
+      else
+	{
+	  u.x = big.x - y;
+	  y = (-hp1.x) - (y + (u.x - big.x));
+	}
+      xx = y * y;
+      s = y + y * xx * (sn3 + xx * sn5);
+      c = xx * (cs2 + xx * (cs4 + xx * cs6));
+      k = u.i[LOW_HALF] << 2;
+      sn = __sincostab.x[k];
+      ssn = __sincostab.x[k + 1];
+      cs = __sincostab.x[k + 2];
+      ccs = __sincostab.x[k + 3];
+      cor = (ccs - s * ssn - cs * c) - sn * s;
+      res = cs + cor;
+      cor = (cs - res) + cor;
+      retval = (res == res + 1.020 * cor) ? ((m > 0) ? res : -res) : slow2 (x);
+      goto ret;
+    }				/*   else  if (k < 0x400368fd)    */
 
 /*-------------------------- 2.426265<|x|< 105414350 ----------------------*/
-	else if (k < 0x419921FB ) {
-	  t = (x*hpinv.x + toint.x);
-	  xn = t - toint.x;
-	  v.x = t;
-	  y = (x - xn*mp1.x) - xn*mp2.x;
-	  n =v.i[LOW_HALF]&3;
-	  da = xn*mp3.x;
-	  a=y-da;
-	  da = (y-a)-da;
-	  eps = ABS(x)*1.2e-30;
-
-	  switch (n) { /* quarter of unit circle */
-	  case 0:
-	  case 2:
-	    xx = a*a;
-	    if (n) {a=-a;da=-da;}
-	    if (xx < 0.01588) {
-		      /*Taylor series */
-	      t = (((((s5.x*xx + s4.x)*xx + s3.x)*xx + s2.x)*xx + s1.x)*a - 0.5*da)*xx+da;
-	      res = a+t;
-	      cor = (a-res)+t;
-	      cor = (cor>0)? 1.02*cor+eps : 1.02*cor -eps;
-	      retval = (res == res + cor)? res : sloww(a,da,x);
+  else if (k < 0x419921FB)
+    {
+      t = (x * hpinv.x + toint.x);
+      xn = t - toint.x;
+      v.x = t;
+      y = (x - xn * mp1.x) - xn * mp2.x;
+      n = v.i[LOW_HALF] & 3;
+      da = xn * mp3.x;
+      a = y - da;
+      da = (y - a) - da;
+      eps = ABS (x) * 1.2e-30;
+
+      switch (n)
+	{			/* quarter of unit circle */
+	case 0:
+	case 2:
+	  xx = a * a;
+	  if (n)
+	    {
+	      a = -a;
+	      da = -da;
+	    }
+	  if (xx < 0.01588)
+	    {
+	      /*Taylor series */
+	      t = (((((s5.x * xx + s4.x) * xx + s3.x) * xx + s2.x) * xx
+		    + s1.x) * a - 0.5 * da) * xx + da;
+	      res = a + t;
+	      cor = (a - res) + t;
+	      cor = (cor > 0) ? 1.02 * cor + eps : 1.02 * cor - eps;
+	      retval = (res == res + cor) ? res : sloww (a, da, x);
 	      goto ret;
 	    }
-	    else  {
-	      if (a>0)
-		{m=1;t=a;db=da;}
+	  else
+	    {
+	      if (a > 0)
+		{
+		  m = 1;
+		  t = a;
+		  db = da;
+		}
 	      else
-		{m=0;t=-a;db=-da;}
-	      u.x=big.x+t;
-	      y=t-(u.x-big.x);
-	      xx=y*y;
-	      s = y + (db+y*xx*(sn3 +xx*sn5));
-	      c = y*db+xx*(cs2 +xx*(cs4 + xx*cs6));
-	      k=u.i[LOW_HALF]<<2;
-	      sn=__sincostab.x[k];
-	      ssn=__sincostab.x[k+1];
-	      cs=__sincostab.x[k+2];
-	      ccs=__sincostab.x[k+3];
-	      cor=(ssn+s*ccs-sn*c)+cs*s;
-	      res=sn+cor;
-	      cor=(sn-res)+cor;
-	      cor = (cor>0)? 1.035*cor+eps : 1.035*cor-eps;
-	      retval = (res==res+cor)? ((m)?res:-res) : sloww1(a,da,x);
+		{
+		  m = 0;
+		  t = -a;
+		  db = -da;
+		}
+	      u.x = big.x + t;
+	      y = t - (u.x - big.x);
+	      xx = y * y;
+	      s = y + (db + y * xx * (sn3 + xx * sn5));
+	      c = y * db + xx * (cs2 + xx * (cs4 + xx * cs6));
+	      k = u.i[LOW_HALF] << 2;
+	      sn = __sincostab.x[k];
+	      ssn = __sincostab.x[k + 1];
+	      cs = __sincostab.x[k + 2];
+	      ccs = __sincostab.x[k + 3];
+	      cor = (ssn + s * ccs - sn * c) + cs * s;
+	      res = sn + cor;
+	      cor = (sn - res) + cor;
+	      cor = (cor > 0) ? 1.035 * cor + eps : 1.035 * cor - eps;
+	      retval = ((res == res + cor) ? ((m) ? res : -res)
+			: sloww1 (a, da, x));
 	      goto ret;
 	    }
-	    break;
-
-	  case 1:
-	  case 3:
-	    if (a<0)
-	      {a=-a;da=-da;}
-	    u.x=big.x+a;
-	    y=a-(u.x-big.x)+da;
-	    xx=y*y;
-	    k=u.i[LOW_HALF]<<2;
-	    sn=__sincostab.x[k];
-	    ssn=__sincostab.x[k+1];
-	    cs=__sincostab.x[k+2];
-	    ccs=__sincostab.x[k+3];
-	    s = y + y*xx*(sn3 +xx*sn5);
-	    c = xx*(cs2 +xx*(cs4 + xx*cs6));
-	    cor=(ccs-s*ssn-cs*c)-sn*s;
-	    res=cs+cor;
-	    cor=(cs-res)+cor;
-	    cor = (cor>0)? 1.025*cor+eps : 1.025*cor-eps;
-	    retval = (res==res+cor)? ((n&2)?-res:res) : sloww2(a,da,x,n);
-	    goto ret;
-
-	    break;
-
-	  }
-
-	}    /*   else  if (k <  0x419921FB )    */
+	  break;
+
+	case 1:
+	case 3:
+	  if (a < 0)
+	    {
+	      a = -a;
+	      da = -da;
+	    }
+	  u.x = big.x + a;
+	  y = a - (u.x - big.x) + da;
+	  xx = y * y;
+	  k = u.i[LOW_HALF] << 2;
+	  sn = __sincostab.x[k];
+	  ssn = __sincostab.x[k + 1];
+	  cs = __sincostab.x[k + 2];
+	  ccs = __sincostab.x[k + 3];
+	  s = y + y * xx * (sn3 + xx * sn5);
+	  c = xx * (cs2 + xx * (cs4 + xx * cs6));
+	  cor = (ccs - s * ssn - cs * c) - sn * s;
+	  res = cs + cor;
+	  cor = (cs - res) + cor;
+	  cor = (cor > 0) ? 1.025 * cor + eps : 1.025 * cor - eps;
+	  retval = ((res == res + cor) ? ((n & 2) ? -res : res)
+		    : sloww2 (a, da, x, n));
+	  goto ret;
+
+	  break;
+	}
+
+    }				/*   else  if (k <  0x419921FB )    */
 
 /*---------------------105414350 <|x|< 281474976710656 --------------------*/
-	else if (k < 0x42F00000 ) {
-	  t = (x*hpinv.x + toint.x);
-	  xn = t - toint.x;
-	  v.x = t;
-	  xn1 = (xn+8.0e22)-8.0e22;
-	  xn2 = xn - xn1;
-	  y = ((((x - xn1*mp1.x) - xn1*mp2.x)-xn2*mp1.x)-xn2*mp2.x);
-	  n =v.i[LOW_HALF]&3;
-	  da = xn1*pp3.x;
-	  t=y-da;
-	  da = (y-t)-da;
-	  da = (da - xn2*pp3.x) -xn*pp4.x;
-	  a = t+da;
-	  da = (t-a)+da;
-	  eps = 1.0e-24;
-
-	  switch (n) {
-	  case 0:
-	  case 2:
-	    xx = a*a;
-	    if (n) {a=-a;da=-da;}
-	    if (xx < 0.01588) {
+  else if (k < 0x42F00000)
+    {
+      t = (x * hpinv.x + toint.x);
+      xn = t - toint.x;
+      v.x = t;
+      xn1 = (xn + 8.0e22) - 8.0e22;
+      xn2 = xn - xn1;
+      y = ((((x - xn1 * mp1.x) - xn1 * mp2.x) - xn2 * mp1.x) - xn2 * mp2.x);
+      n = v.i[LOW_HALF] & 3;
+      da = xn1 * pp3.x;
+      t = y - da;
+      da = (y - t) - da;
+      da = (da - xn2 * pp3.x) - xn * pp4.x;
+      a = t + da;
+      da = (t - a) + da;
+      eps = 1.0e-24;
+
+      switch (n)
+	{
+	case 0:
+	case 2:
+	  xx = a * a;
+	  if (n)
+	    {
+	      a = -a;
+	      da = -da;
+	    }
+	  if (xx < 0.01588)
+	    {
 	      /* Taylor series */
-	      t = (((((s5.x*xx + s4.x)*xx + s3.x)*xx + s2.x)*xx + s1.x)*a - 0.5*da)*xx+da;
-	      res = a+t;
-	      cor = (a-res)+t;
-	      cor = (cor>0)? 1.02*cor+eps : 1.02*cor -eps;
-	      retval = (res == res + cor)? res : bsloww(a,da,x,n);
+	      t = (((((s5.x * xx + s4.x) * xx + s3.x) * xx + s2.x) * xx
+		    + s1.x) * a - 0.5 * da) * xx + da;
+	      res = a + t;
+	      cor = (a - res) + t;
+	      cor = (cor > 0) ? 1.02 * cor + eps : 1.02 * cor - eps;
+	      retval = (res == res + cor) ? res : bsloww (a, da, x, n);
 	      goto ret;
 	    }
-	    else  {
-	      if (a>0) {m=1;t=a;db=da;}
-	      else {m=0;t=-a;db=-da;}
-	      u.x=big.x+t;
-	      y=t-(u.x-big.x);
-	      xx=y*y;
-	      s = y + (db+y*xx*(sn3 +xx*sn5));
-	      c = y*db+xx*(cs2 +xx*(cs4 + xx*cs6));
-	      k=u.i[LOW_HALF]<<2;
-	      sn=__sincostab.x[k];
-	      ssn=__sincostab.x[k+1];
-	      cs=__sincostab.x[k+2];
-	      ccs=__sincostab.x[k+3];
-	      cor=(ssn+s*ccs-sn*c)+cs*s;
-	      res=sn+cor;
-	      cor=(sn-res)+cor;
-	      cor = (cor>0)? 1.035*cor+eps : 1.035*cor-eps;
-	      retval = (res==res+cor)? ((m)?res:-res) : bsloww1(a,da,x,n);
+	  else
+	    {
+	      if (a > 0)
+		{
+		  m = 1;
+		  t = a;
+		  db = da;
+		}
+	      else
+		{
+		  m = 0;
+		  t = -a;
+		  db = -da;
+		}
+	      u.x = big.x + t;
+	      y = t - (u.x - big.x);
+	      xx = y * y;
+	      s = y + (db + y * xx * (sn3 + xx * sn5));
+	      c = y * db + xx * (cs2 + xx * (cs4 + xx * cs6));
+	      k = u.i[LOW_HALF] << 2;
+	      sn = __sincostab.x[k];
+	      ssn = __sincostab.x[k + 1];
+	      cs = __sincostab.x[k + 2];
+	      ccs = __sincostab.x[k + 3];
+	      cor = (ssn + s * ccs - sn * c) + cs * s;
+	      res = sn + cor;
+	      cor = (sn - res) + cor;
+	      cor = (cor > 0) ? 1.035 * cor + eps : 1.035 * cor - eps;
+	      retval = ((res == res + cor) ? ((m) ? res : -res)
+			: bsloww1 (a, da, x, n));
 	      goto ret;
-		   }
-	    break;
-
-	  case 1:
-	  case 3:
-	    if (a<0)
-	      {a=-a;da=-da;}
-	    u.x=big.x+a;
-	    y=a-(u.x-big.x)+da;
-	    xx=y*y;
-	    k=u.i[LOW_HALF]<<2;
-	    sn=__sincostab.x[k];
-	    ssn=__sincostab.x[k+1];
-	    cs=__sincostab.x[k+2];
-	    ccs=__sincostab.x[k+3];
-	    s = y + y*xx*(sn3 +xx*sn5);
-	    c = xx*(cs2 +xx*(cs4 + xx*cs6));
-	    cor=(ccs-s*ssn-cs*c)-sn*s;
-	    res=cs+cor;
-	    cor=(cs-res)+cor;
-	    cor = (cor>0)? 1.025*cor+eps : 1.025*cor-eps;
-	    retval = (res==res+cor)? ((n&2)?-res:res) : bsloww2(a,da,x,n);
-	    goto ret;
-
-	    break;
-
-	  }
-
-	}    /*   else  if (k <  0x42F00000 )   */
+	    }
+	  break;
+
+	case 1:
+	case 3:
+	  if (a < 0)
+	    {
+	      a = -a;
+	      da = -da;
+	    }
+	  u.x = big.x + a;
+	  y = a - (u.x - big.x) + da;
+	  xx = y * y;
+	  k = u.i[LOW_HALF] << 2;
+	  sn = __sincostab.x[k];
+	  ssn = __sincostab.x[k + 1];
+	  cs = __sincostab.x[k + 2];
+	  ccs = __sincostab.x[k + 3];
+	  s = y + y * xx * (sn3 + xx * sn5);
+	  c = xx * (cs2 + xx * (cs4 + xx * cs6));
+	  cor = (ccs - s * ssn - cs * c) - sn * s;
+	  res = cs + cor;
+	  cor = (cs - res) + cor;
+	  cor = (cor > 0) ? 1.025 * cor + eps : 1.025 * cor - eps;
+	  retval = ((res == res + cor) ? ((n & 2) ? -res : res)
+		    : bsloww2 (a, da, x, n));
+	  goto ret;
+
+	  break;
+	}
+    }				/*   else  if (k <  0x42F00000 )   */
 
 /* -----------------281474976710656 <|x| <2^1024----------------------------*/
-	else if (k < 0x7ff00000) {
-
-	  n = __branred(x,&a,&da);
-	  switch (n) {
-	  case 0:
-	    if (a*a < 0.01588) retval = bsloww(a,da,x,n);
-	    else retval = bsloww1(a,da,x,n);
-	    goto ret;
-	    break;
-	  case 2:
-	    if (a*a < 0.01588) retval = bsloww(-a,-da,x,n);
-	    else retval = bsloww1(-a,-da,x,n);
-	    goto ret;
-	    break;
-
-	  case 1:
-	  case 3:
-	    retval = bsloww2(a,da,x,n);
-	    goto ret;
-	    break;
-	  }
-
-	}    /*   else  if (k <  0x7ff00000 )    */
+  else if (k < 0x7ff00000)
+    {
+      n = __branred (x, &a, &da);
+      switch (n)
+	{
+	case 0:
+	  if (a * a < 0.01588)
+	    retval = bsloww (a, da, x, n);
+	  else
+	    retval = bsloww1 (a, da, x, n);
+	  goto ret;
+	  break;
+	case 2:
+	  if (a * a < 0.01588)
+	    retval = bsloww (-a, -da, x, n);
+	  else
+	    retval = bsloww1 (-a, -da, x, n);
+	  goto ret;
+	  break;
 
-/*--------------------- |x| > 2^1024 ----------------------------------*/
-	else {
-	  if (k == 0x7ff00000 && u.i[LOW_HALF] == 0)
-	    __set_errno (EDOM);
-	  retval = x / x;
+	case 1:
+	case 3:
+	  retval = bsloww2 (a, da, x, n);
 	  goto ret;
+	  break;
 	}
+    }				/*   else  if (k <  0x7ff00000 )    */
+
+/*--------------------- |x| > 2^1024 ----------------------------------*/
+  else
+    {
+      if (k == 0x7ff00000 && u.i[LOW_HALF] == 0)
+	__set_errno (EDOM);
+      retval = x / x;
+      goto ret;
+    }
 
- ret:
-	return retval;
+ret:
+  return retval;
 }
 
 
@@ -369,11 +429,12 @@ __sin(double x){
 
 double
 SECTION
-__cos(double x)
+__cos (double x)
 {
-  double y,xx,res,t,cor,s,c,sn,ssn,cs,ccs,xn,a,da,db,eps,xn1,xn2;
-  mynumber u,v;
-  int4 k,m,n;
+  double y, xx, res, t, cor, s, c, sn, ssn, cs, ccs, xn, a, da, db, eps, xn1,
+    xn2;
+  mynumber u, v;
+  int4 k, m, n;
 
   double retval = 0;
 
@@ -381,251 +442,318 @@ __cos(double x)
 
   u.x = x;
   m = u.i[HIGH_HALF];
-  k = 0x7fffffff&m;
-
-  if (k < 0x3e400000 ) { retval = 1.0; goto ret; } /* |x|<2^-27 => cos(x)=1 */
-
-  else if (k < 0x3feb6000 ) {/* 2^-27 < |x| < 0.855469 */
-    y=ABS(x);
-    u.x = big.x+y;
-    y = y-(u.x-big.x);
-    xx=y*y;
-    s = y + y*xx*(sn3 +xx*sn5);
-    c = xx*(cs2 +xx*(cs4 + xx*cs6));
-    k=u.i[LOW_HALF]<<2;
-    sn=__sincostab.x[k];
-    ssn=__sincostab.x[k+1];
-    cs=__sincostab.x[k+2];
-    ccs=__sincostab.x[k+3];
-    cor=(ccs-s*ssn-cs*c)-sn*s;
-    res=cs+cor;
-    cor=(cs-res)+cor;
-    retval = (res==res+1.020*cor)? res : cslow2(x);
-    goto ret;
-
-}    /*   else  if (k < 0x3feb6000)    */
-
-  else if (k <  0x400368fd ) {/* 0.855469  <|x|<2.426265  */;
-    y=hp0.x-ABS(x);
-    a=y+hp1.x;
-    da=(y-a)+hp1.x;
-    xx=a*a;
-    if (xx < 0.01588) {
-      t = (((((s5.x*xx + s4.x)*xx + s3.x)*xx + s2.x)*xx + s1.x)*a - 0.5*da)*xx+da;
-      res = a+t;
-      cor = (a-res)+t;
-      cor = (cor>0)? 1.02*cor+1.0e-31 : 1.02*cor -1.0e-31;
-      retval = (res == res + cor)? res : csloww(a,da,x);
-      goto ret;
-    }
-    else  {
-      if (a>0) {m=1;t=a;db=da;}
-      else {m=0;t=-a;db=-da;}
-      u.x=big.x+t;
-      y=t-(u.x-big.x);
-      xx=y*y;
-      s = y + (db+y*xx*(sn3 +xx*sn5));
-      c = y*db+xx*(cs2 +xx*(cs4 + xx*cs6));
-      k=u.i[LOW_HALF]<<2;
-      sn=__sincostab.x[k];
-      ssn=__sincostab.x[k+1];
-      cs=__sincostab.x[k+2];
-      ccs=__sincostab.x[k+3];
-      cor=(ssn+s*ccs-sn*c)+cs*s;
-      res=sn+cor;
-      cor=(sn-res)+cor;
-      cor = (cor>0)? 1.035*cor+1.0e-31 : 1.035*cor-1.0e-31;
-      retval = (res==res+cor)? ((m)?res:-res) : csloww1(a,da,x);
-      goto ret;
-}
+  k = 0x7fffffff & m;
 
-}    /*   else  if (k < 0x400368fd)    */
-
-
-  else if (k < 0x419921FB ) {/* 2.426265<|x|< 105414350 */
-    t = (x*hpinv.x + toint.x);
-    xn = t - toint.x;
-    v.x = t;
-    y = (x - xn*mp1.x) - xn*mp2.x;
-    n =v.i[LOW_HALF]&3;
-    da = xn*mp3.x;
-    a=y-da;
-    da = (y-a)-da;
-    eps = ABS(x)*1.2e-30;
-
-    switch (n) {
-    case 1:
-    case 3:
-      xx = a*a;
-      if (n == 1) {a=-a;da=-da;}
-      if (xx < 0.01588) {
-	t = (((((s5.x*xx + s4.x)*xx + s3.x)*xx + s2.x)*xx + s1.x)*a - 0.5*da)*xx+da;
-	res = a+t;
-	cor = (a-res)+t;
-	cor = (cor>0)? 1.02*cor+eps : 1.02*cor -eps;
-	retval = (res == res + cor)? res : csloww(a,da,x);
-	goto ret;
-      }
-      else  {
-	if (a>0) {m=1;t=a;db=da;}
-	else {m=0;t=-a;db=-da;}
-	u.x=big.x+t;
-	y=t-(u.x-big.x);
-	xx=y*y;
-	s = y + (db+y*xx*(sn3 +xx*sn5));
-	c = y*db+xx*(cs2 +xx*(cs4 + xx*cs6));
-	k=u.i[LOW_HALF]<<2;
-	sn=__sincostab.x[k];
-	ssn=__sincostab.x[k+1];
-	cs=__sincostab.x[k+2];
-	ccs=__sincostab.x[k+3];
-	cor=(ssn+s*ccs-sn*c)+cs*s;
-	res=sn+cor;
-	cor=(sn-res)+cor;
-	cor = (cor>0)? 1.035*cor+eps : 1.035*cor-eps;
-	retval = (res==res+cor)? ((m)?res:-res) : csloww1(a,da,x);
-	goto ret;
-      }
-      break;
-
-  case 0:
-    case 2:
-      if (a<0) {a=-a;da=-da;}
-      u.x=big.x+a;
-      y=a-(u.x-big.x)+da;
-      xx=y*y;
-      k=u.i[LOW_HALF