Changeset 598

Timestamp:

08/04/10 20:36:31 (14 years ago)

Author:

walter

Message:

bugzilla 4191 [FreeBSD] real constants are rounded to double precision

Files:

• branches/dmd-1.x/src/root/port.c (modified) (1 diff)
• trunk/src/mtype.c (modified) (1 diff)
• trunk/src/root/port.c (modified) (1 diff)

branches/dmd-1.x/src/root/port.c

@@ -305 +305 @@
-const wchar_t *Port::wlist_separator()
-{
-    // LOCALE_SLIST for Windows
-    return L",";
-}
-
-char *Port::strupr(char *s)
-{
-    return ::strupr(s);
-}
-
-#endif
-
-#if linux || __APPLE__ || __FreeBSD__
-
-#include <math.h>
-#if linux
-#include <bits/nan.h>
-#include <bits/mathdef.h>
-#endif
+#if __FreeBSD__ && __i386__
+#include <ieeefp.h>
+#endif
-#include <time.h>
-#include <sys/time.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <ctype.h>
-#include <float.h>
-
-static double zero = 0;
-double Port::nan = NAN;
-double Port::infinity = 1 / zero;
-double Port::dbl_max = 1.7976931348623157e308;
-double Port::dbl_min = 5e-324;
-long double Port::ldbl_max = LDBL_MAX;
-
-struct PortInitializer
-{
-    PortInitializer();
-};
-
-static PortInitializer portinitializer;
-
-PortInitializer::PortInitializer()
-{
-    // gcc nan's have the sign bit set by default, so turn it off
-    // Need the volatile to prevent gcc from doing incorrect
-    // constant folding.
-    volatile long double foo;
-    foo = NAN;
-    if (signbit(foo))   // signbit sometimes, not always, set
-        foo = -foo;     // turn off sign bit
-    Port::nan = foo;
-
-
+ && __i386__
-    // LDBL_MAX comes out as infinity. Fix.
-    static unsigned char x[sizeof(long double)] =
-        { 0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFE,0x7F };
-    Port::ldbl_max = *(long double *)&x[0];
+    // FreeBSD defaults to double precision. Switch to extended precision.
+    fpsetprec(FP_PE);
-#endif
-}
-
-#undef isnan
-int Port::isNan(double r)
-{
-#if __APPLE__
-    return __inline_isnan(r);
-#else
-    return ::isnan(r);
-#endif
-}
-
-int Port::isNan(long double r)
-{
-#if __APPLE__
-    return __inline_isnan(r);
-#else
-    return ::isnan(r);
-#endif

trunk/src/mtype.c

@@ -2528 +2528 @@
-            case Tuns8:         ivalue = 0xFF;          goto Livalue;
-            case Tint16:        ivalue = 0x7FFFUL;      goto Livalue;
-            case Tuns16:        ivalue = 0xFFFFUL;      goto Livalue;
-            case Tint32:        ivalue = 0x7FFFFFFFUL;  goto Livalue;
-            case Tuns32:        ivalue = 0xFFFFFFFFUL;  goto Livalue;
-            case Tint64:        ivalue = 0x7FFFFFFFFFFFFFFFLL;  goto Livalue;
-            case Tuns64:        ivalue = 0xFFFFFFFFFFFFFFFFULL; goto Livalue;
-            case Tbool:         ivalue = 1;             goto Livalue;
-            case Tchar:         ivalue = 0xFF;          goto Livalue;
-            case Twchar:        ivalue = 0xFFFFUL;      goto Livalue;
-            case Tdchar:        ivalue = 0x10FFFFUL;    goto Livalue;
-
-            case Tcomplex32:
-            case Timaginary32:
-            case Tfloat32:      fvalue = FLT_MAX;       goto Lfvalue;
-            case Tcomplex64:
-            case Timaginary64:
-            case Tfloat64:      fvalue = DBL_MAX;       goto Lfvalue;
-            case Tcomplex80:
-            case Timaginary80:
-LDBL_MAX;     
+Port::ldbl_max;
-        }
-    }
-    else if (ident == Id::min)
-    {
-        switch (ty)
-        {
-            case Tint8:         ivalue = -128;          goto Livalue;
-            case Tuns8:         ivalue = 0;             goto Livalue;
-            case Tint16:        ivalue = -32768;        goto Livalue;
-            case Tuns16:        ivalue = 0;             goto Livalue;
-            case Tint32:        ivalue = -2147483647L - 1;      goto Livalue;
-            case Tuns32:        ivalue = 0;                     goto Livalue;
-            case Tint64:        ivalue = (-9223372036854775807LL-1LL);  goto Livalue;
-            case Tuns64:        ivalue = 0;             goto Livalue;
-            case Tbool:         ivalue = 0;             goto Livalue;
-            case Tchar:         ivalue = 0;             goto Livalue;
-            case Twchar:        ivalue = 0;             goto Livalue;
-            case Tdchar:        ivalue = 0;             goto Livalue;
-
-            case Tcomplex32:

trunk/src/root/port.c

@@ -305 +305 @@
-const wchar_t *Port::wlist_separator()
-{
-    // LOCALE_SLIST for Windows
-    return L",";
-}
-
-char *Port::strupr(char *s)
-{
-    return ::strupr(s);
-}
-
-#endif
-
-#if linux || __APPLE__ || __FreeBSD__
-
-#include <math.h>
-#if linux
-#include <bits/nan.h>
-#include <bits/mathdef.h>
-#endif
+#if __FreeBSD__ && __i386__
+#include <ieeefp.h>
+#endif
-#include <time.h>
-#include <sys/time.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <ctype.h>
-#include <float.h>
-
-static double zero = 0;
-double Port::nan = NAN;
-double Port::infinity = 1 / zero;
-double Port::dbl_max = 1.7976931348623157e308;
-double Port::dbl_min = 5e-324;
-long double Port::ldbl_max = LDBL_MAX;
-
-struct PortInitializer
-{
-    PortInitializer();
-};
-
-static PortInitializer portinitializer;
-
-PortInitializer::PortInitializer()
-{
-    // gcc nan's have the sign bit set by default, so turn it off
-    // Need the volatile to prevent gcc from doing incorrect
-    // constant folding.
-    volatile long double foo;
-    foo = NAN;
-    if (signbit(foo))   // signbit sometimes, not always, set
-        foo = -foo;     // turn off sign bit
-    Port::nan = foo;
-
-
+ && __i386__
-    // LDBL_MAX comes out as infinity. Fix.
-    static unsigned char x[sizeof(long double)] =
-        { 0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFE,0x7F };
-    Port::ldbl_max = *(long double *)&x[0];
+    // FreeBSD defaults to double precision. Switch to extended precision.
+    fpsetprec(FP_PE);
-#endif
-}
-
-#undef isnan
-int Port::isNan(double r)
-{
-#if __APPLE__
-    return __inline_isnan(r);
-#else
-    return ::isnan(r);
-#endif
-}
-
-int Port::isNan(long double r)
-{
-#if __APPLE__
-    return __inline_isnan(r);
-#else
-    return ::isnan(r);
-#endif