Index: src/assembler.cc |
diff --git a/src/assembler.cc b/src/assembler.cc |
index 3c7fc1c6313557b17494907794151eccce614f35..b565b34f24a179defd715c83105587775e411bdf 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 |
@@ -47,6 +47,7 @@ |
#include "ast.h" |
#include "regexp-macro-assembler.h" |
#include "platform.h" |
+#include "v8.h" |
Mads Ager (chromium)
2011/07/13 09:43:09
This is already included above.
danno
2011/07/13 14:11:03
Done.
|
// Include native regexp-macro-assembler. |
#ifndef V8_INTERPRETED_REGEXP |
#if V8_TARGET_ARCH_IA32 |
@@ -71,7 +72,9 @@ 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 = |
+ BitCast<double>(kCanonicalNonHoleNanInt64); |
+const double DoubleConstant::the_hole_nan = BitCast<double>(kHoleNanInt64); |
const double DoubleConstant::negative_infinity = -V8_INFINITY; |
const char* RelocInfo::kFillerCommentString = "DEOPTIMIZATION PADDING"; |
@@ -921,9 +924,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::canonical_non_hole_nan))); |
+} |
+ |
+ |
+ExternalReference ExternalReference::address_of_the_hole_nan() { |
return ExternalReference(reinterpret_cast<void*>( |
- const_cast<double*>(&DoubleConstant::nan))); |
+ const_cast<double*>(&DoubleConstant::the_hole_nan))); |
} |