namespace factor {
+bool return_takes_param_p() {
+#if defined(FACTOR_X86) || defined(FACTOR_AMD64)
+ return true;
+#else
+ return false;
+#endif
+}
+
callback_heap::callback_heap(cell size, factor_vm* parent) {
seg = new segment(size, true);
if (!seg)
allocator = NULL;
delete seg;
seg = NULL;
-
-}
-
-void factor_vm::init_callbacks(cell size) {
- callbacks = new callback_heap(size, this);
-}
-
-bool callback_heap::return_takes_param_p() {
-#if defined(FACTOR_X86) || defined(FACTOR_AMD64)
- return true;
-#else
- return false;
-#endif
}
instruction_operand callback_heap::callback_operand(code_block* stub,
}
void callback_heap::update(code_block* stub) {
- store_callback_operand(stub, 1, callback_entry_point(stub));
+ word* w = untag<word>(stub->owner);
+ store_callback_operand(stub, 1, w->entry_point);
stub->flush_icache();
}
code_block* callback_heap::add(cell owner, cell return_rewind) {
-
- /* code_template is a 2-tuple where the first element contains the
- relocations and the second a byte array of compiled assembly
- code. The code assumes that there are four relocations on x86 and
- three on ppc. */
+ // code_template is a 2-tuple where the first element contains the
+ // relocations and the second a byte array of compiled assembly
+ // code. The code assumes that there are four relocations on x86 and
+ // three on ppc.
tagged<array> code_template(parent->special_objects[CALLBACK_STUB]);
tagged<byte_array> insns(array_nth(code_template.untagged(), 1));
cell size = array_capacity(insns.untagged());
false_object,
false_object);
}
-
stub->header = bump & ~7;
stub->owner = owner;
stub->parameters = false_object;
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, 2, (cell)parent);
- /* Store VM pointer */
- store_callback_operand(stub, 2, (cell) parent);
-
- /* On x86, the RET instruction takes an argument which depends on
- the callback's calling convention */
+ // On x86, the RET instruction takes an argument which depends on
+ // the callback's calling convention
if (return_takes_param_p())
store_callback_operand(stub, 3, return_rewind);
update(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() {
cell return_rewind = to_cell(ctx->pop());
tagged<word> w(ctx->pop());
-
- w.untag_check(this);
+ check_tagged(w);
cell func = callbacks->add(w.value(), return_rewind)->entry_point();
CODE_TO_FUNCTION_POINTER_CALLBACK(this, func);
callbacks->allocator->free(stub);
}
-/* Allocates memory */
+// Allocates memory
void factor_vm::primitive_callback_room() {
allocator_room room = callbacks->allocator->as_allocator_room();
ctx->push(tag<byte_array>(byte_array_from_value(&room)));