diff options
author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-06-19 12:19:10 +0000 |
---|---|---|
committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-06-19 12:19:10 +0000 |
commit | e82f5f7ddb19811c40af9d7214a338c954b03fa7 (patch) | |
tree | 5c4705794fdf1dbce6c49aebf847ae1488d6e743 | |
parent | 28945ea146a89828f8a568440ab01964928ece8b (diff) | |
download | ruby-e82f5f7ddb19811c40af9d7214a338c954b03fa7.tar.gz |
* bignum.c (rb_uint2big): Consider environments BDIGIT is bigger than
long.
(big2ulong): Ditto.
(rb_big_aref): Ditto.
(rb_big_pack): Just call rb_integer_pack.
(rb_big_unpack): Just call rb_integer_unpack.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@41430 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 9 | ||||
-rw-r--r-- | bignum.c | 41 |
2 files changed, 42 insertions, 8 deletions
@@ -1,3 +1,12 @@ +Wed Jun 19 21:02:13 2013 Tanaka Akira <akr@fsij.org> + + * bignum.c (rb_uint2big): Consider environments BDIGIT is bigger than + long. + (big2ulong): Ditto. + (rb_big_aref): Ditto. + (rb_big_pack): Just call rb_integer_pack. + (rb_big_unpack): Just call rb_integer_unpack. + Wed Jun 19 20:51:21 2013 Kazuhiro NISHIYAMA <zn@mbf.nifty.com> * gc.c (gc_stress_get): GC.stress can be Fixnum. @@ -332,19 +332,25 @@ rb_big_norm(VALUE x) VALUE rb_uint2big(VALUE n) { - BDIGIT_DBL num = n; long i = 0; BDIGIT *digits; VALUE big; - big = bignew(DIGSPERLONG, 1); +#if SIZEOF_BDIGITS >= SIZEOF_VALUE + big = bignew(1, 1); digits = BDIGITS(big); - while (i < DIGSPERLONG) { + digits[0] = n; +#else + BDIGIT_DBL num = n; + big = bignew(bdigit_roomof(SIZEOF_VALUE), 1); + digits = BDIGITS(big); + while (i < bdigit_roomof(SIZEOF_VALUE)) { digits[i++] = BIGLO(num); num = BIGDN(num); } +#endif - i = DIGSPERLONG; + i = bdigit_roomof(SIZEOF_VALUE);; while (--i && !digits[i]) ; RBIGNUM_SET_LEN(big, i+1); return big; @@ -385,6 +391,7 @@ rb_int2inum(SIGNED_VALUE n) return rb_int2big(n); } +#if 0 #if SIZEOF_LONG % SIZEOF_BDIGITS != 0 # error unexpected SIZEOF_LONG : SIZEOF_BDIGITS ratio #endif @@ -410,6 +417,7 @@ rb_int2inum(SIGNED_VALUE n) * If given size of buf (num_longs) is not enough to represent val, * higher words (including a sign bit) are ignored. */ + void rb_big_pack(VALUE val, unsigned long *buf, long num_longs) { @@ -493,6 +501,23 @@ rb_big_unpack(unsigned long *buf, long num_longs) return bignorm(big); } } +#endif + +void +rb_big_pack(VALUE val, unsigned long *buf, long num_longs) +{ + rb_integer_pack(val, buf, num_longs, sizeof(long), 0, + INTEGER_PACK_LSWORD_FIRST|INTEGER_PACK_NATIVE_BYTE_ORDER| + INTEGER_PACK_2COMP); +} + +VALUE +rb_big_unpack(unsigned long *buf, long num_longs) +{ + return rb_integer_unpack(buf, num_longs, sizeof(long), 0, + INTEGER_PACK_LSWORD_FIRST|INTEGER_PACK_NATIVE_BYTE_ORDER| + INTEGER_PACK_2COMP); +} /* number of bytes of abs(val). additionaly number of leading zeros can be returned. */ @@ -2228,10 +2253,10 @@ big2ulong(VALUE x, const char *type, int check) BDIGIT_DBL num; BDIGIT *ds; - if (len > DIGSPERLONG) { + if (rb_absint_size(x, NULL) > sizeof(long)) { if (check) rb_raise(rb_eRangeError, "bignum too big to convert into `%s'", type); - len = DIGSPERLONG; + len = sizeof(long)/SIZEOF_BDIGITS; } ds = BDIGITS(x); num = 0; @@ -2239,7 +2264,7 @@ big2ulong(VALUE x, const char *type, int check) num = BIGUP(num); num += ds[len]; } - return (VALUE)num; + return (VALUE)(unsigned long)num; } VALUE @@ -4861,7 +4886,7 @@ rb_big_aref(VALUE x, VALUE y) if (!RBIGNUM_SIGN(y)) return INT2FIX(0); bigtrunc(y); - if (RBIGNUM_LEN(y) > DIGSPERLONG) { + if (rb_absint_size(y, NULL) > sizeof(long)) { out_of_range: return RBIGNUM_SIGN(x) ? INT2FIX(0) : INT2FIX(1); } |