Libc-763.13.tar.gz

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

diff --git a/gdtoa/FreeBSD/gdtoa-strtopdd.c b/gdtoa/FreeBSD/gdtoa-strtopdd.c
index 9b788eecc9aa5693453b44555c6a571eab267fb0..738372d8829f91db3022adb0c40bb90aaf7d7933 100644 (file)
--- a/gdtoa/FreeBSD/gdtoa-strtopdd.c
+++ b/gdtoa/FreeBSD/gdtoa-strtopdd.c
@@ -39,9 +39,9 @@ strtopdd(CONST char *s, char **sp, double *dd)
 #endif
 {
 #ifdef Sudden_Underflow
-       static FPI fpi = { 106, 1-1023, 2046-1023-106+1, 1, 1 };
+       static FPI fpi0 = { 106, 1-1023, 2046-1023-106+1, 1, 1 };
 #else
-       static FPI fpi = { 106, 1-1023-53+1, 2046-1023-106+1, 1, 0 };
+       static FPI fpi0 = { 106, 1-1023-53+1, 2046-1023-106+1, 1, 0 };
 #endif
        ULong bits[4];
        Long exp;
@@ -51,8 +51,13 @@ strtopdd(CONST char *s, char **sp, double *dd)
                ULong L[4];
                } U;
        U *u;
+#ifdef Honor_FLT_ROUNDS
+#include "gdtoa_fltrnds.h"
+#else
+#define fpi &fpi0
+#endif
 
-       rv = strtodg(s, sp, &fpi, &exp, bits);
+       rv = strtodg(s, sp, fpi, &exp, bits);
        u = (U*)dd;
        switch(rv & STRTOG_Retmask) {
          case STRTOG_NoNumber:
@@ -62,8 +67,8 @@ strtopdd(CONST char *s, char **sp, double *dd)
 
          case STRTOG_Normal:
                u->L[_1] = (bits[1] >> 21 | bits[2] << 11) & 0xffffffffL;
-               u->L[_0] = bits[2] >> 21 | bits[3] << 11 & 0xfffff
-                         | exp + 0x3ff + 105 << 20;
+               u->L[_0] = (bits[2] >> 21) | ((bits[3] << 11) & 0xfffff)
+                         | ((exp + 0x3ff + 105) << 20);
                exp += 0x3ff + 52;
                if (bits[1] &= 0x1fffff) {
                        i = hi0bits(bits[1]) - 11;
@@ -74,7 +79,7 @@ strtopdd(CONST char *s, char **sp, double *dd)
                        else
                                exp -= i;
                        if (i > 0) {
-                               bits[1] = bits[1] << i | bits[0] >> 32-i;
+                               bits[1] = bits[1] << i | bits[0] >> (32-i);
                                bits[0] = bits[0] << i & 0xffffffffL;
                                }
                        }
@@ -87,11 +92,11 @@ strtopdd(CONST char *s, char **sp, double *dd)
                        else
                                exp -= i;
                        if (i < 32) {
-                               bits[1] = bits[0] >> 32 - i;
+                               bits[1] = bits[0] >> (32 - i);
                                bits[0] = bits[0] << i & 0xffffffffL;
                                }
                        else {
-                               bits[1] = bits[0] << i - 32;
+                               bits[1] = bits[0] << (i - 32);
                                bits[0] = 0;
                                }
                        }
@@ -100,7 +105,7 @@ strtopdd(CONST char *s, char **sp, double *dd)
                        break;
                        }
                u->L[2+_1] = bits[0];
-               u->L[2+_0] = bits[1] & 0xfffff | exp << 20;
+               u->L[2+_0] = (bits[1] & 0xfffff) | (exp << 20);
                break;
 
          case STRTOG_Denormal:
@@ -119,10 +124,10 @@ strtopdd(CONST char *s, char **sp, double *dd)
          nearly_normal:
                i = hi0bits(bits[3]) - 11;      /* i >= 12 */
                j = 32 - i;
-               u->L[_0] = (bits[3] << i | bits[2] >> j) & 0xfffff
-                       | 65 - i << 20;
+               u->L[_0] = ((bits[3] << i | bits[2] >> j) & 0xfffff)
+                       | ((65 - i) << 20);
                u->L[_1] = (bits[2] << i | bits[1] >> j) & 0xffffffffL;
-               u->L[2+_0] = bits[1] & (1L << j) - 1;
+               u->L[2+_0] = bits[1] & ((1L << j) - 1);
                u->L[2+_1] = bits[0];
                break;
 
@@ -131,34 +136,34 @@ strtopdd(CONST char *s, char **sp, double *dd)
                if (i < 0) {
                        j = -i;
                        i += 32;
-                       u->L[_0] = bits[2] >> j & 0xfffff | (33 + j) << 20;
-                       u->L[_1] = (bits[2] << i | bits[1] >> j) & 0xffffffffL;
-                       u->L[2+_0] = bits[1] & (1L << j) - 1;
+                       u->L[_0] = (bits[2] >> j & 0xfffff) | (33 + j) << 20;
+                       u->L[_1] = ((bits[2] << i) | (bits[1] >> j)) & 0xffffffffL;
+                       u->L[2+_0] = bits[1] & ((1L << j) - 1);
                        u->L[2+_1] = bits[0];
                        break;
                        }
                if (i == 0) {
-                       u->L[_0] = bits[2] & 0xfffff | 33 << 20;
+                       u->L[_0] = (bits[2] & 0xfffff) | (33 << 20);
                        u->L[_1] = bits[1];
                        u->L[2+_0] = 0;
                        u->L[2+_1] = bits[0];
                        break;
                        }
                j = 32 - i;
-               u->L[_0] = (bits[2] << i | bits[1] >> j) & 0xfffff
-                               | j + 1 << 20;
+               u->L[_0] = (((bits[2] << i) | (bits[1] >> j)) & 0xfffff)
+                               | ((j + 1) << 20);
                u->L[_1] = (bits[1] << i | bits[0] >> j) & 0xffffffffL;
                u->L[2+_0] = 0;
-               u->L[2+_1] = bits[0] & (1L << j) - 1;
+               u->L[2+_1] = bits[0] & ((1L << j) - 1);
                break;
 
          hardly_normal:
                j = 11 - hi0bits(bits[1]);
                i = 32 - j;
-               u->L[_0] = bits[1] >> j & 0xfffff | j + 1 << 20;
+               u->L[_0] = (bits[1] >> j & 0xfffff) | ((j + 1) << 20);
                u->L[_1] = (bits[1] << i | bits[0] >> j) & 0xffffffffL;
                u->L[2+_0] = 0;
-               u->L[2+_1] = bits[0] & (1L << j) - 1;
+               u->L[2+_1] = bits[0] & ((1L << j) - 1);
                break;
 
          case STRTOG_Infinite: