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

vm: code cleanup

Slava Pestov 2009-12-26 15:24:21 +13:00
parent 1453154376
commit 2d8b44e5b7
3 changed files with 28 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
vm/compaction.cpp
View File

@ -155,6 +155,34 @@ struct code_block_compaction_updater {
} }
}; };
/* After a compaction, invalidate any code heap roots which are not
marked, and also slide the valid roots up so that call sites can be updated
correctly in case an inline cache compilation triggered compaction. */
void factor_vm::update_code_roots_for_compaction()
{
std::vector<code_root *>::const_iterator iter = code_roots.begin();
std::vector<code_root *>::const_iterator end = code_roots.end();
mark_bits<code_block> *state = &code->allocator->state;
for(; iter < end; iter++)
{
code_root *root = *iter;
code_block *block = (code_block *)(root->value & -data_alignment);
/* Offset of return address within 16-byte allocation line */
cell offset = root->value - (cell)block;
if(root->valid && state->marked_p(block))
{
block = state->forward_block(block);
root->value = (cell)block + offset;
}
else
root->valid = false;
}
}
/* Compact data and code heaps */ /* Compact data and code heaps */
void factor_vm::collect_compact_impl(bool trace_contexts_p) void factor_vm::collect_compact_impl(bool trace_contexts_p)
{ {

28
vm/full_collector.cpp
View File

@ -57,34 +57,6 @@ void factor_vm::update_code_roots_for_sweep()
} }
} }
/* After a compaction, invalidate any code heap roots which are not
marked as above, and also slide the valid roots up so that call sites
can be updated correctly. */
void factor_vm::update_code_roots_for_compaction()
{
std::vector<code_root *>::const_iterator iter = code_roots.begin();
std::vector<code_root *>::const_iterator end = code_roots.end();
mark_bits<code_block> *state = &code->allocator->state;
for(; iter < end; iter++)
{
code_root *root = *iter;
code_block *block = (code_block *)(root->value & -data_alignment);
/* Offset of return address within 16-byte allocation line */
cell offset = root->value - (cell)block;
if(root->valid && state->marked_p(block))
{
block = state->forward_block(block);
root->value = (cell)block + offset;
}
else
root->valid = false;
}
}
void factor_vm::collect_mark_impl(bool trace_contexts_p) void factor_vm::collect_mark_impl(bool trace_contexts_p)
{ {
full_collector collector(this); full_collector collector(this);

1
vm/words.cpp
View File

@ -34,7 +34,6 @@ void factor_vm::compile_all_words()
jit_compile_word(word.value(),word->def,false); jit_compile_word(word.value(),word->def,false);
update_word_xt(word.untagged()); update_word_xt(word.untagged());
} }
} }