diff options
| author | Ben Murdoch <benm@google.com> | 2011-12-02 17:19:32 +0000 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-12-02 17:27:49 +0000 |
| commit | 3fb3ca8c7ca439d408449a395897395c0faae8d1 (patch) | |
| tree | 5cb33db083ae7ebe431e2a460fb3806c54531f9c /src/assembler.cc | |
| parent | 257744e915dfc84d6d07a6b2accf8402d9ffc708 (diff) | |
| download | android_external_v8-3fb3ca8c7ca439d408449a395897395c0faae8d1.tar.gz android_external_v8-3fb3ca8c7ca439d408449a395897395c0faae8d1.tar.bz2 android_external_v8-3fb3ca8c7ca439d408449a395897395c0faae8d1.zip | |
Upgrade to V8 3.4
Merge 3.4.14.35
Simple merge required updates to makefiles only.
Bug: 568872
Change-Id: I403a38452c547e06fcfa951c12eca12a1bc40978
Diffstat (limited to 'src/assembler.cc')
| -rw-r--r-- | src/assembler.cc | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/src/assembler.cc b/src/assembler.cc index 3c7fc1c6..fbd80895 100644 --- a/src/assembler.cc +++ b/src/assembler.cc @@ -1,4 +1,4 @@ -// Copyright (c) 1994-2006 Sun Microsystems Inc. +// Copyright (c) 2011 Sun Microsystems Inc. // All Rights Reserved. // // Redistribution and use in source and binary forms, with or without @@ -71,7 +71,8 @@ const double DoubleConstant::one_half = 0.5; const double DoubleConstant::minus_zero = -0.0; const double DoubleConstant::uint8_max_value = 255; const double DoubleConstant::zero = 0.0; -const double DoubleConstant::nan = OS::nan_value(); +const double DoubleConstant::canonical_non_hole_nan = OS::nan_value(); +const double DoubleConstant::the_hole_nan = BitCast<double>(kHoleNanInt64); const double DoubleConstant::negative_infinity = -V8_INFINITY; const char* RelocInfo::kFillerCommentString = "DEOPTIMIZATION PADDING"; @@ -921,9 +922,15 @@ ExternalReference ExternalReference::address_of_negative_infinity() { } -ExternalReference ExternalReference::address_of_nan() { +ExternalReference ExternalReference::address_of_canonical_non_hole_nan() { return ExternalReference(reinterpret_cast<void*>( - const_cast<double*>(&DoubleConstant::nan))); + const_cast<double*>(&DoubleConstant::canonical_non_hole_nan))); +} + + +ExternalReference ExternalReference::address_of_the_hole_nan() { + return ExternalReference(reinterpret_cast<void*>( + const_cast<double*>(&DoubleConstant::the_hole_nan))); } |