Title: [94463] trunk/Source/_javascript_Core
- Revision
- 94463
- Author
- [email protected]
- Date
- 2011-09-02 16:58:05 -0700 (Fri, 02 Sep 2011)
Log 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:
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (94462 => 94463)
--- trunk/Source/_javascript_Core/ChangeLog 2011-09-02 23:39:16 UTC (rev 94462)
+++ trunk/Source/_javascript_Core/ChangeLog 2011-09-02 23:58:05 UTC (rev 94463)
@@ -1,3 +1,17 @@
+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]>
Remove OldSpace classes
Modified: trunk/Source/_javascript_Core/GNUmakefile.list.am (94462 => 94463)
--- trunk/Source/_javascript_Core/GNUmakefile.list.am 2011-09-02 23:39:16 UTC (rev 94462)
+++ trunk/Source/_javascript_Core/GNUmakefile.list.am 2011-09-02 23:58:05 UTC (rev 94463)
@@ -466,27 +466,27 @@
Source/_javascript_Core/wtf/CurrentTime.h \
Source/_javascript_Core/wtf/DateMath.cpp \
Source/_javascript_Core/wtf/DateMath.h \
- Source/_javascript_Core/wtf/DecimalNumber.cpp \
- Source/_javascript_Core/wtf/DecimalNumber.h \
- Source/_javascript_Core/wtf/dtoa/bignum-dtoa.cc \
- Source/_javascript_Core/wtf/dtoa/bignum.cc \
- Source/_javascript_Core/wtf/dtoa/cached-powers.cc \
- Source/_javascript_Core/wtf/dtoa/diy-fp.cc \
- Source/_javascript_Core/wtf/dtoa/double-conversion.cc \
- Source/_javascript_Core/wtf/dtoa/fast-dtoa.cc \
- Source/_javascript_Core/wtf/dtoa/fixed-dtoa.cc \
- Source/_javascript_Core/wtf/dtoa/strtod.cc \
- Source/_javascript_Core/wtf/dtoa/bignum-dtoa.h \
- Source/_javascript_Core/wtf/dtoa/bignum.h \
- Source/_javascript_Core/wtf/dtoa/cached-powers.h \
- Source/_javascript_Core/wtf/dtoa/diy-fp.h \
- Source/_javascript_Core/wtf/dtoa/double-conversion.h \
- Source/_javascript_Core/wtf/dtoa/double.h \
- Source/_javascript_Core/wtf/dtoa/fast-dtoa.h \
- Source/_javascript_Core/wtf/dtoa/fixed-dtoa.h \
- Source/_javascript_Core/wtf/dtoa/strtod.h \
- Source/_javascript_Core/wtf/dtoa/utils.h \
- Source/_javascript_Core/wtf/Decoder.h \
+ Source/_javascript_Core/wtf/DecimalNumber.cpp \
+ Source/_javascript_Core/wtf/DecimalNumber.h \
+ Source/_javascript_Core/wtf/dtoa/bignum-dtoa.cc \
+ Source/_javascript_Core/wtf/dtoa/bignum.cc \
+ Source/_javascript_Core/wtf/dtoa/cached-powers.cc \
+ Source/_javascript_Core/wtf/dtoa/diy-fp.cc \
+ Source/_javascript_Core/wtf/dtoa/double-conversion.cc \
+ Source/_javascript_Core/wtf/dtoa/fast-dtoa.cc \
+ Source/_javascript_Core/wtf/dtoa/fixed-dtoa.cc \
+ Source/_javascript_Core/wtf/dtoa/strtod.cc \
+ Source/_javascript_Core/wtf/dtoa/bignum-dtoa.h \
+ Source/_javascript_Core/wtf/dtoa/bignum.h \
+ Source/_javascript_Core/wtf/dtoa/cached-powers.h \
+ Source/_javascript_Core/wtf/dtoa/diy-fp.h \
+ Source/_javascript_Core/wtf/dtoa/double-conversion.h \
+ Source/_javascript_Core/wtf/dtoa/double.h \
+ Source/_javascript_Core/wtf/dtoa/fast-dtoa.h \
+ Source/_javascript_Core/wtf/dtoa/fixed-dtoa.h \
+ Source/_javascript_Core/wtf/dtoa/strtod.h \
+ Source/_javascript_Core/wtf/dtoa/utils.h \
+ Source/_javascript_Core/wtf/Decoder.h \
Source/_javascript_Core/wtf/Deque.h \
Source/_javascript_Core/wtf/DisallowCType.h \
Source/_javascript_Core/wtf/DoublyLinkedList.h \
Modified: trunk/Source/_javascript_Core/wtf/dtoa/bignum.cc (94462 => 94463)
--- trunk/Source/_javascript_Core/wtf/dtoa/bignum.cc 2011-09-02 23:39:16 UTC (rev 94462)
+++ trunk/Source/_javascript_Core/wtf/dtoa/bignum.cc 2011-09-02 23:58:05 UTC (rev 94463)
@@ -66,7 +66,7 @@
int needed_bigits = kUInt64Size / kBigitSize + 1;
EnsureCapacity(needed_bigits);
for (int i = 0; i < needed_bigits; ++i) {
- bigits_[i] = value & kBigitMask;
+ bigits_[i] = (uint32_t)value & kBigitMask;
value = value >> kBigitSize;
}
used_digits_ = needed_bigits;
@@ -265,7 +265,7 @@
}
while (carry != 0) {
EnsureCapacity(used_digits_ + 1);
- bigits_[used_digits_] = carry & kBigitMask;
+ bigits_[used_digits_] = (uint32_t)carry & kBigitMask;
used_digits_++;
carry >>= kBigitSize;
}
@@ -286,13 +286,13 @@
uint64_t product_low = low * bigits_[i];
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));
}
while (carry != 0) {
EnsureCapacity(used_digits_ + 1);
- bigits_[used_digits_] = carry & kBigitMask;
+ bigits_[used_digits_] = (uint32_t)carry & kBigitMask;
used_digits_++;
carry >>= kBigitSize;
}
@@ -747,7 +747,7 @@
for (int i = 0; i < other.used_digits_; ++i) {
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)) +
(remove >> kBigitSize));
Modified: trunk/Source/_javascript_Core/wtf/dtoa/fast-dtoa.cc (94462 => 94463)
--- trunk/Source/_javascript_Core/wtf/dtoa/fast-dtoa.cc 2011-09-02 23:39:16 UTC (rev 94462)
+++ trunk/Source/_javascript_Core/wtf/dtoa/fast-dtoa.cc 2011-09-02 23:58:05 UTC (rev 94463)
@@ -241,7 +241,7 @@
int number_bits,
uint32_t* power,
int* exponent) {
- ASSERT(number < (1 << (number_bits + 1)));
+ ASSERT(number < (uint32_t)(1 << (number_bits + 1)));
switch (number_bits) {
case 32:
Modified: trunk/Source/_javascript_Core/wtf/dtoa/utils.h (94462 => 94463)
--- trunk/Source/_javascript_Core/wtf/dtoa/utils.h 2011-09-02 23:39:16 UTC (rev 94462)
+++ trunk/Source/_javascript_Core/wtf/dtoa/utils.h 2011-09-02 23:58:05 UTC (rev 94463)
@@ -28,6 +28,7 @@
#ifndef DOUBLE_CONVERSION_UTILS_H_
#define DOUBLE_CONVERSION_UTILS_H_
+#include "Platform.h"
#include <stdlib.h>
#include <string.h>
@@ -52,6 +53,8 @@
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__)
#if defined(_WIN32)
// Windows uses a 64bit wide floating point stack.
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
