#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 {
+
+struct nursery_copier : no_fixup {
+ bump_allocator* nursery;
+ aging_space* aging;
+
+ nursery_copier(bump_allocator* nursery, aging_space* aging)
+ : nursery(nursery), aging(aging) { }
+
+ object* fixup_data(object* obj) {
+ if (!nursery->contains_p(obj)) {
+ return obj;
+ }
+
+ // The while-loop is a needed micro-optimization.
+ while (obj->forwarding_pointer_p()) {
+ obj = obj->forwarding_pointer();
+ }
+
+ if (!nursery->contains_p(obj)) {
+ return obj;
+ }
+
+ cell size = obj->size();
+ object* newpointer = aging->allot(size);
+ if (!newpointer)
+ throw must_start_gc_again();
+
+ memcpy(newpointer, obj, size);
+ obj->forward_to(newpointer);
+ return newpointer;
+ }
+};
+
+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.
+ slot_visitor<nursery_copier>
+ visitor(this, nursery_copier(data->nursery, data->aging));
+
+ cell scan = data->aging->start + data->aging->occupied_space();
+
+ visitor.visit_all_roots();
+ gc_event* event = current_gc->event;
+
+ if (event)
+ event->reset_timer();
+ visitor.visit_cards(data->tenured, card_points_to_nursery,
+ card_points_to_nursery);
+ visitor.visit_cards(data->aging, card_points_to_nursery, 0xff);
+ if (event) {
+ event->ended_phase(PHASE_CARD_SCAN);
+ event->cards_scanned += visitor.cards_scanned;
+ event->decks_scanned += visitor.decks_scanned;
+ }
+
+ if (event)
+ event->reset_timer();
+ visitor.visit_code_heap_roots(&code->points_to_nursery);
+ if (event) {
+ event->ended_phase(PHASE_CODE_SCAN);
+ event->code_blocks_scanned += code->points_to_nursery.size();
+ }
+
+ visitor.cheneys_algorithm(data->aging, scan);
+
+ data->reset_nursery();
+ code->points_to_nursery.clear();
}
}