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

vm: emit safepoints before VM compiler prologs 

For #379
db4
Joe Groff 2011-11-16 12:39:25 -08:00
parent 64bbd248d5
commit 44b608bb22
2 changed files with 52 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
vm/quotations.cpp
View File

@ -82,19 +82,31 @@ bool quotation_jit::declare_p(cell i, cell length)
&& array_nth(elements.untagged(),i + 1) == parent->special_objects[JIT_DECLARE_WORD];
}
bool quotation_jit::word_stack_frame_p(cell obj)
bool quotation_jit::special_subprimitive_p(cell obj)
{
// Subprimitives should be flagged with whether they require a stack frame.
// See #295.
return (to_boolean(untag<word>(obj)->subprimitive)
&& obj != parent->special_objects[SIGNAL_HANDLER_WORD]
&& obj != parent->special_objects[LEAF_SIGNAL_HANDLER_WORD]
&& obj != parent->special_objects[FFI_SIGNAL_HANDLER_WORD]
&& obj != parent->special_objects[FFI_LEAF_SIGNAL_HANDLER_WORD])
return obj == parent->special_objects[SIGNAL_HANDLER_WORD]
|| obj == parent->special_objects[LEAF_SIGNAL_HANDLER_WORD]
|| obj == parent->special_objects[FFI_SIGNAL_HANDLER_WORD]
|| obj == parent->special_objects[FFI_LEAF_SIGNAL_HANDLER_WORD];
}
bool quotation_jit::word_stack_frame_p(cell obj)
{
return (to_boolean(untag<word>(obj)->subprimitive) && !special_subprimitive_p(obj))
|| obj == parent->special_objects[JIT_PRIMITIVE_WORD];
}
bool quotation_jit::stack_frame_p()
bool quotation_jit::word_safepoint_p(cell obj)
{
if (to_boolean(untag<word>(obj)->subprimitive) && special_subprimitive_p(obj))
return false;
else
return true;
}
bool quotation_jit::safepoint_p()
{
fixnum length = array_capacity(elements.untagged());
@ -119,14 +131,34 @@ bool quotation_jit::stack_frame_p()
return false;
}
bool quotation_jit::stack_frame_p()
{
fixnum length = array_capacity(elements.untagged());
for(fixnum i = 0; i < length; i++)
{
cell obj = array_nth(elements.untagged(),i);
if (tagged<object>(obj).type() == WORD_TYPE && !word_safepoint_p(obj))
return false;
}
return true;
}
bool quotation_jit::trivial_quotation_p(array *elements)
{
return array_capacity(elements) == 1 && tagged<object>(array_nth(elements,0)).type_p(WORD_TYPE);
}
void quotation_jit::emit_epilog(bool stack_frame)
void quotation_jit::emit_prolog(bool safepoint, bool stack_frame)
{
emit(parent->special_objects[JIT_SAFEPOINT]);
if(safepoint) emit(parent->special_objects[JIT_SAFEPOINT]);
if(stack_frame) emit(parent->special_objects[JIT_PROLOG]);
}
void quotation_jit::emit_epilog(bool safepoint, bool stack_frame)
{
if(safepoint) emit(parent->special_objects[JIT_SAFEPOINT]);
if(stack_frame) emit(parent->special_objects[JIT_EPILOG]);
}
@ -150,12 +182,12 @@ void quotation_jit::emit_quot(cell quot_)
/* Allocates memory */
void quotation_jit::iterate_quotation()
{
bool safepoint = safepoint_p();
bool stack_frame = stack_frame_p();
set_position(0);
if(stack_frame)
emit(parent->special_objects[JIT_PROLOG]);
emit_prolog(safepoint, stack_frame);
cell i;
cell length = array_capacity(elements.untagged());
@ -180,7 +212,7 @@ void quotation_jit::iterate_quotation()
/* Everything else */
else if(i == length - 1)
{
emit_epilog(stack_frame);
emit_epilog(safepoint, stack_frame);
tail_call = true;
word_jump(obj.value());
}
@ -218,7 +250,7 @@ void quotation_jit::iterate_quotation()
mutually recursive in the library, but both still work) */
if(fast_if_p(i,length))
{
emit_epilog(stack_frame);
emit_epilog(safepoint, stack_frame);
tail_call = true;
emit_quot(array_nth(elements.untagged(),i));
@ -255,7 +287,7 @@ void quotation_jit::iterate_quotation()
/* Method dispatch */
if(mega_lookup_p(i,length))
{
emit_epilog(stack_frame);
emit_epilog(safepoint, stack_frame);
tail_call = true;
emit_mega_cache_lookup(
array_nth(elements.untagged(),i),
@ -279,7 +311,7 @@ void quotation_jit::iterate_quotation()
{
set_position(length);
emit_epilog(stack_frame);
emit_epilog(safepoint, stack_frame);
emit(parent->special_objects[JIT_RETURN]);
}
}

6
vm/quotations.hpp
View File

@ -16,15 +16,19 @@ struct quotation_jit : public jit {
bool primitive_call_p(cell i, cell length);
bool trivial_quotation_p(array *elements);
void emit_quot(cell quot);
void emit_epilog(bool stack_frame);
void emit_prolog(bool safepoint, bool stack_frame);
void emit_epilog(bool safepoint, bool stack_frame);
bool fast_if_p(cell i, cell length);
bool fast_dip_p(cell i, cell length);
bool fast_2dip_p(cell i, cell length);
bool fast_3dip_p(cell i, cell length);
bool mega_lookup_p(cell i, cell length);
bool declare_p(cell i, cell length);
bool special_subprimitive_p(cell obj);
bool word_stack_frame_p(cell obj);
bool word_safepoint_p(cell obj);
bool stack_frame_p();
bool safepoint_p();
void iterate_quotation();
};