- Implement a simple old-generation marker.

vm/heap.cc

 // 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.
 
 #include "vm/heap.h"
 
 #include "vm/assert.h"
 #include "vm/compiler_stats.h"
 #include "vm/flags.h"
 #include "vm/isolate.h"
@@ skipping 85 matching lines @@
       old_space_->Contains(addr) ||
       code_space_->Contains(addr);
 }
 
 
 bool Heap::CodeContains(uword addr) const {
   return code_space_->Contains(addr);
 }
 
 
-void Heap::Init(Isolate* isolate) {
-  ASSERT(isolate->heap() == NULL);
-  Heap* heap = new Heap();
-  isolate->set_heap(heap);
-}
-
-
-bool Heap::Verify() const {
-  VerifyPointersVisitor visitor;
-  new_space_->VisitObjectPointers(&visitor);
-  old_space_->VisitObjectPointers(&visitor);
-  code_space_->VisitObjectPointers(&visitor);
-  // Only returning a value so that Heap::Validate can be called from an ASSERT.
-  return true;
+void Heap::IterateNewPointers(ObjectPointerVisitor* visitor) {
+  new_space_->VisitObjectPointers(visitor);
 }
 
 
 void Heap::IterateOldPointers(ObjectPointerVisitor* visitor) {
   old_space_->VisitObjectPointers(visitor);
   code_space_->VisitObjectPointers(visitor);
 }
 
 
+void Heap::CollectGarbage(Space space) {
+  switch (space) {
+    case kNew:
+      new_space_->Scavenge();
+      break;
+    case kOld:
+      old_space_->MarkSweep();
+      break;
+    case kExecutable:
+      UNIMPLEMENTED();
+      code_space_->MarkSweep();
+      break;
+    default:
+      UNREACHABLE();
+  }
+}
+
+
+void Heap::CollectAllGarbage() {
+  new_space_->Scavenge();
+  old_space_->MarkSweep();
+  // TODO(iposva): Merge old and code space.
+  // code_space_->MarkSweep();
+}
+
+
 uword Heap::TopAddress() {
   return reinterpret_cast<uword>(new_space_->TopAddress());
 }
 
 
 uword Heap::EndAddress() {
   return reinterpret_cast<uword>(new_space_->EndAddress());
 }
 
 
+void Heap::Init(Isolate* isolate) {
+  ASSERT(isolate->heap() == NULL);
+  Heap* heap = new Heap();
+  isolate->set_heap(heap);
+}
+
+
+bool Heap::Verify() const {
+  VerifyPointersVisitor visitor;
+  new_space_->VisitObjectPointers(&visitor);
+  old_space_->VisitObjectPointers(&visitor);
+  code_space_->VisitObjectPointers(&visitor);
+  // Only returning a value so that Heap::Validate can be called from an ASSERT.
+  return true;
+}
+
+
 #if defined(DEBUG)
 NoGCScope::NoGCScope() : StackResource(Isolate::Current()) {
   isolate()->IncrementNoGCScopeDepth();
 }
 
 
 NoGCScope::~NoGCScope() {
   isolate()->DecrementNoGCScopeDepth();
 }
 #endif  // defined(DEBUG)
 
 }  // namespace dart