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

moved global state from math into vm

db4
Phil Dawes 2009-08-17 21:37:13 +01:00
parent 839491a828
commit efa974f025
6 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vm/bignum.cpp
View File

@ -371,7 +371,7 @@ bignum *bignum_remainder(bignum * numerator, bignum * denominator)
} }
#define FOO_TO_BIGNUM(name,type,utype) \ #define FOO_TO_BIGNUM(name,type,utype) \
bignum * name##_to_bignum(type n) \ bignum * factorvm::name##_to_bignum(type n) \
{ \ { \
int negative_p; \ int negative_p; \
bignum_digit_type result_digits [BIGNUM_DIGITS_FOR(type)]; \ bignum_digit_type result_digits [BIGNUM_DIGITS_FOR(type)]; \

4
vm/bignum.hpp
View File

@ -55,10 +55,6 @@ bignum_divide(bignum * numerator, bignum * denominator,
bignum * * quotient, bignum * * remainder); bignum * * quotient, bignum * * remainder);
bignum * bignum_quotient(bignum *, bignum *); bignum * bignum_quotient(bignum *, bignum *);
bignum * bignum_remainder(bignum *, bignum *); bignum * bignum_remainder(bignum *, bignum *);
bignum * fixnum_to_bignum(fixnum);
bignum * cell_to_bignum(cell);
bignum * long_long_to_bignum(s64 n);
bignum * ulong_long_to_bignum(u64 n);
fixnum bignum_to_fixnum(bignum *); fixnum bignum_to_fixnum(bignum *);
cell bignum_to_cell(bignum *); cell bignum_to_cell(bignum *);
s64 bignum_to_long_long(bignum *); s64 bignum_to_long_long(bignum *);

1
vm/local_roots.hpp
View File

@ -1,4 +1,3 @@
namespace factor namespace factor
{ {
} }

4
vm/math.cpp
View File

@ -3,10 +3,6 @@
namespace factor namespace factor
{ {
cell bignum_zero;
cell bignum_pos_one;
cell bignum_neg_one;
inline void factorvm::vmprim_bignum_to_fixnum() inline void factorvm::vmprim_bignum_to_fixnum()
{ {
drepl(tag_fixnum(bignum_to_fixnum(untag<bignum>(dpeek())))); drepl(tag_fixnum(bignum_to_fixnum(untag<bignum>(dpeek()))));

4
vm/math.hpp
View File

@ -1,10 +1,6 @@
namespace factor namespace factor
{ {
extern cell bignum_zero;
extern cell bignum_pos_one;
extern cell bignum_neg_one;
static const fixnum fixnum_max = (((fixnum)1 << (WORD_SIZE - TAG_BITS - 1)) - 1); static const fixnum fixnum_max = (((fixnum)1 << (WORD_SIZE - TAG_BITS - 1)) - 1);
static const fixnum fixnum_min = (-((fixnum)1 << (WORD_SIZE - TAG_BITS - 1))); static const fixnum fixnum_min = (-((fixnum)1 << (WORD_SIZE - TAG_BITS - 1)));
static const fixnum array_size_max = ((cell)1 << (WORD_SIZE - TAG_BITS - 2)); static const fixnum array_size_max = ((cell)1 << (WORD_SIZE - TAG_BITS - 2));

10
vm/vm.hpp
View File

@ -243,6 +243,9 @@ struct factorvm {
inline void check_tagged_pointer(cell tagged); inline void check_tagged_pointer(cell tagged);
// local roots // local roots
/* If a runtime function needs to call another function which potentially
allocates memory, it must wrap any local variable references to Factor
objects in gc_root instances */
std::vector<cell> gc_locals; std::vector<cell> gc_locals;
std::vector<cell> gc_bignums; std::vector<cell> gc_bignums;
@ -329,10 +332,17 @@ struct factorvm {
inline void vmprim_wrapper(); inline void vmprim_wrapper();
//math //math
cell bignum_zero;
cell bignum_pos_one;
cell bignum_neg_one;
inline void vmprim_bignum_to_fixnum(); inline void vmprim_bignum_to_fixnum();
inline void vmprim_float_to_fixnum(); inline void vmprim_float_to_fixnum();
inline void vmprim_fixnum_divint(); inline void vmprim_fixnum_divint();
inline void vmprim_fixnum_divmod(); inline void vmprim_fixnum_divmod();
bignum *fixnum_to_bignum(fixnum);
bignum *cell_to_bignum(cell);
bignum *long_long_to_bignum(s64 n);
bignum *ulong_long_to_bignum(u64 n);
inline fixnum sign_mask(fixnum x); inline fixnum sign_mask(fixnum x);
inline fixnum branchless_max(fixnum x, fixnum y); inline fixnum branchless_max(fixnum x, fixnum y);
inline fixnum branchless_abs(fixnum x); inline fixnum branchless_abs(fixnum x);