diff --git a/vm/aging_collector.cpp b/vm/aging_collector.cpp index dfd9b6c31c..2fec6a4036 100644 --- a/vm/aging_collector.cpp +++ b/vm/aging_collector.cpp @@ -33,7 +33,7 @@ void factor_vm::collect_aging() { current_gc->op = collect_aging_op; std::swap(data->aging, data->aging_semispace); - data->reset_generation(data->aging); + data->reset_aging(); copying_collector collector(this, this->data->aging, @@ -43,7 +43,7 @@ void factor_vm::collect_aging() { collector.cheneys_algorithm(); - data->reset_generation(&nursery); + data->reset_nursery(); code->clear_remembered_set(); } } diff --git a/vm/data_heap.cpp b/vm/data_heap.cpp index 79df16094c..e483bb8938 100644 --- a/vm/data_heap.cpp +++ b/vm/data_heap.cpp @@ -77,20 +77,20 @@ template void data_heap::clear_decks(Generation* gen) { memset(&decks[first_deck], 0, last_deck - first_deck); } -void data_heap::reset_generation(bump_allocator* gen) { - gen->flush(); +void data_heap::reset_nursery() { + nursery->flush(); } -void data_heap::reset_generation(aging_space* gen) { - gen->flush(); - clear_cards(gen); - clear_decks(gen); - gen->starts.clear_object_start_offsets(); +void data_heap::reset_aging() { + aging->flush(); + clear_cards(aging); + clear_decks(aging); + aging->starts.clear_object_start_offsets(); } -void data_heap::reset_generation(tenured_space* gen) { - clear_cards(gen); - clear_decks(gen); +void data_heap::reset_tenured() { + clear_cards(tenured); + clear_decks(tenured); } bool data_heap::high_fragmentation_p() { diff --git a/vm/data_heap.hpp b/vm/data_heap.hpp index 3cd7781fc0..45400a3b05 100644 --- a/vm/data_heap.hpp +++ b/vm/data_heap.hpp @@ -29,9 +29,9 @@ struct data_heap { data_heap* grow(bump_allocator* vm_nursery, cell requested_size); template void clear_cards(Generation* gen); template void clear_decks(Generation* gen); - void reset_generation(bump_allocator* gen); - void reset_generation(aging_space* gen); - void reset_generation(tenured_space* gen); + void reset_nursery(); + void reset_aging(); + void reset_tenured(); bool high_fragmentation_p(); bool low_memory_p(); void mark_all_cards(); diff --git a/vm/full_collector.cpp b/vm/full_collector.cpp index 4a15a6faaa..736974b67e 100644 --- a/vm/full_collector.cpp +++ b/vm/full_collector.cpp @@ -59,10 +59,9 @@ void factor_vm::collect_mark_impl(bool trace_contexts_p) { code_visitor.visit_object_code_block(obj); } } - - data->reset_generation(data->tenured); - data->reset_generation(data->aging); - data->reset_generation(&nursery); + data->reset_tenured(); + data->reset_aging(); + data->reset_nursery(); code->clear_remembered_set(); } diff --git a/vm/nursery_collector.cpp b/vm/nursery_collector.cpp index c8a18581e0..de949b66bc 100644 --- a/vm/nursery_collector.cpp +++ b/vm/nursery_collector.cpp @@ -31,7 +31,7 @@ void factor_vm::collect_nursery() { collector.cheneys_algorithm(); - data->reset_generation(&nursery); + data->reset_nursery(); code->points_to_nursery.clear(); } diff --git a/vm/to_tenured_collector.cpp b/vm/to_tenured_collector.cpp index c3845c50a0..360d52d5af 100644 --- a/vm/to_tenured_collector.cpp +++ b/vm/to_tenured_collector.cpp @@ -41,8 +41,8 @@ void factor_vm::collect_to_tenured() { collector.tenure_reachable_objects(); - data->reset_generation(&nursery); - data->reset_generation(data->aging); + data->reset_nursery(); + data->reset_aging(); code->clear_remembered_set(); }