2005-05-13 Zoltan Varga <vargaz@freemail.hu>

[mono.git] / mono / utils / strtod.c

diff --git a/mono/utils/strtod.c b/mono/utils/strtod.c
index 437a704ca41083b1b055b793460a4e2a24a182be..86ea87172da6f919b5064da7c232306853b9b03e 100644 (file)
--- a/mono/utils/strtod.c
+++ b/mono/utils/strtod.c
@@ -11,6 +11,8 @@
  *
  * Taken from the FreeBSD distribution.
  */
+#include <glib.h>
+
 #include "strtod.h"
 
 /*-
@@ -138,12 +140,33 @@ static char sccsid[] = "@(#)strtod.c      8.1 (Berkeley) 6/4/93";
  *     FLT_RADIX, FLT_ROUNDS, and DBL_MAX.
  */
 
-#if defined(i386) || defined(mips) && defined(MIPSEL)
+#if defined(i386) || defined(mips) && defined(MIPSEL) || defined (__arm__)
+
 #define IEEE_8087
+
+#elif defined(__x86_64__)
+
+#define IEEE_8087
+
+#elif defined(__ia64)
+
+# ifdef __hpux
+#  define IEEE_MC68k
+# else
+#  define IEEE_8087
+# endif
+
+#elif defined(__hppa)
+
+# define IEEE_MC68k
+
 #else
 #define IEEE_MC68k
 #endif
 
+#define Long gint32
+#define ULong guint32
+
 #ifdef DEBUG
 #include "stdio.h"
 #define Bug(x) {fprintf(stderr, "%s\n", x); exit(1);}
@@ -233,11 +256,11 @@ Exactly one of IEEE_8087, IEEE_MC68k, VAX, or IBM should be defined.
 #endif
 
 #ifdef IEEE_8087
-#define word0(x) ((unsigned long *)&x)[1]
-#define word1(x) ((unsigned long *)&x)[0]
+#define word0(x) ((ULong *)&x)[1]
+#define word1(x) ((ULong *)&x)[0]
 #else
-#define word0(x) ((unsigned long *)&x)[0]
-#define word1(x) ((unsigned long *)&x)[1]
+#define word0(x) ((ULong *)&x)[0]
+#define word1(x) ((ULong *)&x)[1]
 #endif
 
 /* The following definition of Storeinc is appropriate for MIPS processors.
@@ -382,7 +405,7 @@ extern "C" char *__dtoa(double d, int mode, int ndigits,
 Bigint {
        struct Bigint *next;
        int k, maxwds, sign, wds;
-       unsigned long x[1];
+       ULong x[1];
 };
 
  typedef struct Bigint Bigint;
@@ -399,7 +422,7 @@ Balloc
        Bigint *rv;
 
        x = 1 << k;
-       rv = (Bigint *)malloc(sizeof(Bigint) + (x-1)*sizeof(long));
+       rv = (Bigint *)malloc(sizeof(Bigint) + (x-1)*sizeof(Long));
        rv->k = k;
        rv->maxwds = x;
        rv->sign = rv->wds = 0;
@@ -418,7 +441,7 @@ Bfree
 }
 
 #define Bcopy(x,y) memcpy((char *)&x->sign, (char *)&y->sign, \
-y->wds*sizeof(long) + 2*sizeof(int))
+y->wds*sizeof(Long) + 2*sizeof(int))
 
  static Bigint *
 multadd
@@ -429,9 +452,9 @@ multadd
 #endif
 {
        int i, wds;
-       unsigned long *x, y;
+       ULong *x, y;
 #ifdef Pack_32
-       unsigned long xi, z;
+       ULong xi, z;
 #endif
        Bigint *b1;
 
@@ -467,14 +490,14 @@ multadd
  static Bigint *
 s2b
 #ifdef KR_headers
-       (s, nd0, nd, y9) CONST char *s; int nd0, nd; unsigned long y9;
+       (s, nd0, nd, y9) CONST char *s; int nd0, nd; ULong y9;
 #else
-       (CONST char *s, int nd0, int nd, unsigned long y9)
+       (CONST char *s, int nd0, int nd, ULong y9)
 #endif
 {
        Bigint *b;
        int i, k;
-       long x, y;
+       Long x, y;
 
        x = (nd + 8) / 9;
        for (k = 0, y = 1; x > y; y <<= 1, k++) ;
@@ -505,9 +528,9 @@ s2b
  static int
 hi0bits
 #ifdef KR_headers
-       (x) register unsigned long x;
+       (x) register ULong x;
 #else
-       (register unsigned long x)
+       (register ULong x)
 #endif
 {
        register int k = 0;
@@ -539,13 +562,13 @@ hi0bits
  static int
 lo0bits
 #ifdef KR_headers
-       (y) unsigned long *y;
+       (y) ULong *y;
 #else
-       (unsigned long *y)
+       (ULong *y)
 #endif
 {
        register int k;
-       register unsigned long x = *y;
+       register ULong x = *y;
 
        if (x & 7) {
                if (x & 1)
@@ -610,10 +633,10 @@ mult
 {
        Bigint *c;
        int k, wa, wb, wc;
-       unsigned long carry, y, z;
-       unsigned long *x, *xa, *xae, *xb, *xbe, *xc, *xc0;
+       ULong carry, y, z;
+       ULong *x, *xa, *xae, *xb, *xbe, *xc, *xc0;
 #ifdef Pack_32
-       unsigned long z2;
+       ULong z2;
 #endif
 
        if (a->wds < b->wds) {
@@ -736,7 +759,7 @@ lshift
 {
        int i, k1, n, n1;
        Bigint *b1;
-       unsigned long *x, *x1, *xe, z;
+       ULong *x, *x1, *xe, z;
 
 #ifdef Pack_32
        n = k >> 5;
@@ -793,7 +816,7 @@ cmp
        (Bigint *a, Bigint *b)
 #endif
 {
-       unsigned long *xa, *xa0, *xb, *xb0;
+       ULong *xa, *xa0, *xb, *xb0;
        int i, j;
 
        i = a->wds;
@@ -829,10 +852,10 @@ diff
 {
        Bigint *c;
        int i, wa, wb;
-       long borrow, y; /* We need signed shifts here. */
-       unsigned long *xa, *xae, *xb, *xbe, *xc;
+       Long borrow, y; /* We need signed shifts here. */
+       ULong *xa, *xae, *xb, *xbe, *xc;
 #ifdef Pack_32
