Libc-763.11.tar.gz

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

diff --git a/gdtoa/gdtoa-strtopdd-fbsd.c b/gdtoa/gdtoa-strtopdd-fbsd.c
index a1f2ad08964ac0cb6e746d4b8710b3326b43a3ad..2695746465e9375dfd145dd37d66a9a69afdf843 100644 (file)
--- a/gdtoa/gdtoa-strtopdd-fbsd.c
+++ b/gdtoa/gdtoa-strtopdd-fbsd.c
@@ -45,7 +45,7 @@ THIS SOFTWARE.
 
  int
 #ifdef KR_headers
-strtopdd(s, sp, dd) CONST char *s; char **sp; double *dd; locale_t loc;
+strtopdd(s, sp, dd, loc) CONST char *s; char **sp; double *dd; locale_t loc;
 #else
 strtopdd(CONST char *s, char **sp, double *dd, locale_t loc)
 #endif
@@ -66,18 +66,12 @@ strtopdd(CONST char *s, char **sp, double *dd, locale_t loc)
 #endif /* __APPLE__ */
                } U;
        U *u;
-       FPI *fpi = &fpi0, fpi1;
 #ifdef Honor_FLT_ROUNDS
-       int rounding = Flt_Rounds;
+#include "gdtoa_fltrnds.h"
+#else
+#define fpi &fpi0
 #endif
 
-#ifdef Honor_FLT_ROUNDS
-       if (rounding != fpi0.rounding) {
-               fpi1 = fpi0; /* for thread safety */
-               fpi1.rounding = rounding;
-               fpi = &fpi1;
-               }
-#endif /* Honor_FLT_ROUNDS */
        rv = strtodg(s, sp, fpi, &exp, bits, loc);
        u = (U*)dd;
        switch(rv & STRTOG_Retmask) {
@@ -91,8 +85,8 @@ strtopdd(CONST char *s, char **sp, double *dd, locale_t loc)
 
          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;
@@ -103,7 +97,7 @@ strtopdd(CONST char *s, char **sp, double *dd, locale_t loc)
                        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;
                                }
                        }
@@ -116,11 +110,11 @@ strtopdd(CONST char *s, char **sp, double *dd, locale_t loc)
                        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;
                                }
                        }
@@ -129,7 +123,7 @@ strtopdd(CONST char *s, char **sp, double *dd, locale_t loc)
                        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);
 #ifdef __APPLE__
                fixLDBL(u->ld);
 #endif /* __APPLE__ */
@@ -151,10 +145,10 @@ strtopdd(CONST char *s, char **sp, double *dd, locale_t loc)
          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];
 #ifdef __APPLE__
                fixLDBL(u->ld);
@@ -166,9 +160,9 @@ strtopdd(CONST char *s, char **sp, double *dd, locale_t loc)
                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];
 #ifdef __APPLE__
                        fixLDBL(u->ld);
@@ -176,7 +170,7 @@ strtopdd(CONST char *s, char **sp, double *dd, locale_t loc)
                        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];
@@ -186,11 +180,11 @@ strtopdd(CONST char *s, char **sp, double *dd, locale_t loc)
                        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);
 #ifdef __APPLE__
                fixLDBL(u->ld);
 #endif /* __APPLE__ */
@@ -199,10 +193,10 @@ strtopdd(CONST char *s, char **sp, double *dd, locale_t loc)
          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);
 #ifdef __APPLE__
                fixLDBL(u->ld);
 #endif /* __APPLE__ */
@@ -227,6 +221,7 @@ strtopdd(CONST char *s, char **sp, double *dd, locale_t loc)
                u->L[0] = u->L[2] = d_QNAN0;
                u->L[1] = u->L[3] = d_QNAN1;
 #endif /* __APPLE__ */
+               break;
 #ifdef __APPLE__
         case STRTOG_NaNbits:
                u->L[0] = d_QNAN0 | ((bits[2] >> 20 | bits[3] << 12) & 0xfffff);