bid2dpd_dpd2bid.c (_bid_to_dpd32): Fix whitespace.

	* bid/bid2dpd_dpd2bid.c (_bid_to_dpd32): Fix whitespace.
	(_dpd_to_bid32): Simplify identical code on multiple branches.
	Fix whitespace.
	(_bid_to_dpd64, _dpd_to_bid64): Likewise.
	(_bid_to_dpd128, _dpd_to_bid128): Likewise.

From-SVN: r249803

2 files changed, 132 insertions, 149 deletions

diff --git a/libdecnumber/ChangeLog b/libdecnumber/ChangeLog
index 984c92d37c8..9886dd44420 100644
--- a/libdecnumber/ChangeLog
+++ b/libdecnumber/ChangeLog
@@ -1,3 +1,11 @@
+2017-05-29  Sylvestre Ledru  <sylvestre@debian.org>
+
+	* bid/bid2dpd_dpd2bid.c (_bid_to_dpd32): Fix whitespace.
+	(_dpd_to_bid32): Simplify identical code on multiple branches.
+	Fix whitespace.
+	(_bid_to_dpd64, _dpd_to_bid64): Likewise.
+	(_bid_to_dpd128, _dpd_to_bid128): Likewise.
+
 2017-04-03  Jonathan Wakely  <jwakely@redhat.com>
 
 	* decCommon.c (decFloatFromPackedChecked): Fix typo in comment.
