From 546b3e5533cab7b45f32c816c91298996208bdba Mon Sep 17 00:00:00 2001
From: "danno@chromium.org"
 <danno@chromium.org@ce2b1a6d-e550-0410-aec6-3dcde31c8c00>
Date: Thu, 12 Jun 2014 09:55:25 +0000
Subject: [PATCH] Revert "Rename kIs64BitArch with kRequiresCodeRange."

TBR=haitao.feng@intel.com

Review URL: https://codereview.chromium.org/325343003

git-svn-id: https://v8.googlecode.com/svn/branches/bleeding_edge@21801 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
---
 src/api.cc    |  7 +++----
 src/globals.h |  6 ++----
 src/spaces.cc | 10 ++++------
 3 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/src/api.cc b/src/api.cc
index 6e76d9a..cc9cd3a 100644
--- a/src/api.cc
+++ b/src/api.cc
@@ -465,12 +465,11 @@ void ResourceConstraints::ConfigureDefaults(uint64_t physical_memory,
 
   set_max_available_threads(i::Max(i::Min(number_of_processors, 4u), 1u));
 
-  if (virtual_memory_limit > 0 && i::kRequiresCodeRange) {
+  if (virtual_memory_limit > 0 && i::kIs64BitArch) {
     // Reserve no more than 1/8 of the memory for the code range, but at most
-    // kMaximalCodeRangeSize.
+    // 512 MB.
     set_code_range_size(
-        i::Min(i::kMaximalCodeRangeSize / i::MB,
-               static_cast<int>((virtual_memory_limit >> 3) / i::MB)));
+        i::Min(512, static_cast<int>((virtual_memory_limit >> 3) / i::MB)));
   }
 }
 
diff --git a/src/globals.h b/src/globals.h
index f3f0788..0c24c6e 100644
--- a/src/globals.h
+++ b/src/globals.h
@@ -153,14 +153,12 @@ const int kDoubleSizeLog2 = 3;
 const int kPointerSizeLog2 = 3;
 const intptr_t kIntptrSignBit = V8_INT64_C(0x8000000000000000);
 const uintptr_t kUintptrAllBitsSet = V8_UINT64_C(0xFFFFFFFFFFFFFFFF);
-const bool kRequiresCodeRange = true;
-const int kMaximalCodeRangeSize = 512 * MB;
+const bool kIs64BitArch = true;
 #else
 const int kPointerSizeLog2 = 2;
 const intptr_t kIntptrSignBit = 0x80000000;
 const uintptr_t kUintptrAllBitsSet = 0xFFFFFFFFu;
-const bool kRequiresCodeRange = false;
-const int kMaximalCodeRangeSize = 0 * MB;
+const bool kIs64BitArch = false;
 #endif
 
 const int kBitsPerByte = 8;
diff --git a/src/spaces.cc b/src/spaces.cc
index 9d21529..7966a04 100644
--- a/src/spaces.cc
+++ b/src/spaces.cc
@@ -115,17 +115,15 @@ bool CodeRange::SetUp(size_t requested) {
   ASSERT(code_range_ == NULL);
 
   if (requested == 0) {
-    // When a target requires the code range feature, we put all code objects
-    // in a kMaximalCodeRangeSize range of virtual address space, so that
-    // they can call each other with near calls.
-    if (kRequiresCodeRange) {
-      requested = kMaximalCodeRangeSize;
+    // On 64-bit platform(s), we put all code objects in a 512 MB range of
+    // virtual address space, so that they can call each other with near calls.
+    if (kIs64BitArch) {
+      requested = 512 * MB;
     } else {
       return true;
     }
   }
 
-  ASSERT(requested <= kMaximalCodeRangeSize);
   code_range_ = new VirtualMemory(requested);
   CHECK(code_range_ != NULL);
   if (!code_range_->IsReserved()) {
-- 
2.7.4