Moved PRIMITIVE and PRIMITIVE_FORWARDs to primitives.[ch]pp

[factor.git] / vm / run.cpp

diff --git a/vm/run.cpp b/vm/run.cpp
index d2170f4055e776e435edafe4b93d27b16b957d51..59020b85e8188bfef78d834806d543f4827dde6e 100755 (executable)
--- a/vm/run.cpp
+++ b/vm/run.cpp
@@ -3,45 +3,35 @@
 namespace factor
 {
 
-inline void factor_vm::primitive_getenv()
+void factor_vm::primitive_getenv()
 {
        fixnum e = untag_fixnum(dpeek());
        drepl(userenv[e]);
 }
 
-PRIMITIVE_FORWARD(getenv)
-
-inline void factor_vm::primitive_setenv()
+void factor_vm::primitive_setenv()
 {
        fixnum e = untag_fixnum(dpop());
        cell value = dpop();
        userenv[e] = value;
 }
 
-PRIMITIVE_FORWARD(setenv)
-
-inline void factor_vm::primitive_exit()
+void factor_vm::primitive_exit()
 {
        exit(to_fixnum(dpop()));
 }
 
-PRIMITIVE_FORWARD(exit)
-
-inline void factor_vm::primitive_micros()
+void factor_vm::primitive_micros()
 {
        box_unsigned_8(current_micros());
 }
 
-PRIMITIVE_FORWARD(micros)
-
-inline void factor_vm::primitive_sleep()
+void factor_vm::primitive_sleep()
 {
        sleep_micros(to_cell(dpop()));
 }
 
-PRIMITIVE_FORWARD(sleep)
-
-inline void factor_vm::primitive_set_slot()
+void factor_vm::primitive_set_slot()
 {
        fixnum slot = untag_fixnum(dpop());
        object *obj = untag<object>(dpop());
@@ -51,9 +41,7 @@ inline void factor_vm::primitive_set_slot()
        write_barrier(obj);
 }
 
-PRIMITIVE_FORWARD(set_slot)
-
-inline void factor_vm::primitive_load_locals()
+void factor_vm::primitive_load_locals()
 {
        fixnum count = untag_fixnum(dpop());
        memcpy((cell *)(rs + sizeof(cell)),(cell *)(ds - sizeof(cell) * (count - 1)),sizeof(cell) * count);
@@ -61,8 +49,6 @@ inline void factor_vm::primitive_load_locals()
        rs += sizeof(cell) * count;
 }
 
-PRIMITIVE_FORWARD(load_locals)
-
 cell factor_vm::clone_object(cell obj_)
 {
        gc_root<object> obj(obj_,this);
@@ -78,11 +64,9 @@ cell factor_vm::clone_object(cell obj_)
        }
 }
 
-inline void factor_vm::primitive_clone()
+void factor_vm::primitive_clone()
 {
        drepl(clone_object(dpeek()));
 }
 
-PRIMITIVE_FORWARD(clone)
-
 }