steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

VM: allot_array_1, allot_array_2 are unused and primitive_array should use allot_array

db4
Björn Lindqvist 2014-05-29 19:22:43 +02:00
parent 03672ad938
commit 877e3a12e1
2 changed files with 2 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
vm/arrays.cpp
View File

@ -12,31 +12,12 @@ array* factor_vm::allot_array(cell capacity, cell fill_) {
/* Allocates memory */ /* Allocates memory */
void factor_vm::primitive_array() { void factor_vm::primitive_array() {
data_root<object> fill(ctx->pop(), this); cell fill = ctx->pop();
cell capacity = unbox_array_size(); cell capacity = unbox_array_size();
array* new_array = allot_uninitialized_array<array>(capacity); array* new_array = allot_array(capacity, fill);
memset_cell(new_array->data(), fill.value(), capacity * sizeof(cell));
ctx->push(tag<array>(new_array)); ctx->push(tag<array>(new_array));
} }
/* Allocates memory */
cell factor_vm::allot_array_1(cell obj_) {
data_root<object> obj(obj_, this);
data_root<array> a(allot_uninitialized_array<array>(1), this);
set_array_nth(a.untagged(), 0, obj.value());
return a.value();
}
/* Allocates memory */
cell factor_vm::allot_array_2(cell v1_, cell v2_) {
data_root<object> v1(v1_, this);
data_root<object> v2(v2_, this);
data_root<array> a(allot_uninitialized_array<array>(2), this);
set_array_nth(a.untagged(), 0, v1.value());
set_array_nth(a.untagged(), 1, v2.value());
return a.value();
}
/* Allocates memory */ /* Allocates memory */
cell factor_vm::allot_array_4(cell v1_, cell v2_, cell v3_, cell v4_) { cell factor_vm::allot_array_4(cell v1_, cell v2_, cell v3_, cell v4_) {
data_root<object> v1(v1_, this); data_root<object> v1(v1_, this);

2
vm/vm.hpp
View File

@ -429,8 +429,6 @@ struct factor_vm {
inline void set_array_nth(array* array, cell slot, cell value); inline void set_array_nth(array* array, cell slot, cell value);
array* allot_array(cell capacity, cell fill_); array* allot_array(cell capacity, cell fill_);
void primitive_array(); void primitive_array();
cell allot_array_1(cell obj_);
cell allot_array_2(cell v1_, cell v2_);
cell allot_array_4(cell v1_, cell v2_, cell v3_, cell v4_); cell allot_array_4(cell v1_, cell v2_, cell v3_, cell v4_);
void primitive_resize_array(); void primitive_resize_array();
cell std_vector_to_array(std::vector<cell>& elements); cell std_vector_to_array(std::vector<cell>& elements);