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

VM: callback_entry_point() and update() can be removed

db4
Björn Lindqvist 2015-08-31 02:10:05 +02:00
parent 9725169ca7
commit da3de080ee
3 changed files with 12 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
vm/callbacks.cpp
View File

@ -16,7 +16,6 @@ callback_heap::~callback_heap() {
allocator = NULL; allocator = NULL;
delete seg; delete seg;
seg = NULL; seg = NULL;
} }
void factor_vm::init_callbacks(cell size) { void factor_vm::init_callbacks(cell size) {
@ -48,12 +47,12 @@ void callback_heap::store_callback_operand(code_block* stub, cell index,
} }
void callback_heap::update(code_block* stub) { void callback_heap::update(code_block* stub) {
store_callback_operand(stub, 1, callback_entry_point(stub)); word* w = (word*)UNTAG(stub->owner);
store_callback_operand(stub, 1, w->entry_point);
stub->flush_icache(); stub->flush_icache();
} }
code_block* callback_heap::add(cell owner, cell return_rewind) { code_block* callback_heap::add(cell owner, cell return_rewind) {
/* code_template is a 2-tuple where the first element contains the /* code_template is a 2-tuple where the first element contains the
relocations and the second a byte array of compiled assembly relocations and the second a byte array of compiled assembly
code. The code assumes that there are four relocations on x86 and code. The code assumes that there are four relocations on x86 and
@ -69,7 +68,6 @@ code_block* callback_heap::add(cell owner, cell return_rewind) {
false_object, false_object,
false_object); false_object);
} }
stub->header = bump & ~7; stub->header = bump & ~7;
stub->owner = owner; stub->owner = owner;
stub->parameters = false_object; stub->parameters = false_object;
@ -77,10 +75,8 @@ code_block* callback_heap::add(cell owner, cell return_rewind) {
memcpy((void*)stub->entry_point(), insns->data<void>(), size); memcpy((void*)stub->entry_point(), insns->data<void>(), size);
/* Store VM pointer */ /* Store VM pointer in two relocations. */
store_callback_operand(stub, 0, (cell)parent); store_callback_operand(stub, 0, (cell)parent);
/* Store VM pointer */
store_callback_operand(stub, 2, (cell)parent); store_callback_operand(stub, 2, (cell)parent);
/* On x86, the RET instruction takes an argument which depends on /* On x86, the RET instruction takes an argument which depends on
@ -89,17 +85,9 @@ code_block* callback_heap::add(cell owner, cell return_rewind) {
store_callback_operand(stub, 3, return_rewind); store_callback_operand(stub, 3, return_rewind);
update(stub); update(stub);
return stub; return stub;
} }
void callback_heap::update() {
auto callback_updater = [&](code_block* stub, cell size) {
update(stub);
};
allocator->iterate(callback_updater);
}
/* Allocates memory (add(), allot_alien())*/ /* Allocates memory (add(), allot_alien())*/
void factor_vm::primitive_callback() { void factor_vm::primitive_callback() {
cell return_rewind = to_cell(ctx->pop()); cell return_rewind = to_cell(ctx->pop());

6
vm/callbacks.hpp
View File

@ -31,17 +31,11 @@ struct callback_heap {
callback_heap(cell size, factor_vm* parent); callback_heap(cell size, factor_vm* parent);
~callback_heap(); ~callback_heap();
cell callback_entry_point(code_block* stub) {
word* w = (word*)UNTAG(stub->owner);
return w->entry_point;
}
bool return_takes_param_p(); bool return_takes_param_p();
instruction_operand callback_operand(code_block* stub, cell index); instruction_operand callback_operand(code_block* stub, cell index);
void store_callback_operand(code_block* stub, cell index, cell value); void store_callback_operand(code_block* stub, cell index, cell value);
void update(code_block* stub); void update(code_block* stub);
code_block* add(cell owner, cell return_rewind); code_block* add(cell owner, cell return_rewind);
void update();
}; };
} }

9
vm/compaction.cpp
View File

@ -131,7 +131,14 @@ void factor_vm::collect_compact_impl() {
} }
update_code_roots_for_compaction(); update_code_roots_for_compaction();
callbacks->update();
/* Each callback has a relocation with a pointer to a code block in
the code heap. Since the code heap has now been compacted, those
pointers are invalid and we need to update them. */
auto callback_updater = [&](code_block* stub, cell size) {
callbacks->update(stub);
};
callbacks->allocator->iterate(callback_updater);
code->initialize_all_blocks_set(); code->initialize_all_blocks_set();