#include "master.hpp"
-namespace factor
-{
-
-/* push a new tuple on the stack */
-tuple *factor_vm::allot_tuple(cell layout_)
-{
- gc_root<tuple_layout> layout(layout_,this);
- gc_root<tuple> t(allot<tuple>(tuple_size(layout.untagged())),this);
- t->layout = layout.value();
- return t.untagged();
-}
+namespace factor {
+
+// push a new tuple on the stack, filling its slots with f
+// Allocates memory
+void factor_vm::primitive_tuple() {
+ data_root<tuple_layout> layout(ctx->pop(), this);
+ tagged<tuple> t(allot<tuple>(tuple_size(layout.untagged())));
+ t->layout = layout.value();
-void factor_vm::primitive_tuple()
-{
- gc_root<tuple_layout> layout(dpop(),this);
- tuple *t = allot_tuple(layout.value());
- fixnum i;
- for(i = tuple_size(layout.untagged()) - 1; i >= 0; i--)
- t->data()[i] = false_object;
+ memset_cell(t->data(), false_object,
+ tuple_size(layout.untagged()) - sizeof(cell));
- dpush(tag<tuple>(t));
+ ctx->push(t.value());
}
-/* push a new tuple on the stack, filling its slots from the stack */
-void factor_vm::primitive_tuple_boa()
-{
- gc_root<tuple_layout> layout(dpop(),this);
- gc_root<tuple> t(allot_tuple(layout.value()),this);
- cell size = untag_fixnum(layout.untagged()->size) * sizeof(cell);
- memcpy(t->data(),(cell *)(ds - (size - sizeof(cell))),size);
- ds -= size;
- dpush(t.value());
+// push a new tuple on the stack, filling its slots from the stack
+// Allocates memory
+void factor_vm::primitive_tuple_boa() {
+ data_root<tuple_layout> layout(ctx->pop(), this);
+ tagged<tuple> t(allot<tuple>(tuple_size(layout.untagged())));
+ t->layout = layout.value();
+
+ cell size = untag_fixnum(layout.untagged()->size) * sizeof(cell);
+ memcpy(t->data(), (cell*)(ctx->datastack - size + sizeof(cell)), size);
+ ctx->datastack -= size;
+
+ ctx->push(t.value());
}
}