VM: Refactor slot_visitor.hpp to Factor style

db4
Erik Charlebois 2013-05-11 22:28:42 -04:00
parent b1ccfa2194
commit 6d5197923c
1 changed files with 276 additions and 319 deletions

View File

@ -1,62 +1,56 @@
namespace factor
{
namespace factor {
/* Size of the object pointed to by an untagged pointer */
template<typename Fixup>
cell object::size(Fixup fixup) const
{
if(free_p()) return ((free_heap_block *)this)->size();
template <typename Fixup> cell object::size(Fixup fixup) const {
if (free_p())
return ((free_heap_block*)this)->size();
switch(type())
{
switch (type()) {
case ARRAY_TYPE:
return align(array_size((array*)this),data_alignment);
return align(array_size((array*)this), data_alignment);
case BIGNUM_TYPE:
return align(array_size((bignum*)this),data_alignment);
return align(array_size((bignum*)this), data_alignment);
case BYTE_ARRAY_TYPE:
return align(array_size((byte_array*)this),data_alignment);
return align(array_size((byte_array*)this), data_alignment);
case STRING_TYPE:
return align(string_size(string_capacity((string*)this)),data_alignment);
case TUPLE_TYPE:
{
tuple_layout *layout = (tuple_layout *)fixup.translate_data(untag<object>(((tuple *)this)->layout));
return align(tuple_size(layout),data_alignment);
return align(string_size(string_capacity((string*)this)), data_alignment);
case TUPLE_TYPE: {
tuple_layout* layout = (tuple_layout*)fixup.translate_data(
untag<object>(((tuple*)this)->layout));
return align(tuple_size(layout), data_alignment);
}
case QUOTATION_TYPE:
return align(sizeof(quotation),data_alignment);
return align(sizeof(quotation), data_alignment);
case WORD_TYPE:
return align(sizeof(word),data_alignment);
return align(sizeof(word), data_alignment);
case FLOAT_TYPE:
return align(sizeof(boxed_float),data_alignment);
return align(sizeof(boxed_float), data_alignment);
case DLL_TYPE:
return align(sizeof(dll),data_alignment);
return align(sizeof(dll), data_alignment);
case ALIEN_TYPE:
return align(sizeof(alien),data_alignment);
return align(sizeof(alien), data_alignment);
case WRAPPER_TYPE:
return align(sizeof(wrapper),data_alignment);
return align(sizeof(wrapper), data_alignment);
case CALLSTACK_TYPE:
return align(callstack_object_size(untag_fixnum(((callstack *)this)->length)),data_alignment);
return align(
callstack_object_size(untag_fixnum(((callstack*)this)->length)),
data_alignment);
default:
critical_error("Invalid header in size",(cell)this);
critical_error("Invalid header in size", (cell) this);
return 0; /* can't happen */
}
}
inline cell object::size() const
{
return size(no_fixup());
}
inline cell object::size() const { return size(no_fixup()); }
/* The number of cells from the start of the object which should be scanned by
the GC. Some types have a binary payload at the end (string, word, DLL) which
we ignore. */
template<typename Fixup>
cell object::binary_payload_start(Fixup fixup) const
{
if(free_p()) return 0;
template <typename Fixup> cell object::binary_payload_start(Fixup fixup) const {
if (free_p())
return 0;
switch(type())
{
switch (type()) {
/* these objects do not refer to other objects at all */
case FLOAT_TYPE:
case BYTE_ARRAY_TYPE:
@ -77,27 +71,27 @@ cell object::binary_payload_start(Fixup fixup) const
/* everything else consists entirely of pointers */
case ARRAY_TYPE:
return array_size<array>(array_capacity((array*)this));
case TUPLE_TYPE:
{
tuple_layout *layout = (tuple_layout *)fixup.translate_data(untag<object>(((tuple *)this)->layout));
case TUPLE_TYPE: {
tuple_layout* layout = (tuple_layout*)fixup.translate_data(
untag<object>(((tuple*)this)->layout));
return tuple_size(layout);
}
case WRAPPER_TYPE:
return sizeof(wrapper);
default:
critical_error("Invalid header in binary_payload_start",(cell)this);
critical_error("Invalid header in binary_payload_start", (cell) this);
return 0; /* can't happen */
}
}
inline cell object::binary_payload_start() const
{
inline cell object::binary_payload_start() const {
return binary_payload_start(no_fixup());
}
/* Slot visitors iterate over the slots of an object, applying a functor to
each one that is a non-immediate slot. The pointer is untagged first. The
functor returns a new untagged object pointer. The return value may or may not equal the old one,
functor returns a new untagged object pointer. The return value may or may not
equal the old one,
however the new pointer receives the same tag before being stored back to the
original location.
@ -111,171 +105,144 @@ Iteration is driven by visit_*() methods. Some of them define GC roots:
- visit_roots()
- visit_contexts() */
template<typename Fixup> struct slot_visitor {
factor_vm *parent;
template <typename Fixup> struct slot_visitor {
factor_vm* parent;
Fixup fixup;
explicit slot_visitor<Fixup>(factor_vm *parent_, Fixup fixup_) :
parent(parent_), fixup(fixup_) {}
explicit slot_visitor<Fixup>(factor_vm* parent_, Fixup fixup_)
: parent(parent_), fixup(fixup_) {}
cell visit_pointer(cell pointer);
void visit_handle(cell *handle);
void visit_object_array(cell *start, cell *end);
void visit_slots(object *ptr, cell payload_start);
void visit_slots(object *ptr);
void visit_stack_elements(segment *region, cell *top);
void visit_handle(cell* handle);
void visit_object_array(cell* start, cell* end);
void visit_slots(object* ptr, cell payload_start);
void visit_slots(object* ptr);
void visit_stack_elements(segment* region, cell* top);
void visit_data_roots();
void visit_bignum_roots();
void visit_callback_roots();
void visit_literal_table_roots();
void visit_roots();
void visit_callstack_object(callstack *stack);
void visit_callstack(context *ctx);
void visit_callstack_object(callstack* stack);
void visit_callstack(context* ctx);
void visit_contexts();
void visit_code_block_objects(code_block *compiled);
void visit_embedded_literals(code_block *compiled);
void visit_code_block_objects(code_block* compiled);
void visit_embedded_literals(code_block* compiled);
void visit_sample_callstacks();
void visit_sample_threads();
};
template<typename Fixup>
cell slot_visitor<Fixup>::visit_pointer(cell pointer)
{
if(immediate_p(pointer)) return pointer;
template <typename Fixup>
cell slot_visitor<Fixup>::visit_pointer(cell pointer) {
if (immediate_p(pointer))
return pointer;
object *untagged = fixup.fixup_data(untag<object>(pointer));
return RETAG(untagged,TAG(pointer));
object* untagged = fixup.fixup_data(untag<object>(pointer));
return RETAG(untagged, TAG(pointer));
}
template<typename Fixup>
void slot_visitor<Fixup>::visit_handle(cell *handle)
{
template <typename Fixup> void slot_visitor<Fixup>::visit_handle(cell* handle) {
*handle = visit_pointer(*handle);
}
template<typename Fixup>
void slot_visitor<Fixup>::visit_object_array(cell *start, cell *end)
{
while(start < end) visit_handle(start++);
template <typename Fixup>
void slot_visitor<Fixup>::visit_object_array(cell* start, cell* end) {
while (start < end)
visit_handle(start++);
}
template<typename Fixup>
void slot_visitor<Fixup>::visit_slots(object *ptr, cell payload_start)
{
cell *slot = (cell *)ptr;
cell *end = (cell *)((cell)ptr + payload_start);
template <typename Fixup>
void slot_visitor<Fixup>::visit_slots(object* ptr, cell payload_start) {
cell* slot = (cell*)ptr;
cell* end = (cell*)((cell) ptr + payload_start);
if(slot != end)
{
if (slot != end) {
slot++;
visit_object_array(slot,end);
visit_object_array(slot, end);
}
}
template<typename Fixup>
void slot_visitor<Fixup>::visit_slots(object *obj)
{
if(obj->type() == CALLSTACK_TYPE)
visit_callstack_object((callstack *)obj);
template <typename Fixup> void slot_visitor<Fixup>::visit_slots(object* obj) {
if (obj->type() == CALLSTACK_TYPE)
visit_callstack_object((callstack*)obj);
else
visit_slots(obj,obj->binary_payload_start(fixup));
visit_slots(obj, obj->binary_payload_start(fixup));
}
template<typename Fixup>
void slot_visitor<Fixup>::visit_stack_elements(segment *region, cell *top)
{
visit_object_array((cell *)region->start,top + 1);
template <typename Fixup>
void slot_visitor<Fixup>::visit_stack_elements(segment* region, cell* top) {
visit_object_array((cell*)region->start, top + 1);
}
template<typename Fixup>
void slot_visitor<Fixup>::visit_data_roots()
{
std::vector<data_root_range>::const_iterator iter = parent->data_roots.begin();
template <typename Fixup> void slot_visitor<Fixup>::visit_data_roots() {
std::vector<data_root_range>::const_iterator iter =
parent->data_roots.begin();
std::vector<data_root_range>::const_iterator end = parent->data_roots.end();
for(; iter < end; iter++)
visit_object_array(iter->start,iter->start + iter->len);
for (; iter < end; iter++)
visit_object_array(iter->start, iter->start + iter->len);
}
template<typename Fixup>
void slot_visitor<Fixup>::visit_bignum_roots()
{
template <typename Fixup> void slot_visitor<Fixup>::visit_bignum_roots() {
std::vector<cell>::const_iterator iter = parent->bignum_roots.begin();
std::vector<cell>::const_iterator end = parent->bignum_roots.end();
for(; iter < end; iter++)
{
cell *handle = (cell *)(*iter);
for (; iter < end; iter++) {
cell* handle = (cell*)(*iter);
if(*handle)
*handle = (cell)fixup.fixup_data(*(object **)handle);
if (*handle)
*handle = (cell) fixup.fixup_data(*(object**)handle);
}
}
template<typename Fixup>
struct callback_slot_visitor {
callback_heap *callbacks;
slot_visitor<Fixup> *visitor;
template <typename Fixup> struct callback_slot_visitor {
callback_heap* callbacks;
slot_visitor<Fixup>* visitor;
explicit callback_slot_visitor(callback_heap *callbacks_, slot_visitor<Fixup> *visitor_) :
callbacks(callbacks_), visitor(visitor_) {}
explicit callback_slot_visitor(callback_heap* callbacks_,
slot_visitor<Fixup>* visitor_)
: callbacks(callbacks_), visitor(visitor_) {}
void operator()(code_block *stub)
{
visitor->visit_handle(&stub->owner);
}
void operator()(code_block* stub) { visitor->visit_handle(&stub->owner); }
};
template<typename Fixup>
void slot_visitor<Fixup>::visit_callback_roots()
{
callback_slot_visitor<Fixup> callback_visitor(parent->callbacks,this);
template <typename Fixup> void slot_visitor<Fixup>::visit_callback_roots() {
callback_slot_visitor<Fixup> callback_visitor(parent->callbacks, this);
parent->callbacks->each_callback(callback_visitor);
}
template<typename Fixup>
void slot_visitor<Fixup>::visit_literal_table_roots()
{
std::map<code_block *, cell> *uninitialized_blocks = &parent->code->uninitialized_blocks;
std::map<code_block *, cell>::const_iterator iter = uninitialized_blocks->begin();
std::map<code_block *, cell>::const_iterator end = uninitialized_blocks->end();
template <typename Fixup>
void slot_visitor<Fixup>::visit_literal_table_roots() {
std::map<code_block*, cell>* uninitialized_blocks =
&parent->code->uninitialized_blocks;
std::map<code_block*, cell>::const_iterator iter =
uninitialized_blocks->begin();
std::map<code_block*, cell>::const_iterator end = uninitialized_blocks->end();
std::map<code_block *, cell> new_uninitialized_blocks;
for(; iter != end; iter++)
{
new_uninitialized_blocks.insert(std::make_pair(
iter->first,
visit_pointer(iter->second)));
std::map<code_block*, cell> new_uninitialized_blocks;
for (; iter != end; iter++) {
new_uninitialized_blocks.insert(
std::make_pair(iter->first, visit_pointer(iter->second)));
}
parent->code->uninitialized_blocks = new_uninitialized_blocks;
}
template<typename Fixup>
void slot_visitor<Fixup>::visit_sample_callstacks()
{
template <typename Fixup> void slot_visitor<Fixup>::visit_sample_callstacks() {
for (std::vector<cell>::iterator iter = parent->sample_callstacks.begin();
iter != parent->sample_callstacks.end();
++iter)
{
iter != parent->sample_callstacks.end(); ++iter) {
visit_handle(&*iter);
}
}
template<typename Fixup>
void slot_visitor<Fixup>::visit_sample_threads()
{
template <typename Fixup> void slot_visitor<Fixup>::visit_sample_threads() {
for (std::vector<profiling_sample>::iterator iter = parent->samples.begin();
iter != parent->samples.end();
++iter)
{
iter != parent->samples.end(); ++iter) {
visit_handle(&iter->thread);
}
}
template<typename Fixup>
void slot_visitor<Fixup>::visit_roots()
{
template <typename Fixup> void slot_visitor<Fixup>::visit_roots() {
visit_handle(&parent->true_object);
visit_handle(&parent->bignum_zero);
visit_handle(&parent->bignum_pos_one);
@ -288,16 +255,17 @@ void slot_visitor<Fixup>::visit_roots()
visit_sample_callstacks();
visit_sample_threads();
visit_object_array(parent->special_objects,parent->special_objects + special_object_count);
visit_object_array(parent->special_objects,
parent->special_objects + special_object_count);
}
template<typename Fixup>
struct call_frame_slot_visitor {
factor_vm *parent;
slot_visitor<Fixup> *visitor;
template <typename Fixup> struct call_frame_slot_visitor {
factor_vm* parent;
slot_visitor<Fixup>* visitor;
explicit call_frame_slot_visitor(factor_vm *parent_, slot_visitor<Fixup> *visitor_) :
parent(parent_), visitor(visitor_) {}
explicit call_frame_slot_visitor(factor_vm* parent_,
slot_visitor<Fixup>* visitor_)
: parent(parent_), visitor(visitor_) {}
/*
frame top -> [return address]
@ -306,36 +274,35 @@ struct call_frame_slot_visitor {
[entry_point]
[size]
*/
void operator()(void *frame_top, cell frame_size, code_block *owner, void *addr)
{
void operator()(void* frame_top, cell frame_size, code_block* owner,
void* addr) {
cell return_address = owner->offset(addr);
code_block *compiled = Fixup::translated_code_block_map
? owner
code_block* compiled =
Fixup::translated_code_block_map ? owner
: visitor->fixup.translate_code(owner);
gc_info *info = compiled->block_gc_info();
gc_info* info = compiled->block_gc_info();
FACTOR_ASSERT(return_address < compiled->size());
cell callsite = info->return_address_index(return_address);
if(callsite == (cell)-1)
if (callsite == (cell) - 1)
return;
#ifdef DEBUG_GC_MAPS
std::cout << "call frame code block " << compiled << " with offset " << return_address << std::endl;
std::cout << "call frame code block " << compiled << " with offset "
<< return_address << std::endl;
#endif
cell *stack_pointer = (cell *)frame_top;
u8 *bitmap = info->gc_info_bitmap();
cell* stack_pointer = (cell*)frame_top;
u8* bitmap = info->gc_info_bitmap();
/* Subtract old value of base pointer from every derived pointer. */
for(cell spill_slot = 0; spill_slot < info->derived_root_count; spill_slot++)
{
for (cell spill_slot = 0; spill_slot < info->derived_root_count;
spill_slot++) {
u32 base_pointer = info->lookup_base_pointer(callsite, spill_slot);
if(base_pointer != (u32)-1)
{
if (base_pointer != (u32) - 1) {
#ifdef DEBUG_GC_MAPS
std::cout << "visiting derived root " << spill_slot
<< " with base pointer " << base_pointer
<< std::endl;
<< " with base pointer " << base_pointer << std::endl;
#endif
stack_pointer[spill_slot] -= stack_pointer[base_pointer];
}
@ -344,10 +311,8 @@ struct call_frame_slot_visitor {
/* Update all GC roots, including base pointers. */
cell callsite_gc_roots = info->callsite_gc_roots(callsite);
for(cell spill_slot = 0; spill_slot < info->gc_root_count; spill_slot++)
{
if(bitmap_p(bitmap,callsite_gc_roots + spill_slot))
{
for (cell spill_slot = 0; spill_slot < info->gc_root_count; spill_slot++) {
if (bitmap_p(bitmap, callsite_gc_roots + spill_slot)) {
#ifdef DEBUG_GC_MAPS
std::cout << "visiting GC root " << spill_slot << std::endl;
#endif
@ -356,72 +321,64 @@ struct call_frame_slot_visitor {
}
/* Add the base pointers to obtain new derived pointer values. */
for(cell spill_slot = 0; spill_slot < info->derived_root_count; spill_slot++)
{
for (cell spill_slot = 0; spill_slot < info->derived_root_count;
spill_slot++) {
u32 base_pointer = info->lookup_base_pointer(callsite, spill_slot);
if(base_pointer != (u32)-1)
if (base_pointer != (u32) - 1)
stack_pointer[spill_slot] += stack_pointer[base_pointer];
}
}
};
template<typename Fixup>
void slot_visitor<Fixup>::visit_callstack_object(callstack *stack)
{
call_frame_slot_visitor<Fixup> call_frame_visitor(parent,this);
parent->iterate_callstack_object(stack,call_frame_visitor,fixup);
template <typename Fixup>
void slot_visitor<Fixup>::visit_callstack_object(callstack* stack) {
call_frame_slot_visitor<Fixup> call_frame_visitor(parent, this);
parent->iterate_callstack_object(stack, call_frame_visitor, fixup);
}
template<typename Fixup>
void slot_visitor<Fixup>::visit_callstack(context *ctx)
{
call_frame_slot_visitor<Fixup> call_frame_visitor(parent,this);
parent->iterate_callstack(ctx,call_frame_visitor,fixup);
template <typename Fixup>
void slot_visitor<Fixup>::visit_callstack(context* ctx) {
call_frame_slot_visitor<Fixup> call_frame_visitor(parent, this);
parent->iterate_callstack(ctx, call_frame_visitor, fixup);
}
template<typename Fixup>
void slot_visitor<Fixup>::visit_contexts()
{
std::set<context *>::const_iterator begin = parent->active_contexts.begin();
std::set<context *>::const_iterator end = parent->active_contexts.end();
while(begin != end)
{
context *ctx = *begin;
template <typename Fixup> void slot_visitor<Fixup>::visit_contexts() {
std::set<context*>::const_iterator begin = parent->active_contexts.begin();
std::set<context*>::const_iterator end = parent->active_contexts.end();
while (begin != end) {
context* ctx = *begin;
visit_stack_elements(ctx->datastack_seg,(cell *)ctx->datastack);
visit_stack_elements(ctx->retainstack_seg,(cell *)ctx->retainstack);
visit_object_array(ctx->context_objects,ctx->context_objects + context_object_count);
visit_stack_elements(ctx->datastack_seg, (cell*)ctx->datastack);
visit_stack_elements(ctx->retainstack_seg, (cell*)ctx->retainstack);
visit_object_array(ctx->context_objects,
ctx->context_objects + context_object_count);
visit_callstack(ctx);
begin++;
}
}
template<typename Fixup>
struct literal_references_visitor {
slot_visitor<Fixup> *visitor;
template <typename Fixup> struct literal_references_visitor {
slot_visitor<Fixup>* visitor;
explicit literal_references_visitor(slot_visitor<Fixup> *visitor_) : visitor(visitor_) {}
explicit literal_references_visitor(slot_visitor<Fixup>* visitor_)
: visitor(visitor_) {}
void operator()(instruction_operand op)
{
if(op.rel_type() == RT_LITERAL)
void operator()(instruction_operand op) {
if (op.rel_type() == RT_LITERAL)
op.store_value(visitor->visit_pointer(op.load_value()));
}
};
template<typename Fixup>
void slot_visitor<Fixup>::visit_code_block_objects(code_block *compiled)
{
template <typename Fixup>
void slot_visitor<Fixup>::visit_code_block_objects(code_block* compiled) {
visit_handle(&compiled->owner);
visit_handle(&compiled->parameters);
visit_handle(&compiled->relocation);
}
template<typename Fixup>
void slot_visitor<Fixup>::visit_embedded_literals(code_block *compiled)
{
if(!parent->code->uninitialized_p(compiled))
{
template <typename Fixup>
void slot_visitor<Fixup>::visit_embedded_literals(code_block* compiled) {
if (!parent->code->uninitialized_p(compiled)) {
literal_references_visitor<Fixup> visitor(this);
compiled->each_instruction_operand(visitor);
}