Changeset 94463 in webkit for trunk/Source/JavaScriptCore

Timestamp:

Sep 2, 2011, 4:58:05 PM (14 years ago)

Author:

[email protected]

Message:

Fix the broken build due to dtoa patch
​https://bugs.webkit.org/show_bug.cgi?id=67534

Patch by Mark Hahnenberg <​[email protected]> on 2011-09-02
Reviewed by Oliver Hunt.

Fixing the build.

• GNUmakefile.list.am:
• wtf/dtoa/bignum.cc:
• wtf/dtoa/fast-dtoa.cc:
• wtf/dtoa/utils.h:

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• GNUmakefile.list.am (modified) (1 diff)
• wtf/dtoa/bignum.cc (modified) (5 diffs)
• wtf/dtoa/fast-dtoa.cc (modified) (1 diff)
• wtf/dtoa/utils.h (modified) (2 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2011-09-02  Mark Hahnenberg  <[email protected]>
+
+        Fix the broken build due to dtoa patch
+        https://bugs.webkit.org/show_bug.cgi?id=67534
+
+        Reviewed by Oliver Hunt.
+
+        Fixing the build.
+
+        * GNUmakefile.list.am:
+        * wtf/dtoa/bignum.cc:
+        * wtf/dtoa/fast-dtoa.cc:
+        * wtf/dtoa/utils.h:
+
 2011-09-02  Oliver Hunt  <[email protected]>
 

trunk/Source/JavaScriptCore/GNUmakefile.list.am

@@ -467 +467 @@
         Source/JavaScriptCore/wtf/DateMath.cpp \
         Source/JavaScriptCore/wtf/DateMath.h \
-    Source/JavaScriptCore/wtf/DecimalNumber.cpp \
-    Source/JavaScriptCore/wtf/DecimalNumber.h \
-    Source/JavaScriptCore/wtf/dtoa/bignum-dtoa.cc \
-    Source/JavaScriptCore/wtf/dtoa/bignum.cc \
-    Source/JavaScriptCore/wtf/dtoa/cached-powers.cc \
-    Source/JavaScriptCore/wtf/dtoa/diy-fp.cc \
-    Source/JavaScriptCore/wtf/dtoa/double-conversion.cc \
-    Source/JavaScriptCore/wtf/dtoa/fast-dtoa.cc \
-    Source/JavaScriptCore/wtf/dtoa/fixed-dtoa.cc \
-    Source/JavaScriptCore/wtf/dtoa/strtod.cc \
-    Source/JavaScriptCore/wtf/dtoa/bignum-dtoa.h \
-    Source/JavaScriptCore/wtf/dtoa/bignum.h \
-    Source/JavaScriptCore/wtf/dtoa/cached-powers.h \
-    Source/JavaScriptCore/wtf/dtoa/diy-fp.h \
-    Source/JavaScriptCore/wtf/dtoa/double-conversion.h \
-    Source/JavaScriptCore/wtf/dtoa/double.h \
-    Source/JavaScriptCore/wtf/dtoa/fast-dtoa.h \
-    Source/JavaScriptCore/wtf/dtoa/fixed-dtoa.h \
-    Source/JavaScriptCore/wtf/dtoa/strtod.h \
-    Source/JavaScriptCore/wtf/dtoa/utils.h \
-    Source/JavaScriptCore/wtf/Decoder.h \
+        Source/JavaScriptCore/wtf/DecimalNumber.cpp \
+        Source/JavaScriptCore/wtf/DecimalNumber.h \
+        Source/JavaScriptCore/wtf/dtoa/bignum-dtoa.cc \
+        Source/JavaScriptCore/wtf/dtoa/bignum.cc \
+        Source/JavaScriptCore/wtf/dtoa/cached-powers.cc \
+        Source/JavaScriptCore/wtf/dtoa/diy-fp.cc \
+        Source/JavaScriptCore/wtf/dtoa/double-conversion.cc \
+        Source/JavaScriptCore/wtf/dtoa/fast-dtoa.cc \
+        Source/JavaScriptCore/wtf/dtoa/fixed-dtoa.cc \
+        Source/JavaScriptCore/wtf/dtoa/strtod.cc \
+        Source/JavaScriptCore/wtf/dtoa/bignum-dtoa.h \
+        Source/JavaScriptCore/wtf/dtoa/bignum.h \
+        Source/JavaScriptCore/wtf/dtoa/cached-powers.h \
+        Source/JavaScriptCore/wtf/dtoa/diy-fp.h \
+        Source/JavaScriptCore/wtf/dtoa/double-conversion.h \
+        Source/JavaScriptCore/wtf/dtoa/double.h \
+        Source/JavaScriptCore/wtf/dtoa/fast-dtoa.h \
+        Source/JavaScriptCore/wtf/dtoa/fixed-dtoa.h \
+        Source/JavaScriptCore/wtf/dtoa/strtod.h \
+        Source/JavaScriptCore/wtf/dtoa/utils.h \
+        Source/JavaScriptCore/wtf/Decoder.h \
         Source/JavaScriptCore/wtf/Deque.h \
         Source/JavaScriptCore/wtf/DisallowCType.h \

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

@@ -67 +67 @@
         EnsureCapacity(needed_bigits);
         for (int i = 0; i < needed_bigits; ++i) {
-            bigits_[i] = value & kBigitMask;
+            bigits_[i] = (uint32_t)value & kBigitMask;
             value = value >> kBigitSize;
         }
@@ -266 +266 @@
         while (carry != 0) {
             EnsureCapacity(used_digits_ + 1);
-            bigits_[used_digits_] = carry & kBigitMask;
+            bigits_[used_digits_] = (uint32_t)carry & kBigitMask;
             used_digits_++;
             carry >>= kBigitSize;
@@ -287 +287 @@
             uint64_t product_high = high * bigits_[i];
             uint64_t tmp = (carry & kBigitMask) + product_low;
-            bigits_[i] = tmp & kBigitMask;
+            bigits_[i] = (uint32_t)tmp & kBigitMask;
             carry = (carry >> kBigitSize) + (tmp >> kBigitSize) +
             (product_high << (32 - kBigitSize));
@@ -293 +293 @@
         while (carry != 0) {
             EnsureCapacity(used_digits_ + 1);
-            bigits_[used_digits_] = carry & kBigitMask;
+            bigits_[used_digits_] = (uint32_t)carry & kBigitMask;
             used_digits_++;
             carry >>= kBigitSize;
@@ -748 +748 @@
             DoubleChunk product = static_cast<DoubleChunk>(factor) * other.bigits_[i];
             DoubleChunk remove = borrow + product;
-            Chunk difference = bigits_[i + exponent_diff] - (remove & kBigitMask);
+            Chunk difference = bigits_[i + exponent_diff] - ((uint32_t)remove & kBigitMask);
             bigits_[i + exponent_diff] = difference & kBigitMask;
             borrow = static_cast<Chunk>((difference >> (kChunkSize - 1)) +

trunk/Source/JavaScriptCore/wtf/dtoa/fast-dtoa.cc

@@ -242 +242 @@
                                 uint32_t* power,
                                 int* exponent) {
-        ASSERT(number < (1 << (number_bits + 1)));
+        ASSERT(number < (uint32_t)(1 << (number_bits + 1)));
         
         switch (number_bits) {

trunk/Source/JavaScriptCore/wtf/dtoa/utils.h

@@ -29 +29 @@
 #define DOUBLE_CONVERSION_UTILS_H_
 
+#include "Platform.h"
 #include <stdlib.h>
 #include <string.h>
@@ -52 +53 @@
 defined(__ARMEL__) || \
 defined(_MIPS_ARCH_MIPS32R2)
+#define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
+#elif CPU(MIPS)
 #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
 #elif defined(_M_IX86) || defined(__i386__)