Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(398)

Side by Side Diff: src/heap.cc

Issue 3432032: Fix test after 64 bit heap size change. (Closed) Base URL: http://v8.googlecode.com/svn/branches/bleeding_edge/
Patch Set: '' Created 10 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « src/heap.h ('k') | src/heap-inl.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2010 the V8 project authors. All rights reserved. 1 // Copyright 2010 the V8 project authors. All rights reserved.
2 // Redistribution and use in source and binary forms, with or without 2 // Redistribution and use in source and binary forms, with or without
3 // modification, are permitted provided that the following conditions are 3 // modification, are permitted provided that the following conditions are
4 // met: 4 // met:
5 // 5 //
6 // * Redistributions of source code must retain the above copyright 6 // * Redistributions of source code must retain the above copyright
7 // notice, this list of conditions and the following disclaimer. 7 // notice, this list of conditions and the following disclaimer.
8 // * Redistributions in binary form must reproduce the above 8 // * Redistributions in binary form must reproduce the above
9 // copyright notice, this list of conditions and the following 9 // copyright notice, this list of conditions and the following
10 // disclaimer in the documentation and/or other materials provided 10 // disclaimer in the documentation and/or other materials provided
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 70
71 int Heap::amount_of_external_allocated_memory_ = 0; 71 int Heap::amount_of_external_allocated_memory_ = 0;
72 int Heap::amount_of_external_allocated_memory_at_last_global_gc_ = 0; 72 int Heap::amount_of_external_allocated_memory_at_last_global_gc_ = 0;
73 73
74 // semispace_size_ should be a power of 2 and old_generation_size_ should be 74 // semispace_size_ should be a power of 2 and old_generation_size_ should be
75 // a multiple of Page::kPageSize. 75 // a multiple of Page::kPageSize.
76 #if defined(ANDROID) 76 #if defined(ANDROID)
77 int Heap::max_semispace_size_ = 2*MB; 77 int Heap::max_semispace_size_ = 2*MB;
78 intptr_t Heap::max_old_generation_size_ = 192*MB; 78 intptr_t Heap::max_old_generation_size_ = 192*MB;
79 int Heap::initial_semispace_size_ = 128*KB; 79 int Heap::initial_semispace_size_ = 128*KB;
80 size_t Heap::code_range_size_ = 0; 80 intptr_t Heap::code_range_size_ = 0;
81 #elif defined(V8_TARGET_ARCH_X64) 81 #elif defined(V8_TARGET_ARCH_X64)
82 int Heap::max_semispace_size_ = 16*MB; 82 int Heap::max_semispace_size_ = 16*MB;
83 intptr_t Heap::max_old_generation_size_ = 1*GB; 83 intptr_t Heap::max_old_generation_size_ = 1*GB;
84 int Heap::initial_semispace_size_ = 1*MB; 84 int Heap::initial_semispace_size_ = 1*MB;
85 size_t Heap::code_range_size_ = 512*MB; 85 intptr_t Heap::code_range_size_ = 512*MB;
86 #else 86 #else
87 int Heap::max_semispace_size_ = 8*MB; 87 int Heap::max_semispace_size_ = 8*MB;
88 intptr_t Heap::max_old_generation_size_ = 512*MB; 88 intptr_t Heap::max_old_generation_size_ = 512*MB;
89 int Heap::initial_semispace_size_ = 512*KB; 89 int Heap::initial_semispace_size_ = 512*KB;
90 size_t Heap::code_range_size_ = 0; 90 intptr_t Heap::code_range_size_ = 0;
91 #endif 91 #endif
92 92
93 // The snapshot semispace size will be the default semispace size if 93 // The snapshot semispace size will be the default semispace size if
94 // snapshotting is used and will be the requested semispace size as 94 // snapshotting is used and will be the requested semispace size as
95 // set up by ConfigureHeap otherwise. 95 // set up by ConfigureHeap otherwise.
96 int Heap::reserved_semispace_size_ = Heap::max_semispace_size_; 96 int Heap::reserved_semispace_size_ = Heap::max_semispace_size_;
97 97
98 List<Heap::GCPrologueCallbackPair> Heap::gc_prologue_callbacks_; 98 List<Heap::GCPrologueCallbackPair> Heap::gc_prologue_callbacks_;
99 List<Heap::GCEpilogueCallbackPair> Heap::gc_epilogue_callbacks_; 99 List<Heap::GCEpilogueCallbackPair> Heap::gc_epilogue_callbacks_;
100 100
(...skipping 4895 matching lines...) Expand 10 before | Expand all | Expand 10 after
4996 void ExternalStringTable::TearDown() { 4996 void ExternalStringTable::TearDown() {
4997 new_space_strings_.Free(); 4997 new_space_strings_.Free();
4998 old_space_strings_.Free(); 4998 old_space_strings_.Free();
4999 } 4999 }
5000 5000
5001 5001
5002 List<Object*> ExternalStringTable::new_space_strings_; 5002 List<Object*> ExternalStringTable::new_space_strings_;
5003 List<Object*> ExternalStringTable::old_space_strings_; 5003 List<Object*> ExternalStringTable::old_space_strings_;
5004 5004
5005 } } // namespace v8::internal 5005 } } // namespace v8::internal
OLDNEW
« no previous file with comments | « src/heap.h ('k') | src/heap-inl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698