diff --git a/libdecnumber/bid/bid2dpd_dpd2bid.c b/libdecnumber/bid/bid2dpd_dpd2bid.c
index c335eb849a8..331500480ad 100644
--- a/libdecnumber/bid/bid2dpd_dpd2bid.c
+++ b/libdecnumber/bid/bid2dpd_dpd2bid.c
@@ -114,10 +114,10 @@ _bid_to_dpd32 (_Decimal32 *pres, _Decimal32 *px) {
   b1 = b01 - 1000 * b0;
   dcoeff = b2d[b2] | b2d2[b1];
   if (b0 >= 8) { /* is b0 8 or 9? */
-    res = sign | ((0x600 | ((exp >> 6) << 7) | 
+    res = sign | ((0x600 | ((exp >> 6) << 7) |
         ((b0 & 1) << 6) | (exp & 0x3f)) << 20) | dcoeff;
   } else { /* else b0 is 0..7 */
-    res = sign | ((((exp >> 6) << 9) | (b0 << 6) | 
+    res = sign | ((((exp >> 6) << 9) | (b0 << 6) |
         (exp & 0x3f)) << 20) | dcoeff;
   }
   *pres = res;
@@ -138,29 +138,29 @@ _dpd_to_bid32 (_Decimal32 *pres, _Decimal32 *px) {
   if ((x & 0x78000000) == 0x78000000) {
     *pres = x;
     return;
-  } else { /* normal number */
-    if ((x & 0x60000000) == 0x60000000) { /* G0..G1 = 11 -> d0 = 8 + G4 */
-      d0 = d2b3[((x >> 26) & 1) | 8]; /* d0 = (comb & 0x0100 ? 9 : 8); */
-      exp = (x >> 27) & 3; /* exp leading bits are G2..G3 */
-    } else {
-      d0 = d2b3[(x >> 26) & 0x7];
-      exp = (x >> 29) & 3; /* exp loading bits are G0..G1 */
-    }
-    d1 = d2b2[(trailing >> 10) & 0x3ff];
-    d2 = d2b[(trailing) & 0x3ff];
-    bcoeff = d2 + d1 + d0;
-    exp = (exp << 6) + ((x >> 20) & 0x3f);
-    if (bcoeff < (1 << 23)) {
-      r = exp;
-      r <<= 23;
-      r |= (bcoeff | sign);
-    } else {
-      r = exp;
-      r <<= 21;
-      r |= (sign | 0x60000000ul);
-      /* add coeff, without leading bits */
-      r |= (((unsigned int) bcoeff) & 0x1fffff);
-    }
+  }
+  /* normal number */
+  if ((x & 0x60000000) == 0x60000000) { /* G0..G1 = 11 -> d0 = 8 + G4 */
+    d0 = d2b3[((x >> 26) & 1) | 8]; /* d0 = (comb & 0x0100 ? 9 : 8); */
+    exp = (x >> 27) & 3; /* exp leading bits are G2..G3 */
+  } else {
+    d0 = d2b3[(x >> 26) & 0x7];
+    exp = (x >> 29) & 3; /* exp loading bits are G0..G1 */
+  }
+  d1 = d2b2[(trailing >> 10) & 0x3ff];
+  d2 = d2b[(trailing) & 0x3ff];
+  bcoeff = d2 + d1 + d0;
+  exp = (exp << 6) + ((x >> 20) & 0x3f);
+  if (bcoeff < (1 << 23)) {
+    r = exp;
+    r <<= 23;
+    r |= (bcoeff | sign);
+  } else {
+    r = exp;
+    r <<= 21;
+    r |= (sign | 0x60000000ul);
+    /* add coeff, without leading bits */
+    r |= (((unsigned int) bcoeff) & 0x1fffff);
   }
   *pres = r;
 }
@@ -184,40 +184,40 @@ _bid_to_dpd64 (_Decimal64 *pres, _Decimal64 *px) {
   if ((comb & 0xf00) == 0xf00) {
     *pres = x;
     return;
-  } else { /* Normal number */
-    if ((comb & 0xc00) == 0xc00) { /* G0..G1 = 11 -> exp is G2..G11 */
-      exp = (comb) & 0x3ff;
-      bcoeff = (x & 0x0007ffffffffffffull) | 0x0020000000000000ull;
-    } else {
-      exp = (comb >> 2) & 0x3ff;
-      bcoeff = (x & 0x001fffffffffffffull);
-    }
-    D61 = 2305843009ull; /* Floor(2^61 / 10^9) */
-    /* Multiply the binary coefficient by ceil(2^64 / 1000), and take the upper
-       64-bits in order to compute a division by 1000. */
-    yhi = (D61 * (UINT64)(bcoeff >> (UINT64)27)) >> (UINT64)34;
-    ylo = bcoeff - 1000000000ull * yhi;
-    if (ylo >= 1000000000) {
-      ylo = ylo - 1000000000;
-      yhi = yhi + 1;
-    }
-    d103 = 0x4189374c;
-    B34 = ((UINT64) ylo * d103) >> (32 + 8);
-    B01 = ((UINT64) yhi * d103) >> (32 + 8);
-    b5 = ylo - B34 * 1000;
-    b2 = yhi - B01 * 1000;
-    b3 = ((UINT64) B34 * d103) >> (32 + 8);
-    b0 = ((UINT64) B01 * d103) >> (32 + 8);
-    b4 = (unsigned int) B34 - (unsigned int) b3 *1000;
-    b1 = (unsigned int) B01 - (unsigned int) dm103[b0];
-    dcoeff = b2d[b5] | b2d2[b4] | b2d3[b3] | b2d4[b2] | b2d5[b1];
-    if (b0 >= 8) /* is b0 8 or 9? */
-      res = sign | ((0x1800 | ((exp >> 8) << 9) | ((b0 & 1) << 8) | 
-          (exp & 0xff)) << 50) | dcoeff;
-    else /* else b0 is 0..7 */
-      res = sign | ((((exp >> 8) << 11) | (b0 << 8) | 
-          (exp & 0xff)) << 50) | dcoeff;
   }
+  /* Normal number */
+  if ((comb & 0xc00) == 0xc00) { /* G0..G1 = 11 -> exp is G2..G11 */
+    exp = (comb) & 0x3ff;
+    bcoeff = (x & 0x0007ffffffffffffull) | 0x0020000000000000ull;
+  } else {
+    exp = (comb >> 2) & 0x3ff;
+    bcoeff = (x & 0x001fffffffffffffull);
+  }
+  D61 = 2305843009ull; /* Floor(2^61 / 10^9) */
+  /* Multiply the binary coefficient by ceil(2^64 / 1000), and take the upper
+     64-bits in order to compute a division by 1000. */
+  yhi = (D61 * (UINT64)(bcoeff >> (UINT64)27)) >> (UINT64)34;
+  ylo = bcoeff - 1000000000ull * yhi;
+  if (ylo >= 1000000000) {
+    ylo = ylo - 1000000000;
+    yhi = yhi + 1;
+  }
+  d103 = 0x4189374c;
+  B34 = ((UINT64) ylo * d103) >> (32 + 8);
+  B01 = ((UINT64) yhi * d103) >> (32 + 8);
+  b5 = ylo - B34 * 1000;
+  b2 = yhi - B01 * 1000;
+  b3 = ((UINT64) B34 * d103) >> (32 + 8);
+  b0 = ((UINT64) B01 * d103) >> (32 + 8);
+  b4 = (unsigned int) B34 - (unsigned int) b3 *1000;
+  b1 = (unsigned int) B01 - (unsigned int) dm103[b0];
+  dcoeff = b2d[b5] | b2d2[b4] | b2d3[b3] | b2d4[b2] | b2d5[b1];
+  if (b0 >= 8) /* is b0 8 or 9? */
+    res = sign | ((0x1800 | ((exp >> 8) << 9) | ((b0 & 1) << 8) |
+                   (exp & 0xff)) << 50) | dcoeff;
+  else /* else b0 is 0..7 */
+    res = sign | ((((exp >> 8) << 11) | (b0 << 8) |
+                     (exp & 0xff)) << 50) | dcoeff;
   *pres = res;
 }
 
@@ -237,49 +237,41 @@ _dpd_to_bid64 (_Decimal64 *pres, _Decimal64 *px) {
   comb = (x & 0x7ffc000000000000ull) >> 50;
   trailing = (x & 0x0003ffffffffffffull);
   if ((comb & 0x1e00) == 0x1e00) {
-    if ((comb & 0x1f00) == 0x1f00) { /* G0..G4 = 11111 -> NaN */
-      if (comb & 0x0100) { /* G5 = 1 -> sNaN */
-        *pres = x;
-      } else { /* G5 = 0 -> qNaN */
-        *pres = x;
-      }
-    } else { /*if ((comb & 0x1e00) == 0x1e00); G0..G4 = 11110 -> INF */
-      *pres = x;
-    }
+    *pres = x;
     return;
-  } else { /* normal number */
-    if ((comb & 0x1800) == 0x1800) { /* G0..G1 = 11 -> d0 = 8 + G4 */
-      d0 = d2b6[((comb >> 8) & 1) | 8]; /* d0 = (comb & 0x0100 ? 9 : 8); */
-      exp = (comb & 0x600) >> 1; /* exp = (comb & 0x0400 ? 1 : 0) * 0x200 + 
-          (comb & 0x0200 ? 1 : 0) * 0x100; exp leading bits are G2..G3 */
-    } else {
-      d0 = d2b6[(comb >> 8) & 0x7];
-      exp = (comb & 0x1800) >> 3; /* exp = (comb & 0x1000 ? 1 : 0) * 0x200 + 
-          (comb & 0x0800 ? 1 : 0) * 0x100; exp loading bits are G0..G1 */
-    }
-    d1 = d2b5[(trailing >> 40) & 0x3ff];
-    d2 = d2b4[(trailing >> 30) & 0x3ff];
-    d3 = d2b3[(trailing >> 20) & 0x3ff];
-    d4 = d2b2[(trailing >> 10) & 0x3ff];
-    d5 = d2b[(trailing) & 0x3ff];
-    bcoeff = (d5 + d4 + d3) + d2 + d1 + d0;
-    exp += (comb & 0xff);
-    mask = 1;
-    mask <<= 53;
-    if (bcoeff < mask) { /* check whether coefficient fits in 10*5+3 bits */
-      res = exp;
-      res <<= 53;
-      res |= (bcoeff | sign);
-      *pres = res;
-      return;
-    }
-    /* special format */
-    res = (exp << 51) | (sign | 0x6000000000000000ull);
-    /* add coeff, without leading bits */
-    mask = (mask >> 2) - 1;
-    bcoeff &= mask;
-    res |= bcoeff;
   }
+  /* normal number */
+  if ((comb & 0x1800) == 0x1800) { /* G0..G1 = 11 -> d0 = 8 + G4 */
+    d0 = d2b6[((comb >> 8) & 1) | 8]; /* d0 = (comb & 0x0100 ? 9 : 8); */
+    exp = (comb & 0x600) >> 1; /* exp = (comb & 0x0400 ? 1 : 0) * 0x200 +
+        (comb & 0x0200 ? 1 : 0) * 0x100; exp leading bits are G2..G3 */
+  } else {
+    d0 = d2b6[(comb >> 8) & 0x7];
+    exp = (comb & 0x1800) >> 3; /* exp = (comb & 0x1000 ? 1 : 0) * 0x200 +
+        (comb & 0x0800 ? 1 : 0) * 0x100; exp loading bits are G0..G1 */
+  }
+  d1 = d2b5[(trailing >> 40) & 0x3ff];
+  d2 = d2b4[(trailing >> 30) & 0x3ff];
+  d3 = d2b3[(trailing >> 20) & 0x3ff];
+  d4 = d2b2[(trailing >> 10) & 0x3ff];
+  d5 = d2b[(trailing) & 0x3ff];
+  bcoeff = (d5 + d4 + d3) + d2 + d1 + d0;
+  exp += (comb & 0xff);
+  mask = 1;
+  mask <<= 53;
+  if (bcoeff < mask) { /* check whether coefficient fits in 10*5+3 bits */
+    res = exp;
+    res <<= 53;
+    res |= (bcoeff | sign);
+    *pres = res;
+    return;
+  }
+  /* special format */
+  res = (exp << 51) | (sign | 0x6000000000000000ull);
+  /* add coeff, without leading bits */
+  mask = (mask >> 2) - 1;
+  bcoeff &= mask;
+  res |= bcoeff;
   *pres = res;
 }
 
@@ -304,15 +296,7 @@ _bid_to_dpd128 (_Decimal128 *pres, _Decimal128 *px) {
   comb = (x.w[1] /*& 0x7fffc00000000000ull */ ) >> 46;
   exp = 0;
   if ((comb & 0x1e000) == 0x1e000) {
-    if ((comb & 0x1f000) == 0x1f000) { /* G0..G4 = 11111 -> NaN */
-      if (comb & 0x01000) { /* G5 = 1 -> sNaN */
-        res = x;
-      } else { /* G5 = 0 -> qNaN */
-        res = x;
-      }
-    } else { /* G0..G4 = 11110 -> INF */
-      res = x;
-    }
+    res = x;
   } else { /* normal number */
     exp = ((x.w[1] & 0x7fff000000000000ull) >> 49) & 0x3fff;
     bcoeff.w[1] = (x.w[1] & 0x0001ffffffffffffull);
@@ -347,16 +331,16 @@ _bid_to_dpd128 (_Decimal128 *pres, _Decimal128 *px) {
     BLL32 -= (unsigned int) k9 *1000000;
     k10 = ((UINT64) BLL32 * d103) >> (32 + 8);
     k11 = BLL32 - (unsigned int) k10 *1000;
-    dcoeff.w[1] = (b2d[k5] >> 4) | (b2d[k4] << 6) | (b2d[k3] << 16) | 
-        (b2d[k2] << 26) | (b2d[k1] << 36);
-    dcoeff.w[0] = b2d[k11] | (b2d[k10] << 10) | (b2d[k9] << 20) | 
-        (b2d[k8] << 30) | (b2d[k7] << 40) | (b2d[k6] << 50) | (b2d[k5] << 60);
+    dcoeff.w[1] = (b2d[k5] >> 4) | (b2d[k4] << 6) | (b2d[k3] << 16) |
+      (b2d[k2] << 26) | (b2d[k1] << 36);
+    dcoeff.w[0] = b2d[k11] | (b2d[k10] << 10) | (b2d[k9] << 20) |
+      (b2d[k8] << 30) | (b2d[k7] << 40) | (b2d[k6] << 50) | (b2d[k5] << 60);
     res.w[0] = dcoeff.w[0];
     if (k0 >= 8) {
-      res.w[1] = sign.w[1] | ((0x18000 | ((exp >> 12) << 13) | 
+      res.w[1] = sign.w[1] | ((0x18000 | ((exp >> 12) << 13) |
           ((k0 & 1) << 12) | (exp & 0xfff)) << 46) | dcoeff.w[1];
     } else {
-      res.w[1] = sign.w[1] | ((((exp >> 12) << 15) | (k0 << 12) | 
+      res.w[1] = sign.w[1] | ((((exp >> 12) << 15) | (k0 << 12) |
           (exp & 0xfff)) << 46) | dcoeff.w[1];
     }
   }
@@ -382,42 +366,33 @@ _dpd_to_bid128 (_Decimal128 *pres, _Decimal128 *px) {
   trailing.w[1] = x.w[1];
   trailing.w[0] = x.w[0];
   if ((comb & 0x1e000) == 0x1e000) {
-    if ((comb & 0x1f000) == 0x1f000) { /* G0..G4 = 11111 -> NaN */
-      if (comb & 0x01000) { /* G5 = 1 -> sNaN */
-        *pres = x;
-      } else { /* G5 = 0 -> qNaN */
-        *pres = x;
-      }
-    } else { /* G0..G4 = 11110 -> INF */
       *pres = x;
-    }
-    return;
-  } else { /* Normal number */
-    if ((comb & 0x18000) == 0x18000) { /* G0..G1 = 11 -> d0 = 8 + G4 */
-      d0 = d2b6[8 + ((comb & 0x01000) >> 12)];
-      exp = (comb & 0x06000) >> 1;  /* exp leading bits are G2..G3 */
-    } else {
-      d0 = d2b6[((comb & 0x07000) >> 12)];
-      exp = (comb & 0x18000) >> 3;  /* exp loading bits are G0..G1 */
-    }
-    d11 = d2b[(trailing.w[0]) & 0x3ff];
-    d10 = d2b2[(trailing.w[0] >> 10) & 0x3ff];
-    d9 = d2b3[(trailing.w[0] >> 20) & 0x3ff];
-    d8 = d2b4[(trailing.w[0] >> 30) & 0x3ff];
-    d7 = d2b5[(trailing.w[0] >> 40) & 0x3ff];
-    d6 = d2b6[(trailing.w[0] >> 50) & 0x3ff];
-    d5 = d2b[(trailing.w[0] >> 60) | ((trailing.w[1] & 0x3f) << 4)];
-    d4 = d2b2[(trailing.w[1] >> 6) & 0x3ff];
-    d3 = d2b3[(trailing.w[1] >> 16) & 0x3ff];
-    d2 = d2b4[(trailing.w[1] >> 26) & 0x3ff];
-    d1 = d2b5[(trailing.w[1] >> 36) & 0x3ff];
-    tl = d11 + d10 + d9 + d8 + d7 + d6;
-    th = d5 + d4 + d3 + d2 + d1 + d0;
-    __mul_64x64_to_128 (bcoeff, th, 1000000000000000000ull);
-    __add_128_64 (bcoeff, bcoeff, tl);
-    exp += (comb & 0xfff);
-    res.w[0] = bcoeff.w[0];
-    res.w[1] = (exp << 49) | sign.w[1] | bcoeff.w[1];
+      return;
+  }
+  if ((comb & 0x18000) == 0x18000) { /* G0..G1 = 11 -> d0 = 8 + G4 */
+    d0 = d2b6[8 + ((comb & 0x01000) >> 12)];
+    exp = (comb & 0x06000) >> 1;  /* exp leading bits are G2..G3 */
+  } else {
+    d0 = d2b6[((comb & 0x07000) >> 12)];
+    exp = (comb & 0x18000) >> 3;  /* exp loading bits are G0..G1 */
   }
+  d11 = d2b[(trailing.w[0]) & 0x3ff];
+  d10 = d2b2[(trailing.w[0] >> 10) & 0x3ff];
+  d9 = d2b3[(trailing.w[0] >> 20) & 0x3ff];
+  d8 = d2b4[(trailing.w[0] >> 30) & 0x3ff];
+  d7 = d2b5[(trailing.w[0] >> 40) & 0x3ff];
+  d6 = d2b6[(trailing.w[0] >> 50) & 0x3ff];
+  d5 = d2b[(trailing.w[0] >> 60) | ((trailing.w[1] & 0x3f) << 4)];
+  d4 = d2b2[(trailing.w[1] >> 6) & 0x3ff];
+  d3 = d2b3[(trailing.w[1] >> 16) & 0x3ff];
+  d2 = d2b4[(trailing.w[1] >> 26) & 0x3ff];
+  d1 = d2b5[(trailing.w[1] >> 36) & 0x3ff];
+  tl = d11 + d10 + d9 + d8 + d7 + d6;
+  th = d5 + d4 + d3 + d2 + d1 + d0;
+  __mul_64x64_to_128 (bcoeff, th, 1000000000000000000ull);
+  __add_128_64 (bcoeff, bcoeff, tl);
+  exp += (comb & 0xfff);
+  res.w[0] = bcoeff.w[0];
+  res.w[1] = (exp << 49) | sign.w[1] | bcoeff.w[1];
   *pres = res;
 }