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

moved generic_arrays inline functions to vm.hpp

db4
Phil Dawes 2009-08-17 21:37:11 +01:00
parent 4dabd186c9
commit 2e129dfc45
3 changed files with 50 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
vm/generic_arrays.hpp
View File

@ -19,51 +19,4 @@ template <typename T> cell array_size(T *array)
return array_size<T>(array_capacity(array));
}
template <typename T> T *factorvm::allot_array_internal(cell capacity)
{
T *array = allot<T>(array_size<T>(capacity));
array->capacity = tag_fixnum(capacity);
return array;
}
template <typename T> T *allot_array_internal(cell capacity)
{
return vm->allot_array_internal<T>(capacity);
}
template <typename T> bool factorvm::reallot_array_in_place_p(T *array, cell capacity)
{
return in_zone(&nursery,array) && capacity <= array_capacity(array);
}
template <typename T> bool reallot_array_in_place_p(T *array, cell capacity)
{
return vm->reallot_array_in_place_p<T>(array,capacity);
}
template <typename TYPE> TYPE *factorvm::reallot_array(TYPE *array_, cell capacity)
{
gc_root<TYPE> array(array_,this);
if(reallot_array_in_place_p(array.untagged(),capacity))
{
array->capacity = tag_fixnum(capacity);
return array.untagged();
}
else
{
cell to_copy = array_capacity(array.untagged());
if(capacity < to_copy)
to_copy = capacity;
TYPE *new_array = allot_array_internal<TYPE>(capacity);
memcpy(new_array + 1,array.untagged() + 1,to_copy * TYPE::element_size);
memset((char *)(new_array + 1) + to_copy * TYPE::element_size,
0,(capacity - to_copy) * TYPE::element_size);
return new_array;
}
}
}

2
vm/master.hpp
View File

@ -51,8 +51,8 @@
#include "write_barrier.hpp"
#include "data_gc.hpp"
#include "local_roots.hpp"
#include "vm.hpp"
#include "generic_arrays.hpp"
#include "vm.hpp"
#include "debug.hpp"
#include "arrays.hpp"
#include "strings.hpp"

49
vm/vm.hpp
View File

@ -853,6 +853,55 @@ struct gc_bignum
};
#define GC_BIGNUM(x,vm) gc_bignum x##__gc_root(&x,vm)
//generic_arrays.hpp
template <typename T> T *factorvm::allot_array_internal(cell capacity)
{
T *array = allot<T>(array_size<T>(capacity));
array->capacity = tag_fixnum(capacity);
return array;
}
template <typename T> T *allot_array_internal(cell capacity)
{
return vm->allot_array_internal<T>(capacity);
}
template <typename T> bool factorvm::reallot_array_in_place_p(T *array, cell capacity)
{
return in_zone(&nursery,array) && capacity <= array_capacity(array);
}
template <typename T> bool reallot_array_in_place_p(T *array, cell capacity)
{
return vm->reallot_array_in_place_p<T>(array,capacity);
}
template <typename TYPE> TYPE *factorvm::reallot_array(TYPE *array_, cell capacity)
{
gc_root<TYPE> array(array_,this);
if(reallot_array_in_place_p(array.untagged(),capacity))
{
array->capacity = tag_fixnum(capacity);
return array.untagged();
}
else
{
cell to_copy = array_capacity(array.untagged());
if(capacity < to_copy)
to_copy = capacity;
TYPE *new_array = allot_array_internal<TYPE>(capacity);
memcpy(new_array + 1,array.untagged() + 1,to_copy * TYPE::element_size);
memset((char *)(new_array + 1) + to_copy * TYPE::element_size,
0,(capacity - to_copy) * TYPE::element_size);
return new_array;
}
}
// next method here: