moved words functions to vm

diff --git a/vm/vm.hpp b/vm/vm.hpp
index 5ddfd5cd4a740bc8b9dade4f6c749cbd049d32b4..c1dc417f83fbd0c6e04d012acb94dcc3731aff64 100644 (file)
--- a/vm/vm.hpp
+++ b/vm/vm.hpp
@@ -236,6 +236,14 @@ struct factorvm {
        tuple *allot_tuple(cell layout_);
        inline void vmprim_tuple();
        inline void vmprim_tuple_boa();
+
+       //words
+       word *allot_word(cell vocab_, cell name_);
+       inline void vmprim_word();
+       inline void vmprim_word_xt();
+       void update_word_xt(cell w_);
+       inline void vmprim_optimized_p();
+       inline void vmprim_wrapper();
        // next method here:
 
 

diff --git a/vm/words.cpp b/vm/words.cpp
index fa090c9ceaa6db19e881c4049edbb596f11cd94b..644db4689665b04cf6bb15b8406bcd20cb92640d 100644 (file)
--- a/vm/words.cpp
+++ b/vm/words.cpp
@@ -3,7 +3,7 @@
 namespace factor
 {
 
-word *allot_word(cell vocab_, cell name_)
+word *factorvm::allot_word(cell vocab_, cell name_)
 {
        gc_root<object> vocab(vocab_);
        gc_root<object> name(name_);
@@ -31,16 +31,26 @@ word *allot_word(cell vocab_, cell name_)
        return new_word.untagged();
 }
 
+word *allot_word(cell vocab_, cell name_)
+{
+       return vm->allot_word(vocab_,name_);
+}
+
 /* <word> ( name vocabulary -- word ) */
-PRIMITIVE(word)
+inline void factorvm::vmprim_word()
 {
        cell vocab = dpop();
        cell name = dpop();
        dpush(tag<word>(allot_word(vocab,name)));
 }
 
+PRIMITIVE(word)
+{
+       PRIMITIVE_GETVM()->vmprim_word();
+}
+
 /* word-xt ( word -- start end ) */
-PRIMITIVE(word_xt)
+inline void factorvm::vmprim_word_xt()
 {
        word *w = untag_check<word>(dpop());
        code_block *code = (profiling_p ? w->profiling : w->code);
@@ -48,8 +58,13 @@ PRIMITIVE(word_xt)
        dpush(allot_cell((cell)code + code->size));
 }
 
+PRIMITIVE(word_xt)
+{
+       PRIMITIVE_GETVM()->vmprim_word_xt();
+}
+
 /* Allocates memory */
-void update_word_xt(cell w_)
+void factorvm::update_word_xt(cell w_)
 {
        gc_root<word> w(w_);
 
@@ -64,16 +79,31 @@ void update_word_xt(cell w_)
                w->xt = w->code->xt();
 }
 
-PRIMITIVE(optimized_p)
+void update_word_xt(cell w_)
+{
+       return vm->update_word_xt(w_);
+}
+
+inline void factorvm::vmprim_optimized_p()
 {
        drepl(tag_boolean(word_optimized_p(untag_check<word>(dpeek()))));
 }
 
-PRIMITIVE(wrapper)
+PRIMITIVE(optimized_p)
+{
+       PRIMITIVE_GETVM()->vmprim_optimized_p();
+}
+
+inline void factorvm::vmprim_wrapper()
 {
        wrapper *new_wrapper = allot<wrapper>(sizeof(wrapper));
        new_wrapper->object = dpeek();
        drepl(tag<wrapper>(new_wrapper));
 }
 
+PRIMITIVE(wrapper)
+{
+       PRIMITIVE_GETVM()->vmprim_wrapper();
+}
+
 }