steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

VM: object_compaction_updater -> lambda func

db4
Björn Lindqvist 2015-07-29 16:53:04 +02:00
parent 9049aa1f65
commit 18ab09e493
1 changed files with 6 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
vm/compaction.cpp
View File

@ -85,24 +85,6 @@ struct code_compaction_fixup {
} }
}; };
struct object_compaction_updater {
factor_vm* parent;
compaction_fixup fixup;
object_start_map* starts;
object_compaction_updater(factor_vm* parent, compaction_fixup fixup)
: parent(parent),
fixup(fixup),
starts(&parent->data->tenured->starts) {}
void operator()(object* old_address, object* new_address, cell size) {
slot_visitor<compaction_fixup> forwarder(parent, fixup);
forwarder.visit_slots(new_address);
forwarder.visit_object_code_block(new_address);
starts->record_object_start_offset(new_address);
}
};
template <typename Fixup> template <typename Fixup>
void update_relocation(factor_vm* parent, void update_relocation(factor_vm* parent,
cell old_entry_point, cell old_entry_point,
@ -220,10 +202,12 @@ void factor_vm::collect_compact_impl() {
/* Slide everything in tenured space up, and update data and code heap /* Slide everything in tenured space up, and update data and code heap
pointers inside objects. */ pointers inside objects. */
{ auto compact_object_func = [&](object* old_addr, object* new_addr, cell size) {
object_compaction_updater object_updater(this, fixup); forwarder.visit_slots(new_addr);
tenured->compact(object_updater, fixup, &data_finger); forwarder.visit_object_code_block(new_addr);
} tenured->starts.record_object_start_offset(new_addr);
};
tenured->compact(compact_object_func, fixup, &data_finger);
/* Slide everything in the code heap up, and update data and code heap /* Slide everything in the code heap up, and update data and code heap
pointers inside code blocks. */ pointers inside code blocks. */