#include "master.hpp"
-/* push a new tuple on the stack */
-F_TUPLE *allot_tuple(CELL layout_)
-{
- gc_root<F_TUPLE_LAYOUT> layout(layout_);
- gc_root<F_TUPLE> tuple(allot<F_TUPLE>(tuple_size(layout.untagged())));
- tuple->layout = layout.value();
- return tuple.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();
+
+ memset_cell(t->data(), false_object,
+ tuple_size(layout.untagged()) - sizeof(cell));
+
+ ctx->push(t.value());
}
-PRIMITIVE(tuple)
-{
- gc_root<F_TUPLE_LAYOUT> layout(dpop());
- F_TUPLE *tuple = allot_tuple(layout.value());
- F_FIXNUM i;
- for(i = tuple_size(layout.untagged()) - 1; i >= 0; i--)
- tuple->data()[i] = F;
+// 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;
- dpush(tag<F_TUPLE>(tuple));
+ ctx->push(t.value());
}
-/* push a new tuple on the stack, filling its slots from the stack */
-PRIMITIVE(tuple_boa)
-{
- gc_root<F_TUPLE_LAYOUT> layout(dpop());
- gc_root<F_TUPLE> tuple(allot_tuple(layout.value()));
- CELL size = untag_fixnum(layout.untagged()->size) * CELLS;
- memcpy(tuple->data(),(CELL *)(ds - (size - CELLS)),size);
- ds -= size;
- dpush(tuple.value());
}