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

quiet some data conversions warnings raised by msvc

db4
Joe Groff 2010-05-05 22:22:13 -07:00
parent fb619ec928
commit 11deca47b4
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
vm/bignum.cpp
View File

@ -330,7 +330,7 @@ bignum *factor_vm::bignum_remainder(bignum * numerator, bignum * denominator)
} }
/* allocates memory */ /* allocates memory */
#define FOO_TO_BIGNUM(name,type,utype) \ #define FOO_TO_BIGNUM(name,type,stype,utype) \
bignum * factor_vm::name##_to_bignum(type n) \ bignum * factor_vm::name##_to_bignum(type n) \
{ \ { \
int negative_p; \ int negative_p; \
@ -341,7 +341,7 @@ bignum * factor_vm::name##_to_bignum(type n) \
if (n == 1) return (BIGNUM_ONE (0)); \ if (n == 1) return (BIGNUM_ONE (0)); \
if (n < (type)0 && n == (type)-1) return (BIGNUM_ONE (1)); \ if (n < (type)0 && n == (type)-1) return (BIGNUM_ONE (1)); \
{ \ { \
utype accumulator = ((negative_p = (n < (type)0)) ? (-n) : n); \ utype accumulator = ((negative_p = (n < (type)0)) ? ((type)(-(stype)n)) : n); \
do \ do \
{ \ { \
(*end_digits++) = (accumulator & BIGNUM_DIGIT_MASK); \ (*end_digits++) = (accumulator & BIGNUM_DIGIT_MASK); \
@ -360,13 +360,13 @@ bignum * factor_vm::name##_to_bignum(type n) \
} \ } \
} }
FOO_TO_BIGNUM(cell,cell,cell) FOO_TO_BIGNUM(cell,cell,fixnum,cell)
FOO_TO_BIGNUM(fixnum,fixnum,cell) FOO_TO_BIGNUM(fixnum,fixnum,fixnum,cell)
FOO_TO_BIGNUM(long_long,s64,u64) FOO_TO_BIGNUM(long_long,s64,s64,u64)
FOO_TO_BIGNUM(ulong_long,u64,u64) FOO_TO_BIGNUM(ulong_long,u64,s64,u64)
/* cannot allocate memory */ /* cannot allocate memory */
#define BIGNUM_TO_FOO(name,type,utype) \ #define BIGNUM_TO_FOO(name,type,stype,utype) \
type factor_vm::bignum_to_##name(bignum * bignum) \ type factor_vm::bignum_to_##name(bignum * bignum) \
{ \ { \
if (BIGNUM_ZERO_P (bignum)) \ if (BIGNUM_ZERO_P (bignum)) \
@ -377,14 +377,14 @@ FOO_TO_BIGNUM(ulong_long,u64,u64)
bignum_digit_type * scan = (start + (BIGNUM_LENGTH (bignum))); \ bignum_digit_type * scan = (start + (BIGNUM_LENGTH (bignum))); \
while (start < scan) \ while (start < scan) \
accumulator = ((accumulator << BIGNUM_DIGIT_LENGTH) + (*--scan)); \ accumulator = ((accumulator << BIGNUM_DIGIT_LENGTH) + (*--scan)); \
return ((BIGNUM_NEGATIVE_P (bignum)) ? (-((type)accumulator)) : accumulator); \ return ((BIGNUM_NEGATIVE_P (bignum)) ? ((type)(-(stype)accumulator)) : accumulator); \
} \ } \
} }
BIGNUM_TO_FOO(cell,cell,cell); BIGNUM_TO_FOO(cell,cell,fixnum,cell);
BIGNUM_TO_FOO(fixnum,fixnum,cell); BIGNUM_TO_FOO(fixnum,fixnum,fixnum,cell);
BIGNUM_TO_FOO(long_long,s64,u64) BIGNUM_TO_FOO(long_long,s64,s64,u64)
BIGNUM_TO_FOO(ulong_long,u64,u64) BIGNUM_TO_FOO(ulong_long,u64,s64,u64)
double factor_vm::bignum_to_double(bignum * bignum) double factor_vm::bignum_to_double(bignum * bignum)
{ {

2
vm/factor.cpp
View File

@ -129,7 +129,7 @@ void factor_vm::init_factor(vm_parameters *p)
init_callbacks(p->callback_size); init_callbacks(p->callback_size);
load_image(p); load_image(p);
init_c_io(); init_c_io();
init_inline_caching(p->max_pic_size); init_inline_caching((int)p->max_pic_size);
if(p->signals) if(p->signals)
init_signals(); init_signals();