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

moved arrays fns into vm

db4
Phil Dawes 2009-08-17 21:37:06 +01:00
parent 13e0ae6d97
commit 72098c5f6a
2 changed files with 44 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
vm/arrays.cpp
View File

@ -4,7 +4,7 @@ namespace factor
{ {
/* make a new array with an initial element */ /* make a new array with an initial element */
array *allot_array(cell capacity, cell fill_) array *factorvm::allot_array(cell capacity, cell fill_)
{ {
gc_root<object> fill(fill_); gc_root<object> fill(fill_);
gc_root<array> new_array(allot_array_internal<array>(capacity)); gc_root<array> new_array(allot_array_internal<array>(capacity));
@ -23,15 +23,25 @@ array *allot_array(cell capacity, cell fill_)
return new_array.untagged(); return new_array.untagged();
} }
array *allot_array(cell capacity, cell fill_)
{
return vm->allot_array(capacity,fill_);
}
/* push a new array on the stack */ /* push a new array on the stack */
PRIMITIVE(array) inline void factorvm::vmprim_array()
{ {
cell initial = dpop(); cell initial = dpop();
cell size = unbox_array_size(); cell size = unbox_array_size();
dpush(tag<array>(allot_array(size,initial))); dpush(tag<array>(allot_array(size,initial)));
} }
cell allot_array_1(cell obj_) PRIMITIVE(array)
{
PRIMITIVE_GETVM()->vmprim_array();
}
cell factorvm::allot_array_1(cell obj_)
{ {
gc_root<object> obj(obj_); gc_root<object> obj(obj_);
gc_root<array> a(allot_array_internal<array>(1)); gc_root<array> a(allot_array_internal<array>(1));
@ -39,7 +49,12 @@ cell allot_array_1(cell obj_)
return a.value(); return a.value();
} }
cell allot_array_2(cell v1_, cell v2_) cell allot_array_1(cell obj_)
{
return vm->allot_array_1(obj_);
}
cell factorvm::allot_array_2(cell v1_, cell v2_)
{ {
gc_root<object> v1(v1_); gc_root<object> v1(v1_);
gc_root<object> v2(v2_); gc_root<object> v2(v2_);
@ -49,7 +64,12 @@ cell allot_array_2(cell v1_, cell v2_)
return a.value(); return a.value();
} }
cell allot_array_4(cell v1_, cell v2_, cell v3_, cell v4_) cell allot_array_2(cell v1_, cell v2_)
{
return vm->allot_array_2(v1_,v2_);
}
cell factorvm::allot_array_4(cell v1_, cell v2_, cell v3_, cell v4_)
{ {
gc_root<object> v1(v1_); gc_root<object> v1(v1_);
gc_root<object> v2(v2_); gc_root<object> v2(v2_);
@ -63,13 +83,23 @@ cell allot_array_4(cell v1_, cell v2_, cell v3_, cell v4_)
return a.value(); return a.value();
} }
PRIMITIVE(resize_array) cell allot_array_4(cell v1_, cell v2_, cell v3_, cell v4_)
{
return vm->allot_array_4(v1_,v2_,v3_,v4_);
}
inline void factorvm::vmprim_resize_array()
{ {
array* a = untag_check<array>(dpop()); array* a = untag_check<array>(dpop());
cell capacity = unbox_array_size(); cell capacity = unbox_array_size();
dpush(tag<array>(reallot_array(a,capacity))); dpush(tag<array>(reallot_array(a,capacity)));
} }
PRIMITIVE(resize_array)
{
PRIMITIVE_GETVM()->vmprim_resize_array();
}
void growable_array::add(cell elt_) void growable_array::add(cell elt_)
{ {
gc_root<object> elt(elt_); gc_root<object> elt(elt_);

8
vm/vm.hpp
View File

@ -197,6 +197,14 @@ struct factorvm {
void dump_code_heap(); void dump_code_heap();
void factorbug(); void factorbug();
inline void vmprim_die(); inline void vmprim_die();
//arrays
array *allot_array(cell capacity, cell fill_);
inline void vmprim_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_);
inline void vmprim_resize_array();
// next method here: // next method here: