Chromium Code Reviews| Index: src/heap.cc |
| diff --git a/src/heap.cc b/src/heap.cc |
| index 23b7c89c4eace42a55d398bdf6ee9e68dbeab15d..6effa4a0ce4d33e13625447b637a232226df622c 100644 |
| --- a/src/heap.cc |
| +++ b/src/heap.cc |
| @@ -67,29 +67,14 @@ namespace internal { |
| Heap::Heap() |
| : isolate_(NULL), |
| + code_range_size_(kIs64BitArch ? 512 * MB : 0), |
| // semispace_size_ should be a power of 2 and old_generation_size_ should be |
| // a multiple of Page::kPageSize. |
| -#if V8_TARGET_ARCH_X64 |
| -#define LUMP_OF_MEMORY (2 * MB) |
| - code_range_size_(512*MB), |
| -#else |
| -#define LUMP_OF_MEMORY MB |
| - code_range_size_(0), |
| -#endif |
| -#if defined(ANDROID) || V8_TARGET_ARCH_MIPS |
| - reserved_semispace_size_(4 * Max(LUMP_OF_MEMORY, Page::kPageSize)), |
| - max_semispace_size_(4 * Max(LUMP_OF_MEMORY, Page::kPageSize)), |
| - initial_semispace_size_(Page::kPageSize), |
| - max_old_generation_size_(192*MB), |
| - max_executable_size_(max_old_generation_size_), |
| -#else |
| - reserved_semispace_size_(8 * Max(LUMP_OF_MEMORY, Page::kPageSize)), |
| - max_semispace_size_(8 * Max(LUMP_OF_MEMORY, Page::kPageSize)), |
| + reserved_semispace_size_((kIs64BitArch ? 16 : 8) * MB), |
|
danno
2013/09/24 11:52:24
I am not a big fan of the ? here and elsewhere.
H
rmcilroy
2013/09/24 13:00:07
Personally I find this more confusing / error pron
|
| + max_semispace_size_((kIs64BitArch ? 16 : 8) * MB), |
| initial_semispace_size_(Page::kPageSize), |
| - max_old_generation_size_(700ul * LUMP_OF_MEMORY), |
| - max_executable_size_(256l * LUMP_OF_MEMORY), |
| -#endif |
| - |
| + max_old_generation_size_((kIs64BitArch ? 1400ul : 700ul) * MB), |
| + max_executable_size_((kIs64BitArch ? 512ul : 256ul) * MB), |
| // Variables set based on semispace_size_ and old_generation_size_ in |
| // ConfigureHeap (survived_since_last_expansion_, external_allocation_limit_) |
| // Will be 4 * reserved_semispace_size_ to ensure that young |
| @@ -170,6 +155,9 @@ Heap::Heap() |
| max_semispace_size_ = reserved_semispace_size_ = V8_MAX_SEMISPACE_SIZE; |
| #endif |
| + // Ensure old_generation_size_ is a multiple of kPageSize. |
| + ASSERT(MB >= Page::kPageSize); |
| + |
| intptr_t max_virtual = OS::MaxVirtualMemory(); |
| if (max_virtual > 0) { |