Changeset 149609 in webkit

Timestamp:

May 6, 2013 10:49:52 AM (11 years ago)

Author:

commit-queue@webkit.org

Message:

Cherry-pick fixes to bignum from upstream
​https://bugs.webkit.org/show_bug.cgi?id=115658

Patch by Cosmin Truta <​ctruta@blackberry.com> on 2013-05-06
Reviewed by Darin Adler.

Cherry-picked the following change lists:

Fix bug in bignum implementation
​http://codereview.chromium.org/13454019

Make VS2005 project files compile without errors
​http://codereview.chromium.org/6286135

• wtf/dtoa/bignum.cc:

Location:

trunk/Source/WTF

Files:

• ChangeLog (modified) (1 diff)
• wtf/dtoa/bignum.cc (modified) (7 diffs)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2013-05-06  Cosmin Truta  <ctruta@blackberry.com>
+
+        Cherry-pick fixes to bignum from upstream
+        https://bugs.webkit.org/show_bug.cgi?id=115658
+
+        Reviewed by Darin Adler.
+
+        Cherry-picked the following change lists:
+
+        Fix bug in bignum implementation
+        http://codereview.chromium.org/13454019
+
+        Make VS2005 project files compile without errors
+        http://codereview.chromium.org/6286135
+
+        * wtf/dtoa/bignum.cc:
+
 2013-05-06  Mikhail Pozdnyakov  <mikhail.pozdnyakov@intel.com>
 

trunk/Source/WTF/wtf/dtoa/bignum.cc

@@ -69 +69 @@
         EnsureCapacity(needed_bigits);
         for (int i = 0; i < needed_bigits; ++i) {
-            bigits_[i] = (uint32_t)value & kBigitMask;
+            bigits_[i] = static_cast<Chunk>(value & kBigitMask);
             value = value >> kBigitSize;
         }
@@ -268 +268 @@
         while (carry != 0) {
             EnsureCapacity(used_digits_ + 1);
-            bigits_[used_digits_] = (uint32_t)carry & kBigitMask;
+            bigits_[used_digits_] = static_cast<Chunk>(carry & kBigitMask);
             used_digits_++;
             carry >>= kBigitSize;
@@ -289 +289 @@
             uint64_t product_high = high * bigits_[i];
             uint64_t tmp = (carry & kBigitMask) + product_low;
-            bigits_[i] = (uint32_t)tmp & kBigitMask;
+            bigits_[i] = static_cast<Chunk>(tmp & kBigitMask);
             carry = (carry >> kBigitSize) + (tmp >> kBigitSize) +
             (product_high << (32 - kBigitSize));
@@ -295 +295 @@
         while (carry != 0) {
             EnsureCapacity(used_digits_ + 1);
-            bigits_[used_digits_] = (uint32_t)carry & kBigitMask;
+            bigits_[used_digits_] = static_cast<Chunk>(carry & kBigitMask);
             used_digits_++;
             carry >>= kBigitSize;
@@ -738 +738 @@
     
     void Bignum::SubtractTimes(const Bignum& other, int factor) {
+#ifndef NDEBUG
+        Bignum a, b;
+        a.AssignBignum(*this);
+        b.AssignBignum(other);
+        b.MultiplyByUInt32(factor);
+        a.SubtractBignum(b);
+#endif
         ASSERT(exponent_ <= other.exponent_);
         if (factor < 3) {
@@ -750 +757 @@
             DoubleChunk product = static_cast<DoubleChunk>(factor) * other.bigits_[i];
             DoubleChunk remove = borrow + product;
-            Chunk difference = bigits_[i + exponent_diff] - ((uint32_t)remove & kBigitMask);
+            Chunk difference =
+                bigits_[i + exponent_diff] - static_cast<Chunk>(remove & kBigitMask);
             bigits_[i + exponent_diff] = difference & kBigitMask;
             borrow = static_cast<Chunk>((difference >> (kChunkSize - 1)) +
@@ -760 +768 @@
             bigits_[i] = difference & kBigitMask;
             borrow = difference >> (kChunkSize - 1);
-            ++i;
         }
         Clamp();
+        ASSERT(Bignum::Equal(a, *this));
     }