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

VM: Refactor data_roots.hpp to Factor style

db4
Erik Charlebois 2013-05-11 21:56:42 -04:00
parent 75e6c88534
commit 7a05bf1993
1 changed files with 35 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
vm/data_roots.hpp
View File

@ -1,34 +1,32 @@
namespace factor namespace factor {
{
template<typename Type> template <typename Type> struct data_root : public tagged<Type> {
struct data_root : public tagged<Type> {
factor_vm* parent; factor_vm* parent;
void push() void push() {
{
parent->data_roots.push_back(data_root_range(&this->value_, 1)); parent->data_roots.push_back(data_root_range(&this->value_, 1));
} }
explicit data_root(cell value_, factor_vm* parent_) explicit data_root(cell value_, factor_vm* parent_)
: tagged<Type>(value_), parent(parent_) : tagged<Type>(value_), parent(parent_) {
{
push(); push();
} }
explicit data_root(Type *value_, factor_vm *parent_) : explicit data_root(Type* value_, factor_vm* parent_)
tagged<Type>(value_), parent(parent_) : tagged<Type>(value_), parent(parent_) {
{
push(); push();
} }
const data_root<Type>& operator=(const Type *x) { tagged<Type>::operator=(x); return *this; } const data_root<Type>& operator=(const Type* x) {
const data_root<Type>& operator=(const cell &x) { tagged<Type>::operator=(x); return *this; } tagged<Type>::operator=(x);
return *this;
~data_root()
{
parent->data_roots.pop_back();
} }
const data_root<Type>& operator=(const cell& x) {
tagged<Type>::operator=(x);
return *this;
}
~data_root() { parent->data_roots.pop_back(); }
}; };
/* A similar hack for the bignum implementation */ /* A similar hack for the bignum implementation */
@ -36,14 +34,13 @@ struct gc_bignum {
bignum** addr; bignum** addr;
factor_vm* parent; factor_vm* parent;
gc_bignum(bignum **addr_, factor_vm *parent_) : addr(addr_), parent(parent_) gc_bignum(bignum** addr_, factor_vm* parent_) : addr(addr_), parent(parent_) {
{ if (*addr_)
if(*addr_) parent->check_data_pointer(*addr_); parent->check_data_pointer(*addr_);
parent->bignum_roots.push_back((cell) addr); parent->bignum_roots.push_back((cell) addr);
} }
~gc_bignum() ~gc_bignum() {
{
#ifdef FACTOR_DEBUG #ifdef FACTOR_DEBUG
FACTOR_ASSERT(parent->bignum_roots.back() == (cell) addr); FACTOR_ASSERT(parent->bignum_roots.back() == (cell) addr);
#endif #endif