Index: test/cctest/test-spaces.cc |
=================================================================== |
--- test/cctest/test-spaces.cc (revision 3088) |
+++ test/cctest/test-spaces.cc (working copy) |
@@ -99,9 +99,9 @@ |
TEST(MemoryAllocator) { |
CHECK(Heap::ConfigureHeapDefault()); |
- CHECK(MemoryAllocator::Setup(Heap::MaxCapacity())); |
+ CHECK(MemoryAllocator::Setup(Heap::MaxReserved())); |
- OldSpace faked_space(Heap::MaxCapacity(), OLD_POINTER_SPACE, NOT_EXECUTABLE); |
+ OldSpace faked_space(Heap::MaxReserved(), OLD_POINTER_SPACE, NOT_EXECUTABLE); |
int total_pages = 0; |
int requested = 2; |
int allocated; |
@@ -155,16 +155,16 @@ |
TEST(NewSpace) { |
CHECK(Heap::ConfigureHeapDefault()); |
- CHECK(MemoryAllocator::Setup(Heap::MaxCapacity())); |
+ CHECK(MemoryAllocator::Setup(Heap::MaxReserved())); |
NewSpace new_space; |
void* chunk = |
- MemoryAllocator::ReserveInitialChunk(2 * Heap::YoungGenerationSize()); |
+ MemoryAllocator::ReserveInitialChunk(4 * Heap::ReservedSemiSpaceSize()); |
CHECK(chunk != NULL); |
Address start = RoundUp(static_cast<Address>(chunk), |
- Heap::YoungGenerationSize()); |
- CHECK(new_space.Setup(start, Heap::YoungGenerationSize())); |
+ 2 * Heap::ReservedSemiSpaceSize()); |
+ CHECK(new_space.Setup(start, 2 * Heap::ReservedSemiSpaceSize())); |
CHECK(new_space.HasBeenSetup()); |
while (new_space.Available() >= Page::kMaxHeapObjectSize) { |
@@ -180,18 +180,18 @@ |
TEST(OldSpace) { |
CHECK(Heap::ConfigureHeapDefault()); |
- CHECK(MemoryAllocator::Setup(Heap::MaxCapacity())); |
+ CHECK(MemoryAllocator::Setup(Heap::MaxReserved())); |
- OldSpace* s = new OldSpace(Heap::OldGenerationSize(), |
+ OldSpace* s = new OldSpace(Heap::MaxOldGenerationSize(), |
OLD_POINTER_SPACE, |
NOT_EXECUTABLE); |
CHECK(s != NULL); |
void* chunk = |
- MemoryAllocator::ReserveInitialChunk(2 * Heap::YoungGenerationSize()); |
+ MemoryAllocator::ReserveInitialChunk(4 * Heap::ReservedSemiSpaceSize()); |
CHECK(chunk != NULL); |
Address start = static_cast<Address>(chunk); |
- size_t size = RoundUp(start, Heap::YoungGenerationSize()) - start; |
+ size_t size = RoundUp(start, 2 * Heap::ReservedSemiSpaceSize()) - start; |
CHECK(s->Setup(start, size)); |