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

bignum.cpp: Fix calls to reallot_array() -- bignums can get new addresses if they are not in the nursery or are somehow larger. Fix a couple more correctness issues.

db4
Doug Coleman 2012-08-14 23:44:43 -07:00
parent 91d8326b77
commit 47b4ebc80d
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
vm/bignum.cpp
View File

@ -1296,6 +1296,7 @@ bignum * factor_vm::allot_bignum_zeroed(bignum_length_type length, int negative_
return (result); return (result);
} }
/* can allocate if not in nursery or size is larger */
#define BIGNUM_REDUCE_LENGTH(source, length) \ #define BIGNUM_REDUCE_LENGTH(source, length) \
source = reallot_array(source,length + 1) source = reallot_array(source,length + 1)
@ -1306,6 +1307,7 @@ bignum *factor_vm::bignum_shorten_length(bignum * bignum, bignum_length_type len
BIGNUM_ASSERT ((length >= 0) || (length <= current_length)); BIGNUM_ASSERT ((length >= 0) || (length <= current_length));
if (length < current_length) if (length < current_length)
{ {
GC_BIGNUM(bignum);
BIGNUM_REDUCE_LENGTH (bignum, length); BIGNUM_REDUCE_LENGTH (bignum, length);
BIGNUM_SET_NEGATIVE_P (bignum, (length != 0) && (BIGNUM_NEGATIVE_P (bignum))); BIGNUM_SET_NEGATIVE_P (bignum, (length != 0) && (BIGNUM_NEGATIVE_P (bignum)));
} }
@ -1323,6 +1325,7 @@ bignum *factor_vm::bignum_trim(bignum * bignum)
scan += 1; scan += 1;
if (scan < end) if (scan < end)
{ {
GC_BIGNUM(bignum);
bignum_length_type length = (scan - start); bignum_length_type length = (scan - start);
BIGNUM_REDUCE_LENGTH (bignum, length); BIGNUM_REDUCE_LENGTH (bignum, length);
BIGNUM_SET_NEGATIVE_P (bignum, (length != 0) && (BIGNUM_NEGATIVE_P (bignum))); BIGNUM_SET_NEGATIVE_P (bignum, (length != 0) && (BIGNUM_NEGATIVE_P (bignum)));
@ -1349,6 +1352,7 @@ bignum *factor_vm::bignum_maybe_new_sign(bignum * x, int negative_p)
return (x); return (x);
else else
{ {
GC_BIGNUM(x);
bignum * result = bignum * result =
(allot_bignum ((BIGNUM_LENGTH (x)), negative_p)); (allot_bignum ((BIGNUM_LENGTH (x)), negative_p));
bignum_destructive_copy (x, result); bignum_destructive_copy (x, result);