- Convert heap sizes to words from bytes.

runtime/vm/scavenger.h

 // Copyright (c) 2012, 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_SCAVENGER_H_
 #define VM_SCAVENGER_H_
 
 #include "platform/assert.h"
 #include "platform/utils.h"
 #include "vm/flags.h"
 #include "vm/globals.h"
 #include "vm/raw_object.h"
 #include "vm/virtual_memory.h"
 #include "vm/visitor.h"
 
 namespace dart {
 
 // Forward declarations.
 class Heap;
 class Isolate;
 class ScavengerVisitor;
 
 DECLARE_FLAG(bool, gc_at_alloc);
 
 class Scavenger {
  public:
-  Scavenger(Heap* heap, intptr_t max_capacity, uword object_alignment);
+  Scavenger(Heap* heap, intptr_t max_capacity_in_words, uword object_alignment);
   ~Scavenger();
 
   // Check whether this Scavenger contains this address.
   // During scavenging both the to and from spaces contain "legal" objects.
   // During a scavenge this function only returns true for addresses that will
   // be part of the surviving objects.
   bool Contains(uword addr) const {
     // No reasonable algorithm should be checking for objects in from space. At
     // least unless it is debugging code. This might need to be relaxed later,
     // but currently it helps prevent dumb bugs.
@@ skipping 24 matching lines @@
   // Collect the garbage in this scavenger.
   void Scavenge();
   void Scavenge(bool invoke_api_callbacks);
 
   // Accessors to generate code for inlined allocation.
   uword* TopAddress() { return &top_; }
   uword* EndAddress() { return &end_; }
   static intptr_t top_offset() { return OFFSET_OF(Scavenger, top_); }
   static intptr_t end_offset() { return OFFSET_OF(Scavenger, end_); }
 
-  intptr_t in_use() const { return (top_ - FirstObjectStart()); }
-  intptr_t capacity() const { return space_->size(); }
+  intptr_t UsedInWords() const {
+    return (top_ - FirstObjectStart()) >> kWordSizeLog2;
+  }
+  intptr_t CapacityInWords() const { return space_->size() >> kWordSizeLog2; }
 
   void VisitObjects(ObjectVisitor* visitor) const;
   void VisitObjectPointers(ObjectPointerVisitor* visitor) const;
 
   void StartEndAddress(uword* start, uword* end) const {
     *start = to_->start();
     *end = to_->end();
   }
 
   // Returns true if the last scavenge had a promotion failure.
@@ skipping 86 matching lines @@
 
   friend class ScavengerVisitor;
   friend class ScavengerWeakVisitor;
 
   DISALLOW_COPY_AND_ASSIGN(Scavenger);
 };
 
 }  // namespace dart
 
 #endif  // VM_SCAVENGER_H_