X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Ffrexp.c;h=d847fa38b3360d6f93593b28b8537da984aef3e8;hb=951e33a41cce0f553befee73311ac0af188ef239;hp=823a0453db958db81fd9227764fdf898bae7baa5;hpb=57fdfd3f8ec62b105c53bcdf6f127c35c7fe7391;p=gnulib.git

diff --git a/lib/frexp.c b/lib/frexp.c
index 823a0453d..d847fa38b 100644
--- a/lib/frexp.c
+++ b/lib/frexp.c
@@ -1,5 +1,5 @@
 /* Split a double into fraction and mantissa.
-   Copyright (C) 2007 Free Software Foundation, Inc.
+   Copyright (C) 2007-2013 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -17,7 +17,9 @@
 /* Written by Paolo Bonzini <bonzini@gnu.org>, 2003, and
    Bruno Haible <bruno@clisp.org>, 2007.  */
 
-#include <config.h>
+#if ! defined USE_LONG_DOUBLE
+# include <config.h>
+#endif
 
 /* Specification.  */
 #include <math.h>
@@ -27,7 +29,7 @@
 # include "isnanl-nolibm.h"
 # include "fpucw.h"
 #else
-# include "isnan.h"
+# include "isnand-nolibm.h"
 #endif
 
 /* This file assumes FLT_RADIX = 2.  If FLT_RADIX is a power of 2 greater
@@ -45,7 +47,7 @@
 #else
 # define FUNC frexp
 # define DOUBLE double
-# define ISNAN isnan
+# define ISNAN isnand
 # define DECL_ROUNDING
 # define BEGIN_ROUNDING()
 # define END_ROUNDING()
@@ -53,7 +55,7 @@
 #endif
 
 DOUBLE
-FUNC (DOUBLE x, int *exp)
+FUNC (DOUBLE x, int *expptr)
 {
   int sign;
   int exponent;
@@ -62,7 +64,7 @@ FUNC (DOUBLE x, int *exp)
   /* Test for NaN, infinity, and zero.  */
   if (ISNAN (x) || x + x == x)
     {
-      *exp = 0;
+      *expptr = 0;
       return x;
     }
 
@@ -85,73 +87,73 @@ FUNC (DOUBLE x, int *exp)
     exponent = 0;
     if (x >= L_(1.0))
       {
-	/* A positive exponent.  */
-	DOUBLE pow2_i; /* = pow2[i] */
-	DOUBLE powh_i; /* = powh[i] */
-
-	/* Invariants: pow2_i = 2^2^i, powh_i = 2^-2^i,
-	   x * 2^exponent = argument, x >= 1.0.  */
-	for (i = 0, pow2_i = L_(2.0), powh_i = L_(0.5);
-	     ;
-	     i++, pow2_i = pow2_i * pow2_i, powh_i = powh_i * powh_i)
-	  {
-	    if (x >= pow2_i)
-	      {
-		exponent += (1 << i);
-		x *= powh_i;
-	      }
-	    else
-	      break;
-
-	    pow2[i] = pow2_i;
-	    powh[i] = powh_i;
-	  }
-	/* Avoid making x too small, as it could become a denormalized
-	   number and thus lose precision.  */
-	while (i > 0 && x < pow2[i - 1])
-	  {
-	    i--;
-	    powh_i = powh[i];
-	  }
-	exponent += (1 << i);
-	x *= powh_i;
-	/* Here 2^-2^i <= x < 1.0.  */
+        /* A positive exponent.  */
+        DOUBLE pow2_i; /* = pow2[i] */
+        DOUBLE powh_i; /* = powh[i] */
+
+        /* Invariants: pow2_i = 2^2^i, powh_i = 2^-2^i,
+           x * 2^exponent = argument, x >= 1.0.  */
+        for (i = 0, pow2_i = L_(2.0), powh_i = L_(0.5);
+             ;
+             i++, pow2_i = pow2_i * pow2_i, powh_i = powh_i * powh_i)
+          {
+            if (x >= pow2_i)
+              {
+                exponent += (1 << i);
+                x *= powh_i;
+              }
+            else
+              break;
+
+            pow2[i] = pow2_i;
+            powh[i] = powh_i;
+          }
+        /* Avoid making x too small, as it could become a denormalized
+           number and thus lose precision.  */
+        while (i > 0 && x < pow2[i - 1])
+          {
+            i--;
+            powh_i = powh[i];
+          }
+        exponent += (1 << i);
+        x *= powh_i;
+        /* Here 2^-2^i <= x < 1.0.  */
       }
     else
       {
-	/* A negative or zero exponent.  */
-	DOUBLE pow2_i; /* = pow2[i] */
-	DOUBLE powh_i; /* = powh[i] */
-
-	/* Invariants: pow2_i = 2^2^i, powh_i = 2^-2^i,
-	   x * 2^exponent = argument, x < 1.0.  */
-	for (i = 0, pow2_i = L_(2.0), powh_i = L_(0.5);
-	     ;
-	     i++, pow2_i = pow2_i * pow2_i, powh_i = powh_i * powh_i)
-	  {
-	    if (x < powh_i)
-	      {
-		exponent -= (1 << i);
-		x *= pow2_i;
-	      }
-	    else
-	      break;
-
-	    pow2[i] = pow2_i;
-	    powh[i] = powh_i;
-	  }
-	/* Here 2^-2^i <= x < 1.0.  */
+        /* A negative or zero exponent.  */
+        DOUBLE pow2_i; /* = pow2[i] */
+        DOUBLE powh_i; /* = powh[i] */
+
+        /* Invariants: pow2_i = 2^2^i, powh_i = 2^-2^i,
+           x * 2^exponent = argument, x < 1.0.  */
+        for (i = 0, pow2_i = L_(2.0), powh_i = L_(0.5);
+             ;
+             i++, pow2_i = pow2_i * pow2_i, powh_i = powh_i * powh_i)
+          {
+            if (x < powh_i)
+              {
+                exponent -= (1 << i);
+                x *= pow2_i;
+              }
+            else
+              break;
+
+            pow2[i] = pow2_i;
+            powh[i] = powh_i;
+          }
+        /* Here 2^-2^i <= x < 1.0.  */
       }
 
     /* Invariants: x * 2^exponent = argument, and 2^-2^i <= x < 1.0.  */
     while (i > 0)
       {
-	i--;
-	if (x < powh[i])
-	  {
-	    exponent -= (1 << i);
-	    x *= pow2[i];
-	  }
+        i--;
+        if (x < powh[i])
+          {
+            exponent -= (1 << i);
+            x *= pow2[i];
+          }
       }
     /* Here 0.5 <= x < 1.0.  */
   }
@@ -161,6 +163,6 @@ FUNC (DOUBLE x, int *exp)
 
   END_ROUNDING ();
 
-  *exp = exponent;
+  *expptr = exponent;
   return x;
 }