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

VM: another opportunity to use a lambda function over a struct

db4
Björn Lindqvist 2015-07-29 16:33:59 +02:00
parent a5a7232b8f
commit 9049aa1f65
1 changed files with 12 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
vm/free_list_allocator.hpp
View File

@ -125,38 +125,27 @@ template <typename Block> void free_list_allocator<Block>::sweep() {
sweep(null_sweep); sweep(null_sweep);
} }
template <typename Block, typename Iterator> struct heap_compactor {
mark_bits* state;
char* address;
Iterator& iter;
const Block** finger;
heap_compactor(mark_bits* state, Block* address,
Iterator& iter, const Block** finger)
: state(state), address((char*)address), iter(iter), finger(finger) {}
void operator()(Block* block, cell size) {
if (this->state->marked_p((cell)block)) {
*finger = (Block*)((cell)block + size);
memmove((Block*)address, block, size);
iter(block, (Block*)address, size);
address += size;
}
}
};
/* The forwarding map must be computed first by calling /* The forwarding map must be computed first by calling
state.compute_forwarding(). */ state.compute_forwarding(). */
template <typename Block> template <typename Block>
template <typename Iterator, typename Fixup> template <typename Iterator, typename Fixup>
void free_list_allocator<Block>::compact(Iterator& iter, Fixup fixup, void free_list_allocator<Block>::compact(Iterator& iter, Fixup fixup,
const Block** finger) { const Block** finger) {
heap_compactor<Block, Iterator> compactor(&state, (Block*)start, iter, finger); cell dest_addr = start;
iterate(compactor, fixup); auto compact_block_func = [&](Block* block, cell size) {
cell block_addr = (cell)block;
if (!state.marked_p(block_addr))
return;
*finger = (Block*)(block_addr + size);
memmove((Block*)dest_addr, block, size);
iter(block, (Block*)dest_addr, size);
dest_addr += size;
};
iterate(compact_block_func, fixup);
/* Now update the free list; there will be a single free block at /* Now update the free list; there will be a single free block at
the end */ the end */
free_blocks.initial_free_list(start, end, (cell)compactor.address - start); free_blocks.initial_free_list(start, end, dest_addr - start);
} }
/* During compaction we have to be careful and measure object sizes /* During compaction we have to be careful and measure object sizes