/* Refuse to compile this word more than once, because quot_compiled_p()
depends on the identity of its code block */
- if(word->code && word.value() == special_objects[LAZY_JIT_COMPILE_WORD])
+ if(word->entry_point && word.value() == special_objects[LAZY_JIT_COMPILE_WORD])
return;
code_block *compiled = jit_compile_quot(word.value(),def.value(),relocating);
- word->code = compiled;
+ word->entry_point = compiled->entry_point();
if(to_boolean(word->pic_def)) jit_compile_quot(word->pic_def,relocating);
if(to_boolean(word->pic_tail_def)) jit_compile_quot(word->pic_tail_def,relocating);
{
data_root<word> word(array_nth(words.untagged(),i),this);
- if(!word->code || !word->code->optimized_p())
+ if(!word->entry_point || !word->code()->optimized_p())
jit_compile_word(word.value(),word->def,false);
-
- update_word_entry_point(word.untagged());
}
}
new_word->name = name.value();
new_word->def = special_objects[OBJ_UNDEFINED];
new_word->props = false_object;
- new_word->counter = tag_fixnum(0);
new_word->pic_def = false_object;
new_word->pic_tail_def = false_object;
new_word->subprimitive = false_object;
- new_word->profiling = NULL;
- new_word->code = NULL;
+ new_word->entry_point = NULL;
jit_compile_word(new_word.value(),new_word->def,true);
- if(profiling_p)
- {
- code_block *profiling_block = compile_profiling_stub(new_word.value());
- new_word->profiling = profiling_block;
- initialize_code_block(new_word->profiling);
- }
-
- update_word_entry_point(new_word.untagged());
return new_word.untagged();
}
data_root<word> w(ctx->pop(),this);
w.untag_check(this);
- if(profiling_p)
- {
- ctx->push(allot_cell((cell)w->profiling->entry_point()));
- ctx->push(allot_cell((cell)w->profiling + w->profiling->size()));
- }
- else
- {
- ctx->push(allot_cell((cell)w->code->entry_point()));
- ctx->push(allot_cell((cell)w->code + w->code->size()));
- }
-}
-
-void factor_vm::update_word_entry_point(word *w)
-{
- if(profiling_p && w->profiling)
- w->entry_point = w->profiling->entry_point();
- else
- w->entry_point = w->code->entry_point();
+ ctx->push(from_unsigned_cell((cell)w->entry_point));
+ ctx->push(from_unsigned_cell((cell)w->code() + w->code()->size()));
}
void factor_vm::primitive_optimized_p()
{
word *w = untag_check<word>(ctx->peek());
- ctx->replace(tag_boolean(w->code->optimized_p()));
+ ctx->replace(tag_boolean(w->code()->optimized_p()));
}
void factor_vm::primitive_wrapper()