- Convert heap sizes to words from bytes.

runtime/vm/pages.h

 // Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #ifndef VM_PAGES_H_
 #define VM_PAGES_H_
 
 #include "vm/freelist.h"
 #include "vm/globals.h"
 #include "vm/virtual_memory.h"
 
 namespace dart {
 
 DECLARE_FLAG(bool, collect_code);
 DECLARE_FLAG(bool, log_code_drop);
 
 // Forward declarations.
 class Heap;
 class ObjectPointerVisitor;
 
-// An aligned page containing old generation objects. Alignment is used to be
-// able to get to a HeapPage header quickly based on a pointer to an object.
+// A page containing old generation objects.
 class HeapPage {
  public:
   enum PageType {
     kData = 0,
     kExecutable,
     kNumPageTypes
   };
 
   HeapPage* next() const { return next_; }
   void set_next(HeapPage* next) { next_ = next; }
@@ skipping 24 matching lines @@
     return Utils::RoundUp(sizeof(HeapPage), OS::kMaxPreferredCodeAlignment);
   }
 
  private:
   void set_object_end(uword val) {
     ASSERT((val & kObjectAlignmentMask) == kOldObjectAlignmentOffset);
     object_end_ = val;
   }
 
   static HeapPage* Initialize(VirtualMemory* memory, PageType type);
-  static HeapPage* Allocate(intptr_t size, PageType type);
+  static HeapPage* Allocate(intptr_t size_in_words, PageType type);
 
   // Deallocate the virtual memory backing this page. The page pointer to this
   // page becomes immediately inaccessible.
   void Deallocate();
 
   VirtualMemory* memory_;
   HeapPage* next_;
   uword object_end_;
   bool executable_;
 
@@ skipping 86 matching lines @@
 
   PageSpaceGarbageCollectionHistory history_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(PageSpaceController);
 };
 
 
 class PageSpace {
  public:
   // TODO(iposva): Determine heap sizes and tune the page size accordingly.
-  static const intptr_t kPageSize = 256 * KB;
-  static const intptr_t kPageAlignment = kPageSize;
+  static const intptr_t kPageSizeInWords = 256 * KBInWords;
 
   enum GrowthPolicy {
     kControlGrowth,
     kForceGrowth
   };
 
   PageSpace(Heap* heap, intptr_t max_capacity_in_words);
   ~PageSpace();
 
   uword TryAllocate(intptr_t size,
@@ skipping 50 matching lines @@
   };
 
   static const intptr_t kAllocatablePageSize = 64 * KB;
 
   HeapPage* AllocatePage(HeapPage::PageType type);
   void FreePage(HeapPage* page, HeapPage* previous_page);
   HeapPage* AllocateLargePage(intptr_t size, HeapPage::PageType type);
   void FreeLargePage(HeapPage* page, HeapPage* previous_page);
   void FreePages(HeapPage* pages);
 
-  static intptr_t LargePageSizeFor(intptr_t size);
+  static intptr_t LargePageSizeInWordsFor(intptr_t size);
 
   bool CanIncreaseCapacityInWords(intptr_t increase_in_words) {
     ASSERT(capacity_in_words_ <= max_capacity_in_words_);
     return increase_in_words <= (max_capacity_in_words_ - capacity_in_words_);
   }
 
   FreeList freelist_[HeapPage::kNumPageTypes];
 
   Heap* heap_;
 
@@ skipping 12 matching lines @@
   PageSpaceController page_space_controller_;
 
   friend class PageSpaceController;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(PageSpace);
 };
 
 }  // namespace dart
 
 #endif  // VM_PAGES_H_