Libc-825.24.tar.gz

[apple/libc.git] / gdtoa / FreeBSD / gdtoa-smisc.c

diff --git a/gdtoa/FreeBSD/gdtoa-smisc.c b/gdtoa/FreeBSD/gdtoa-smisc.c
index e20e9da97f0f8c3e22fcabf3a1ea5b9fdeb99ca2..f4dbafb21c5f7c37f7f3f87e9ce943fecffd2a9e 100644 (file)
--- a/gdtoa/FreeBSD/gdtoa-smisc.c
+++ b/gdtoa/FreeBSD/gdtoa-smisc.c
@@ -26,23 +26,17 @@ THIS SOFTWARE.
 
 ****************************************************************/
 
-/* Please send bug reports to
-       David M. Gay
-       Bell Laboratories, Room 2C-463
-       600 Mountain Avenue
-       Murray Hill, NJ 07974-0636
-       U.S.A.
-       dmg@bell-labs.com
- */
+/* Please send bug reports to David M. Gay (dmg at acm dot org,
+ * with " at " changed at "@" and " dot " changed to ".").     */
 
 #include "gdtoaimp.h"
 
  Bigint *
 s2b
 #ifdef KR_headers
-       (s, nd0, nd, y9) CONST char *s; int nd0, nd; ULong y9;
+       (s, nd0, nd, y9, dplen) CONST char *s; int dplen, nd0, nd; ULong y9;
 #else
-       (CONST char *s, int nd0, int nd, ULong y9)
+       (CONST char *s, int nd0, int nd, ULong y9, int dplen)
 #endif
 {
        Bigint *b;
@@ -66,10 +60,10 @@ s2b
                s += 9;
                do b = multadd(b, 10, *s++ - '0');
                        while(++i < nd0);
-               s++;
+               s += dplen;
                }
        else
-               s += 10;
+               s += dplen + 9;
        for(; i < nd; i++)
                b = multadd(b, 10, *s++ - '0');
        return b;
@@ -83,33 +77,33 @@ ratio
        (Bigint *a, Bigint *b)
 #endif
 {
-       double da, db;
+       U da, db;
        int k, ka, kb;
 
-       dval(da) = b2d(a, &ka);
-       dval(db) = b2d(b, &kb);
+       dval(&da) = b2d(a, &ka);
+       dval(&db) = b2d(b, &kb);
        k = ka - kb + ULbits*(a->wds - b->wds);
 #ifdef IBM
        if (k > 0) {
-               word0(da) += (k >> 2)*Exp_msk1;
+               word0(&da) += (k >> 2)*Exp_msk1;
                if (k &= 3)
-                       dval(da) *= 1 << k;
+                       dval(&da) *= 1 << k;
                }
        else {
                k = -k;
-               word0(db) += (k >> 2)*Exp_msk1;
+               word0(&db) += (k >> 2)*Exp_msk1;
                if (k &= 3)
-                       dval(db) *= 1 << k;
+                       dval(&db) *= 1 << k;
                }
 #else
        if (k > 0)
-               word0(da) += k*Exp_msk1;
+               word0(&da) += k*Exp_msk1;
        else {
                k = -k;
-               word0(db) += k*Exp_msk1;
+               word0(&db) += k*Exp_msk1;
                }
 #endif
-       return dval(da) / dval(db);
+       return dval(&da) / dval(&db);
        }
 
 #ifdef INFNAN_CHECK