-       long z;
+       Long z;
 #endif
 
        i = cmp(a,b);
@@ -906,7 +929,7 @@ ulp
        (double x)
 #endif
 {
-       register long L;
+       register Long L;
        double a;
 
        L = (word0(x) & Exp_mask) - (P-1)*Exp_msk1;
@@ -942,11 +965,11 @@ b2d
        (Bigint *a, int *e)
 #endif
 {
-       unsigned long *xa, *xa0, w, y, z;
+       ULong *xa, *xa0, w, y, z;
        int k;
        double d;
 #ifdef VAX
-       unsigned long d0, d1;
+       ULong d0, d1;
 #else
 #define d0 word0(d)
 #define d1 word1(d)
@@ -1013,9 +1036,9 @@ d2b
 {
        Bigint *b;
        int de, i, k;
-       unsigned long *x, y, z;
+       ULong *x, y, z;
 #ifdef VAX
-       unsigned long d0, d1;
+       ULong d0, d1;
        d0 = word0(d) >> 16 | word0(d) << 16;
        d1 = word1(d) >> 16 | word1(d) << 16;
 #else
@@ -1167,7 +1190,7 @@ ratio
        return da / db;
 }
 
- static double
+ static const double
 tens[] = {
                1e0, 1e1, 1e2, 1e3, 1e4, 1e5, 1e6, 1e7, 1e8, 1e9,
                1e10, 1e11, 1e12, 1e13, 1e14, 1e15, 1e16, 1e17, 1e18, 1e19,
@@ -1177,19 +1200,19 @@ tens[] = {
 #endif
                };
 
- static double
+ static const double
 #ifdef IEEE_Arith
 bigtens[] = { 1e16, 1e32, 1e64, 1e128, 1e256 };
-static double tinytens[] = { 1e-16, 1e-32, 1e-64, 1e-128, 1e-256 };
+static const double tinytens[] = { 1e-16, 1e-32, 1e-64, 1e-128, 1e-256 };
 #define n_bigtens 5
 #else
 #ifdef IBM
 bigtens[] = { 1e16, 1e32, 1e64 };
-static double tinytens[] = { 1e-16, 1e-32, 1e-64 };
+static const double tinytens[] = { 1e-16, 1e-32, 1e-64 };
 #define n_bigtens 3
 #else
 bigtens[] = { 1e16, 1e32 };
-static double tinytens[] = { 1e-16, 1e-32 };
+static const double tinytens[] = { 1e-16, 1e-32 };
 #define n_bigtens 2
 #endif
 #endif
@@ -1206,8 +1229,8 @@ bsd_strtod
                 e, e1, esign, i, j, k, nd, nd0, nf, nz, nz0, sign;
        CONST char *s, *s0, *s1;
        double aadj, aadj1, adj, rv, rv0;
-       long L;
-       unsigned long y, z;
+       Long L;
+       ULong y, z;
        Bigint *bb, *bb1, *bd, *bd0, *bs, *delta;
        char decimal_point = '.';
 
@@ -1718,12 +1741,12 @@ quorem
 #endif
 {
        int n;
-       long borrow, y;
-       unsigned long carry, q, ys;
-       unsigned long *bx, *bxe, *sx, *sxe;
+       Long borrow, y;
+       ULong carry, q, ys;
+       ULong *bx, *bxe, *sx, *sxe;
 #ifdef Pack_32
-       long z;
-       unsigned long si, zs;
+       Long z;
+       ULong si, zs;
 #endif
 
        n = S->wds;
@@ -1894,10 +1917,10 @@ __bsd_dtoa
        int bbits, b2, b5, be, dig, i, ieps, ilim, ilim0, ilim1,
                j, j1, k, k0, k_check, leftright, m2, m5, s2, s5,
                spec_case, try_quick;
-       long L;
+       Long L;
 #ifndef Sudden_Underflow
        int denorm;
-       unsigned long x;
+       ULong x;
 #endif
        Bigint *b, *b1, *delta, *mlo, *mhi, *S;
        double d2, ds, eps;
@@ -1919,12 +1942,15 @@ __bsd_dtoa
 #endif
        {
                /* Infinity or NaN */
+               const char *ss;
                *decpt = 9999;
-               s =
+               ss =
 #ifdef IEEE_Arith
                        !word1(d) && !(word0(d) & 0xfffff) ? "Infinity" :
 #endif
                                "NaN";
+               *resultp = s = malloc (strlen (ss) + 1);
+               strcpy (s, ss);
                if (rve)
                        *rve =
 #ifdef IEEE_Arith
@@ -1939,7 +1965,9 @@ __bsd_dtoa
 #endif
        if (!d) {
                *decpt = 1;
-               s = "0";
+               *resultp = s = malloc (2);
+               s [0] = '0';
+               s [1] = 0;
                if (rve)
                        *rve = s + 1;
                return s;