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

VM: Refactor bignum to Factor style

db4
Erik Charlebois 2013-05-11 21:44:20 -04:00
parent 6dacc44029
commit a80271c79c
3 changed files with 1491 additions and 1648 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3090
vm/bignum.cpp
View File

File diff suppressed because it is too large Load Diff

10
vm/bignum.hpp
View File

@ -1,7 +1,6 @@
namespace factor namespace factor {
{
/* /*
Copyright (C) 1989-1992 Massachusetts Institute of Technology Copyright (C) 1989-1992 Massachusetts Institute of Technology
Portions copyright (C) 2004-2009 Slava Pestov Portions copyright (C) 2004-2009 Slava Pestov
@ -35,10 +34,9 @@ Technology nor of any adaptation thereof in any advertising,
promotional, or sales literature without prior written consent from promotional, or sales literature without prior written consent from
MIT in each case. */ MIT in each case. */
#define BIGNUM_OUT_OF_BAND ((bignum *) 0) #define BIGNUM_OUT_OF_BAND ((bignum*)0)
enum bignum_comparison enum bignum_comparison {
{
bignum_comparison_equal = 0, bignum_comparison_equal = 0,
bignum_comparison_less = -1, bignum_comparison_less = -1,
bignum_comparison_greater = 1 bignum_comparison_greater = 1

39
vm/bignumint.hpp
View File

@ -33,8 +33,7 @@ Technology nor of any adaptation thereof in any advertising,
promotional, or sales literature without prior written consent from promotional, or sales literature without prior written consent from
MIT in each case. */ MIT in each case. */
namespace factor namespace factor {
{
/* Internal Interface to Bignum Code */ /* Internal Interface to Bignum Code */
#undef BIGNUM_ZERO_P #undef BIGNUM_ZERO_P
@ -57,55 +56,51 @@ typedef s64 bignum_twodigit_type;
#endif #endif
/* BIGNUM_TO_POINTER casts a bignum object to a digit array pointer. */ /* BIGNUM_TO_POINTER casts a bignum object to a digit array pointer. */
#define BIGNUM_TO_POINTER(bignum) ((bignum_digit_type *)(bignum + 1)) #define BIGNUM_TO_POINTER(bignum) ((bignum_digit_type*)(bignum + 1))
/* BIGNUM_EXCEPTION is invoked to handle assertion violations. */ /* BIGNUM_EXCEPTION is invoked to handle assertion violations. */
#define BIGNUM_EXCEPTION abort #define BIGNUM_EXCEPTION abort
#define BIGNUM_DIGIT_LENGTH (((sizeof (bignum_digit_type)) * CHAR_BIT) - 2) #define BIGNUM_DIGIT_LENGTH (((sizeof(bignum_digit_type)) * CHAR_BIT) - 2)
#define BIGNUM_HALF_DIGIT_LENGTH (BIGNUM_DIGIT_LENGTH / 2) #define BIGNUM_HALF_DIGIT_LENGTH (BIGNUM_DIGIT_LENGTH / 2)
#define BIGNUM_RADIX (bignum_digit_type)(((cell) 1) << BIGNUM_DIGIT_LENGTH) #define BIGNUM_RADIX (bignum_digit_type)(((cell) 1) << BIGNUM_DIGIT_LENGTH)
#define BIGNUM_RADIX_ROOT (((bignum_digit_type) 1) << BIGNUM_HALF_DIGIT_LENGTH) #define BIGNUM_RADIX_ROOT (((bignum_digit_type) 1) << BIGNUM_HALF_DIGIT_LENGTH)
#define BIGNUM_DIGIT_MASK (BIGNUM_RADIX - 1) #define BIGNUM_DIGIT_MASK (BIGNUM_RADIX - 1)
#define BIGNUM_HALF_DIGIT_MASK (BIGNUM_RADIX_ROOT - 1) #define BIGNUM_HALF_DIGIT_MASK (BIGNUM_RADIX_ROOT - 1)
#define BIGNUM_START_PTR(bignum) \ #define BIGNUM_START_PTR(bignum) ((BIGNUM_TO_POINTER(bignum)) + 1)
((BIGNUM_TO_POINTER (bignum)) + 1)
#define BIGNUM_LENGTH(bignum) (untag_fixnum((bignum)->capacity) - 1) #define BIGNUM_LENGTH(bignum) (untag_fixnum((bignum)->capacity) - 1)
#define BIGNUM_NEGATIVE_P(bignum) (bignum->data()[0] != 0) #define BIGNUM_NEGATIVE_P(bignum) (bignum->data()[0] != 0)
#define BIGNUM_SET_NEGATIVE_P(bignum,neg) (bignum->data()[0] = neg) #define BIGNUM_SET_NEGATIVE_P(bignum, neg) (bignum->data()[0] = neg)
#define BIGNUM_ZERO_P(bignum) \ #define BIGNUM_ZERO_P(bignum) ((BIGNUM_LENGTH(bignum)) == 0)
((BIGNUM_LENGTH (bignum)) == 0)
#define BIGNUM_REF(bignum, index) \ #define BIGNUM_REF(bignum, index) (*((BIGNUM_START_PTR(bignum)) + (index)))
(* ((BIGNUM_START_PTR (bignum)) + (index)))
/* These definitions are here to facilitate caching of the constants /* These definitions are here to facilitate caching of the constants
0, 1, and -1. */ 0, 1, and -1. */
#define BIGNUM_ZERO() untag<bignum>(bignum_zero) #define BIGNUM_ZERO() untag<bignum>(bignum_zero)
#define BIGNUM_ONE(neg_p) \ #define BIGNUM_ONE(neg_p) untag<bignum>(neg_p ? bignum_neg_one : bignum_pos_one)
untag<bignum>(neg_p ? bignum_neg_one : bignum_pos_one)
#define HD_LOW(digit) ((digit) & BIGNUM_HALF_DIGIT_MASK) #define HD_LOW(digit) ((digit) & BIGNUM_HALF_DIGIT_MASK)
#define HD_HIGH(digit) ((digit) >> BIGNUM_HALF_DIGIT_LENGTH) #define HD_HIGH(digit) ((digit) >> BIGNUM_HALF_DIGIT_LENGTH)
#define HD_CONS(high, low) (((high) << BIGNUM_HALF_DIGIT_LENGTH) | (low)) #define HD_CONS(high, low) (((high) << BIGNUM_HALF_DIGIT_LENGTH) | (low))
#define BIGNUM_BITS_TO_DIGITS(n) \ #define BIGNUM_BITS_TO_DIGITS(n) \
(((n) + (BIGNUM_DIGIT_LENGTH - 1)) / BIGNUM_DIGIT_LENGTH) (((n) + (BIGNUM_DIGIT_LENGTH - 1)) / BIGNUM_DIGIT_LENGTH)
#define BIGNUM_DIGITS_FOR(type) \ #define BIGNUM_DIGITS_FOR(type) \
(BIGNUM_BITS_TO_DIGITS ((sizeof (type)) * CHAR_BIT)) (BIGNUM_BITS_TO_DIGITS((sizeof(type)) * CHAR_BIT))
#ifndef BIGNUM_DISABLE_ASSERTION_CHECKS #ifndef BIGNUM_DISABLE_ASSERTION_CHECKS
#define BIGNUM_ASSERT(expression) \ #define BIGNUM_ASSERT(expression) \
{ \ { \
if (! (expression)) \ if (!(expression)) \
BIGNUM_EXCEPTION (); \ BIGNUM_EXCEPTION(); \
} }
#endif /* not BIGNUM_DISABLE_ASSERTION_CHECKS */ #endif /* not BIGNUM_DISABLE_ASSERTION_CHECKS */