factor::flush_icache(seg->start,seg->size);
}
-/* Allocate a code heap during startup */
-void factor_vm::init_code_heap(cell size)
+struct address_finder {
+ cell address;
+ code_block *found_code_block;
+
+ address_finder(cell address)
+ : address(address), found_code_block(NULL) {}
+
+ void operator()(code_block *block, cell size)
+ {
+ if ((cell)block->entry_point() <= address
+ && address - (cell)block->entry_point() < block->size())
+ {
+ assert(found_code_block == NULL);
+ found_code_block = block;
+ }
+ }
+};
+
+code_block *code_heap::code_block_for_address(cell address)
{
- code = new code_heap(size);
+ address_finder finder(address);
+ allocator->iterate(finder);
+ return finder.found_code_block;
}
-bool factor_vm::in_code_heap_p(cell ptr)
+/* Allocate a code heap during startup */
+void factor_vm::init_code_heap(cell size)
{
- return (ptr >= code->seg->start && ptr <= code->seg->end);
+ code = new code_heap(size);
}
struct word_updater {
parameters,
literals);
- word->code = compiled;
+ word->entry_point = compiled->entry_point();
}
break;
default:
critical_error("Expected a quotation or an array",data.value());
break;
}
-
- update_word_entry_point(word.untagged());
}
if(update_existing_words)