Reviewers: Justin Schuh, Søren Gjesse,

Description:
Fix executable memory setting and fix test.

Please review this at http://codereview.chromium.org/4764002/

SVN Base: http://v8.googlecode.com/svn/branches/bleeding_edge/

Affected files:
  M     src/heap.cc
  M     src/spaces.cc
  M     test/cctest/test-mark-compact.cc


Index: src/heap.cc
===================================================================
--- src/heap.cc (revision 5799)
+++ src/heap.cc (working copy)
@@ -4346,7 +4346,7 @@

   if (max_old_gen_size > 0) max_old_generation_size_ = max_old_gen_size;
   if (max_executable_size > 0) {
-    max_executable_size_ = RoundUp(max_executable_size_, Page::kPageSize);
+    max_executable_size_ = RoundUp(max_executable_size, Page::kPageSize);
   }

// The new space size must be a power of two to support single-bit testing
Index: src/spaces.cc
===================================================================
--- src/spaces.cc       (revision 5799)
+++ src/spaces.cc       (working copy)
@@ -270,9 +270,9 @@
// -----------------------------------------------------------------------------
 // MemoryAllocator
 //
-intptr_t MemoryAllocator::capacity_   = 0;
+intptr_t MemoryAllocator::capacity_ = 0;
 intptr_t MemoryAllocator::capacity_executable_ = 0;
-intptr_t MemoryAllocator::size_       = 0;
+intptr_t MemoryAllocator::size_ = 0;
 intptr_t MemoryAllocator::size_executable_ = 0;

 List<MemoryAllocator::MemoryAllocationCallbackRegistration>
Index: test/cctest/test-mark-compact.cc
===================================================================
--- test/cctest/test-mark-compact.cc    (revision 5799)
+++ test/cctest/test-mark-compact.cc    (working copy)
@@ -75,7 +75,7 @@
   // from new space.
   FLAG_gc_global = true;
   FLAG_always_compact = true;
-  Heap::ConfigureHeap(2*256*KB, 4*MB, 0);
+  Heap::ConfigureHeap(2*256*KB, 4*MB, 4*MB);

   InitializeVM();

@@ -101,7 +101,7 @@


 TEST(NoPromotion) {
-  Heap::ConfigureHeap(2*256*KB, 4*MB, 0);
+  Heap::ConfigureHeap(2*256*KB, 4*MB, 4*MB);

   // Test the situation that some objects in new space are promoted to
   // the old space


--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev

Reply via email to