diff options
| author | Ben Murdoch <benm@google.com> | 2012-06-08 14:45:43 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2012-06-08 14:45:43 +0100 |
| commit | 7d088e4f8fcf1ffd0817802d219d55b6122a4736 (patch) | |
| tree | 6ce63b8c16c644e4c377cd2ec319bf511d3f9450 /src/heap.cc | |
| parent | a28cdeeef5f062a40c344cbbbcf296873391bc58 (diff) | |
| download | android_external_v8-7d088e4f8fcf1ffd0817802d219d55b6122a4736.tar.gz android_external_v8-7d088e4f8fcf1ffd0817802d219d55b6122a4736.tar.bz2 android_external_v8-7d088e4f8fcf1ffd0817802d219d55b6122a4736.zip | |
Merge V8 at 3.9.24.30
Bug: 6605887
Change-Id: I10a55d1fc257903505a5c8a5933174e1d0fe6052
Diffstat (limited to 'src/heap.cc')
| -rw-r--r-- | src/heap.cc | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/heap.cc b/src/heap.cc index f2e2bc08..e0116192 100644 --- a/src/heap.cc +++ b/src/heap.cc @@ -67,13 +67,6 @@ Heap::Heap() : isolate_(NULL), // semispace_size_ should be a power of 2 and old_generation_size_ should be // a multiple of Page::kPageSize. - -// ANDROID -//#if defined(ANDROID) -//#define LUMP_OF_MEMORY (128 * KB) -// code_range_size_(0), -//#elif defined(V8_TARGET_ARCH_X64) -// END ANDROID #if defined(V8_TARGET_ARCH_X64) #define LUMP_OF_MEMORY (2 * MB) code_range_size_(512*MB), @@ -81,11 +74,19 @@ Heap::Heap() #define LUMP_OF_MEMORY MB code_range_size_(0), #endif +#if defined(ANDROID) + 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)), initial_semispace_size_(Page::kPageSize), max_old_generation_size_(700ul * LUMP_OF_MEMORY), max_executable_size_(256l * LUMP_OF_MEMORY), +#endif // Variables set based on semispace_size_ and old_generation_size_ in // ConfigureHeap (survived_since_last_expansion_, external_allocation_limit_) |