vm: add code block marking to full_collector.cpp
parent
6939759f46
commit
db29d60e8e
|
@ -7,6 +7,77 @@ full_collector::full_collector(factor_vm *myvm_, bool trace_contexts_p_) :
|
|||
copying_collector<tenured_space,full_policy>(myvm_,myvm_->data->tenured,full_policy(myvm_)),
|
||||
trace_contexts_p(trace_contexts_p_) {}
|
||||
|
||||
struct stack_frame_marker {
|
||||
factor_vm *myvm;
|
||||
full_collector *collector;
|
||||
|
||||
explicit stack_frame_marker(full_collector *collector_) :
|
||||
myvm(collector_->myvm), collector(collector_) {}
|
||||
|
||||
void operator()(stack_frame *frame)
|
||||
{
|
||||
collector->mark_code_block(myvm->frame_code(frame));
|
||||
}
|
||||
};
|
||||
|
||||
/* Mark code blocks executing in currently active stack frames. */
|
||||
void full_collector::mark_active_blocks(context *stacks)
|
||||
{
|
||||
cell top = (cell)stacks->callstack_top;
|
||||
cell bottom = (cell)stacks->callstack_bottom;
|
||||
|
||||
stack_frame_marker marker(this);
|
||||
myvm->iterate_callstack(top,bottom,marker);
|
||||
}
|
||||
|
||||
void full_collector::mark_object_code_block(object *object)
|
||||
{
|
||||
switch(object->h.hi_tag())
|
||||
{
|
||||
case WORD_TYPE:
|
||||
{
|
||||
word *w = (word *)object;
|
||||
if(w->code)
|
||||
mark_code_block(w->code);
|
||||
if(w->profiling)
|
||||
mark_code_block(w->profiling);
|
||||
break;
|
||||
}
|
||||
case QUOTATION_TYPE:
|
||||
{
|
||||
quotation *q = (quotation *)object;
|
||||
if(q->code)
|
||||
mark_code_block(q->code);
|
||||
break;
|
||||
}
|
||||
case CALLSTACK_TYPE:
|
||||
{
|
||||
callstack *stack = (callstack *)object;
|
||||
stack_frame_marker marker(this);
|
||||
myvm->iterate_callstack_object(stack,marker);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* Trace all literals referenced from a code block. Only for aging and nursery collections */
|
||||
void full_collector::trace_literal_references(code_block *compiled)
|
||||
{
|
||||
this->trace_handle(&compiled->owner);
|
||||
this->trace_handle(&compiled->literals);
|
||||
this->trace_handle(&compiled->relocation);
|
||||
}
|
||||
|
||||
/* Mark all literals referenced from a word XT. Only for tenured
|
||||
collections */
|
||||
void full_collector::mark_code_block(code_block *compiled)
|
||||
{
|
||||
myvm->check_code_address((cell)compiled);
|
||||
|
||||
this->myvm->code->mark_block(compiled);
|
||||
trace_literal_references(compiled);
|
||||
}
|
||||
|
||||
void full_collector::go()
|
||||
{
|
||||
trace_roots();
|
||||
|
|
|
@ -17,6 +17,10 @@ struct full_collector : copying_collector<tenured_space,full_policy> {
|
|||
bool trace_contexts_p;
|
||||
|
||||
full_collector(factor_vm *myvm_, bool trace_contexts_p_);
|
||||
void mark_active_blocks(context *stacks);
|
||||
void mark_object_code_block(object *object);
|
||||
void trace_literal_references(code_block *compiled);
|
||||
void mark_code_block(code_block *compiled);
|
||||
void go();
|
||||
};
|
||||
|
||||
|
|
Loading…
Reference in New Issue