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

vm: remove some dead code

db4
Slava Pestov 2009-11-05 19:32:26 -06:00
parent 8d8f539660
commit 18a2ce1f8c
3 changed files with 0 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
vm/code_heap.cpp
View File

@ -135,12 +135,6 @@ struct code_heap_relocator {
} }
}; };
void factor_vm::relocate_code_heap()
{
code_heap_relocator relocator(this);
code->allocator->sweep(relocator);
}
void factor_vm::primitive_modify_code_heap() void factor_vm::primitive_modify_code_heap()
{ {
data_root<array> alist(dpop(),this); data_root<array> alist(dpop(),this);

54
vm/free_list_allocator.hpp
View File

@ -23,7 +23,6 @@ template<typename Block> struct free_list_allocator {
cell largest_free_block(); cell largest_free_block();
cell free_block_count(); cell free_block_count();
void sweep(); void sweep();
template<typename Iterator> void sweep(Iterator &iter);
template<typename Iterator, typename Sizer> void compact(Iterator &iter, Sizer &sizer); template<typename Iterator, typename Sizer> void compact(Iterator &iter, Sizer &sizer);
template<typename Iterator, typename Sizer> void iterate(Iterator &iter, Sizer &sizer); template<typename Iterator, typename Sizer> void iterate(Iterator &iter, Sizer &sizer);
template<typename Iterator> void iterate(Iterator &iter); template<typename Iterator> void iterate(Iterator &iter);
@ -152,59 +151,6 @@ void free_list_allocator<Block>::sweep()
} }
} }
template<typename Block>
template<typename Iterator>
void free_list_allocator<Block>::sweep(Iterator &iter)
{
free_blocks.clear_free_list();
Block *prev = NULL;
Block *scan = this->first_block();
Block *end = this->last_block();
while(scan != end)
{
cell size = scan->size();
if(scan->free_p())
{
if(prev && prev->free_p())
{
free_heap_block *free_prev = (free_heap_block *)prev;
free_prev->make_free(free_prev->size() + size);
}
else
prev = scan;
}
else if(this->state.marked_p(scan))
{
if(prev && prev->free_p())
free_blocks.add_to_free_list((free_heap_block *)prev);
prev = scan;
iter(scan,size);
}
else
{
if(prev && prev->free_p())
{
free_heap_block *free_prev = (free_heap_block *)prev;
free_prev->make_free(free_prev->size() + size);
}
else
{
free_heap_block *free_block = (free_heap_block *)scan;
free_block->make_free(size);
prev = scan;
}
}
scan = (Block *)((cell)scan + size);
}
if(prev && prev->free_p())
free_blocks.add_to_free_list((free_heap_block *)prev);
}
template<typename Block, typename Iterator> struct heap_compactor { template<typename Block, typename Iterator> struct heap_compactor {
mark_bits<Block> *state; mark_bits<Block> *state;
char *address; char *address;

1
vm/vm.hpp
View File

@ -530,7 +530,6 @@ struct factor_vm
void jit_compile_word(cell word_, cell def_, bool relocate); void jit_compile_word(cell word_, cell def_, bool relocate);
void update_code_heap_words(); void update_code_heap_words();
void update_code_heap_words_and_literals(); void update_code_heap_words_and_literals();
void relocate_code_heap();
void primitive_modify_code_heap(); void primitive_modify_code_heap();
code_heap_room code_room(); code_heap_room code_room();
void primitive_code_room(); void primitive_code_room();