vm: strip out call-counting profiler

[factor.git] / vm / words.cpp

diff --git a/vm/words.cpp b/vm/words.cpp
index 347076a52952827a067a8c159a50b4c2ac4286a3..735a92eacfce153d067a993e57d409493ea8c532 100644 (file)
--- a/vm/words.cpp
+++ b/vm/words.cpp
@@ -9,8 +9,13 @@ void factor_vm::jit_compile_word(cell word_, cell def_, bool relocating)
        data_root<word> word(word_,this);
        data_root<quotation> def(def_,this);
 
+       /* Refuse to compile this word more than once, because quot_compiled_p()
+       depends on the identity of its code block */
+       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);
@@ -30,11 +35,8 @@ void factor_vm::compile_all_words()
        {
                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_xt(word.untagged());
-
        }
 }
 
@@ -50,22 +52,12 @@ word *factor_vm::allot_word(cell name_, cell vocab_, cell hashcode_)
        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_xt(new_word.untagged());
 
        return new_word.untagged();
 }
@@ -73,49 +65,33 @@ word *factor_vm::allot_word(cell name_, cell vocab_, cell hashcode_)
 /* (word) ( name vocabulary hashcode -- word ) */
 void factor_vm::primitive_word()
 {
-       cell hashcode = dpop();
-       cell vocab = dpop();
-       cell name = dpop();
-       dpush(tag<word>(allot_word(name,vocab,hashcode)));
+       cell hashcode = ctx->pop();
+       cell vocab = ctx->pop();
+       cell name = ctx->pop();
+       ctx->push(tag<word>(allot_word(name,vocab,hashcode)));
 }
 
-/* word-xt ( word -- start end ) */
-void factor_vm::primitive_word_xt()
+/* word-code ( word -- start end ) */
+void factor_vm::primitive_word_code()
 {
-       data_root<word> w(dpop(),this);
+       data_root<word> w(ctx->pop(),this);
        w.untag_check(this);
 
-       if(profiling_p)
-       {
-               dpush(allot_cell((cell)w->profiling->xt()));
-               dpush(allot_cell((cell)w->profiling + w->profiling->size()));
-       }
-       else
-       {
-               dpush(allot_cell((cell)w->code->xt()));
-               dpush(allot_cell((cell)w->code + w->code->size()));
-       }
-}
-
-void factor_vm::update_word_xt(word *w)
-{
-       if(profiling_p && w->profiling)
-               w->xt = w->profiling->xt();
-       else
-               w->xt = w->code->xt();
+       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>(dpeek());
-       drepl(tag_boolean(w->code->optimized_p()));
+       word *w = untag_check<word>(ctx->peek());
+       ctx->replace(tag_boolean(w->code()->optimized_p()));
 }
 
 void factor_vm::primitive_wrapper()
 {
        wrapper *new_wrapper = allot<wrapper>(sizeof(wrapper));
-       new_wrapper->object = dpeek();
-       drepl(tag<wrapper>(new_wrapper));
+       new_wrapper->object = ctx->peek();
+       ctx->replace(tag<wrapper>(new_wrapper));
 }
 
 }