Revision: 8647
Author: [email protected]
Date: Wed Jul 13 09:51:30 2011
Log: Fix the build on x64 and ARM.
BUG=none
TEST=bot greeness
Review URL: http://codereview.chromium.org/7357002
http://code.google.com/p/v8/source/detail?r=8647
Modified:
/branches/bleeding_edge/src/arm/stub-cache-arm.cc
/branches/bleeding_edge/src/x64/stub-cache-x64.cc
=======================================
--- /branches/bleeding_edge/src/arm/stub-cache-arm.cc Wed Jul 13 06:50:27
2011
+++ /branches/bleeding_edge/src/arm/stub-cache-arm.cc Wed Jul 13 09:51:30
2011
@@ -4380,8 +4380,10 @@
__ b(eq, &have_double_value);
__ bind(&is_nan);
// Load canonical NaN for storing into the double array.
- __ mov(mantissa_reg, Operand(kCanonicalNonHoleNanLower32));
- __ mov(exponent_reg, Operand(kCanonicalNonHoleNanUpper32));
+ uint64_t nan_int64 = BitCast<uint64_t>(
+ FixedDoubleArray::canonical_not_the_hole_nan_as_double());
+ __ mov(mantissa_reg, Operand(static_cast<uint32_t>(nan_int64)));
+ __ mov(exponent_reg, Operand(static_cast<uint32_t>(nan_int64 >> 32)));
__ jmp(&have_double_value);
__ bind(&smi_value);
=======================================
--- /branches/bleeding_edge/src/x64/stub-cache-x64.cc Wed Jul 13 06:50:27
2011
+++ /branches/bleeding_edge/src/x64/stub-cache-x64.cc Wed Jul 13 09:51:30
2011
@@ -3748,7 +3748,8 @@
// the double array.
ExternalReference canonical_nan_reference =
ExternalReference::address_of_canonical_non_hole_nan();
- __ Set(kScratchRegister, kCanonicalNonHoleNanInt64);
+ __ Set(kScratchRegister, BitCast<uint64_t>(
+ FixedDoubleArray::canonical_not_the_hole_nan_as_double()));
__ movq(xmm0, kScratchRegister);
__ jmp(&have_double_value, Label::kNear);
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
