diff options
| author | Ben Murdoch <benm@google.com> | 2012-06-08 09:23:33 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-06-08 09:23:33 -0700 |
| commit | e460692907542433e9ef263e9f61100dbcdead11 (patch) | |
| tree | 54ea806ad493a0780c58d51a0dd0cae844e63925 | |
| parent | de0f6c1a68666f723f5ebb12c83ee918eef9e789 (diff) | |
| parent | 7d088e4f8fcf1ffd0817802d219d55b6122a4736 (diff) | |
| download | v8-e460692907542433e9ef263e9f61100dbcdead11.tar.gz | |
am 7d088e4f: Merge V8 at 3.9.24.30
* commit '7d088e4f8fcf1ffd0817802d219d55b6122a4736':
Merge V8 at 3.9.24.30
| -rw-r--r-- | V8_MERGE_REVISION | 6 | ||||
| -rw-r--r-- | src/heap.cc | 15 | ||||
| -rw-r--r-- | src/version.cc | 2 |
3 files changed, 11 insertions, 12 deletions
diff --git a/V8_MERGE_REVISION b/V8_MERGE_REVISION index 612a1142..37ec7235 100644 --- a/V8_MERGE_REVISION +++ b/V8_MERGE_REVISION @@ -1,4 +1,2 @@ -V8 3.9.24.29 -http://v8.googlecode.com/svn/branches/3.9@11646 - -Note local edits to src/heap.cc, see http://codereview.chromium.org/10541053/ +V8 3.9.24.30 +http://v8.googlecode.com/svn/branches/3.9@11743 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_) diff --git a/src/version.cc b/src/version.cc index 25769f24..f5fb3909 100644 --- a/src/version.cc +++ b/src/version.cc @@ -35,7 +35,7 @@ #define MAJOR_VERSION 3 #define MINOR_VERSION 9 #define BUILD_NUMBER 24 -#define PATCH_LEVEL 29 +#define PATCH_LEVEL 30 // Use 1 for candidates and 0 otherwise. // (Boolean macro values are not supported by all preprocessors.) #define IS_CANDIDATE_VERSION 0 |