VM: Refactor nursery_* to Factor style

diff --git a/vm/nursery_collector.cpp b/vm/nursery_collector.cpp
index 7ea81391b25a8f2c252b3b37e957896f00ec0434..254a776d3524e334b2bbd7094a42468a5565ec61 100644 (file)
--- a/vm/nursery_collector.cpp
+++ b/vm/nursery_collector.cpp
@@ -1,45 +1,42 @@
 #include "master.hpp"
 
-namespace factor
-{
-
-nursery_collector::nursery_collector(factor_vm *parent_) :
-       copying_collector<aging_space,nursery_policy>(
-               parent_,
-               parent_->data->aging,
-               nursery_policy(parent_)) {}
-
-void factor_vm::collect_nursery()
-{
-       /* Copy live objects from the nursery (as determined by the root set and
-       marked cards in aging and tenured) to aging space. */
-       nursery_collector collector(this);
-
-       collector.trace_roots();
-       collector.trace_contexts();
-
-       gc_event *event = current_gc->event;
-
-       if(event) event->started_card_scan();
-       collector.trace_cards(data->tenured,
-               card_points_to_nursery,
-               simple_unmarker(card_points_to_nursery));
-       if(data->aging->here != data->aging->start)
-       {
-               collector.trace_cards(data->aging,
-                       card_points_to_nursery,
-                       full_unmarker());
-       }
-       if(event) event->ended_card_scan(collector.cards_scanned,collector.decks_scanned);
-
-       if(event) event->started_code_scan();
-       collector.trace_code_heap_roots(&code->points_to_nursery);
-       if(event) event->ended_code_scan(collector.code_blocks_scanned);
-
-       collector.cheneys_algorithm();
-
-       data->reset_generation(&nursery);
-       code->points_to_nursery.clear();
+namespace factor {
+
+nursery_collector::nursery_collector(factor_vm* parent_)
+    : copying_collector<aging_space, nursery_policy>(parent_,
+                                                     parent_->data->aging,
+                                                     nursery_policy(parent_)) {}
+
+void factor_vm::collect_nursery() {
+  /* Copy live objects from the nursery (as determined by the root set and
+     marked cards in aging and tenured) to aging space. */
+  nursery_collector collector(this);
+
+  collector.trace_roots();
+  collector.trace_contexts();
+
+  gc_event* event = current_gc->event;
+
+  if (event)
+    event->started_card_scan();
+  collector.trace_cards(data->tenured, card_points_to_nursery,
+                        simple_unmarker(card_points_to_nursery));
+  if (data->aging->here != data->aging->start) {
+    collector.trace_cards(data->aging, card_points_to_nursery, full_unmarker());
+  }
+  if (event)
+    event->ended_card_scan(collector.cards_scanned, collector.decks_scanned);
+
+  if (event)
+    event->started_code_scan();
+  collector.trace_code_heap_roots(&code->points_to_nursery);
+  if (event)
+    event->ended_code_scan(collector.code_blocks_scanned);
+
+  collector.cheneys_algorithm();
+
+  data->reset_generation(&nursery);
+  code->points_to_nursery.clear();
 }
 
 }

diff --git a/vm/nursery_collector.hpp b/vm/nursery_collector.hpp
index de9b38d283f40038291bdd0fe5e2ece070026796..06599ea646f202d9cf34a9ecac0ad63f413ca5ae 100644 (file)
--- a/vm/nursery_collector.hpp
+++ b/vm/nursery_collector.hpp
@@ -1,23 +1,19 @@
-namespace factor
-{
+namespace factor {
 
 struct nursery_policy {
-       factor_vm *parent;
+  factor_vm* parent;
 
-       explicit nursery_policy(factor_vm *parent_) : parent(parent_) {}
+  explicit nursery_policy(factor_vm* parent_) : parent(parent_) {}
 
-       bool should_copy_p(object *obj)
-       {
-               return parent->nursery.contains_p(obj);
-       }
+  bool should_copy_p(object* obj) { return parent->nursery.contains_p(obj); }
 
-       void promoted_object(object *obj) {}
+  void promoted_object(object* obj) {}
 
-       void visited_object(object *obj) {}
+  void visited_object(object* obj) {}
 };
 
-struct nursery_collector : copying_collector<aging_space,nursery_policy> {
-       explicit nursery_collector(factor_vm *parent_);
+struct nursery_collector : copying_collector<aging_space, nursery_policy> {
+  explicit nursery_collector(factor_vm* parent_);
 };
 
 }

diff --git a/vm/nursery_space.hpp b/vm/nursery_space.hpp
index c44d2a8e4413aac7df08a2f22701a4ce8c019265..e4a905bd4e0f04f1391b214842d0ece73d2fe02d 100644 (file)
--- a/vm/nursery_space.hpp
+++ b/vm/nursery_space.hpp
@@ -1,9 +1,8 @@
-namespace factor
-{
+namespace factor {
 
-struct nursery_space : bump_allocator<object>
-{
-       explicit nursery_space(cell size, cell start) : bump_allocator<object>(size,start) {}
+struct nursery_space : bump_allocator<object> {
+  explicit nursery_space(cell size, cell start)
+      : bump_allocator<object>(size, start) {}
 };
 
 }