* bignum.c (rb_big_pow): truncate all zero BDIGITs. [ruby-dev:30733]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12224 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2007-04-26 15:02:57 +00:00
parent 93bdc98f33
commit a379112975
2 changed files with 38 additions and 20 deletions

View File

@ -1,3 +1,7 @@
Fri Apr 27 00:03:48 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* bignum.c (rb_big_pow): truncate all zero BDIGITs. [ruby-dev:30733]
Thu Apr 26 17:31:00 2007 Nobuyoshi Nakada <nobu@ruby-lang.org> Thu Apr 26 17:31:00 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* bignum.c (rb_big_pow): reduce multiplying for even number. * bignum.c (rb_big_pow): reduce multiplying for even number.

View File

@ -90,34 +90,48 @@ rb_big_2comp(VALUE x) /* get 2's complement */
} }
static VALUE static VALUE
bignorm(VALUE x) bigtrunc(VALUE x)
{ {
if (FIXNUM_P(x)) { long len = RBIGNUM(x)->len;
return x; BDIGIT *ds = BDIGITS(x);
}
else if (TYPE(x) == T_BIGNUM) {
long len = RBIGNUM(x)->len;
BDIGIT *ds = BDIGITS(x);
while (len-- && !ds[len]) ; while (len-- && !ds[len]);
RBIGNUM(x)->len = ++len; RBIGNUM(x)->len = ++len;
return x;
}
if (len*SIZEOF_BDIGITS <= sizeof(VALUE)) { static VALUE
SIGNED_VALUE num = 0; bigfixize(VALUE x)
while (len--) { {
num = BIGUP(num) + ds[len]; long len = RBIGNUM(x)->len;
BDIGIT *ds = BDIGITS(x);
if (len*SIZEOF_BDIGITS <= sizeof(VALUE)) {
SIGNED_VALUE num = 0;
while (len--) {
num = BIGUP(num) + ds[len];
}
if (num >= 0) {
if (RBIGNUM(x)->sign) {
if (POSFIXABLE(num)) return LONG2FIX(num);
} }
if (num >= 0) { else {
if (RBIGNUM(x)->sign) { if (NEGFIXABLE(-(long)num)) return LONG2FIX(-(long)num);
if (POSFIXABLE(num)) return LONG2FIX(num);
}
else if (NEGFIXABLE(-(long)num)) return LONG2FIX(-(long)num);
} }
} }
} }
return x; return x;
} }
static VALUE
bignorm(VALUE x)
{
if (!FIXNUM_P(x) && TYPE(x) == T_BIGNUM) {
x = bigfixize(bigtrunc(x));
}
return x;
}
VALUE VALUE
rb_big_norm(VALUE x) rb_big_norm(VALUE x)
{ {
@ -1563,10 +1577,10 @@ rb_big_pow(VALUE x, VALUE y)
do { do {
yy /= 2; yy /= 2;
x = rb_big_mul0(x, x); x = rb_big_mul0(x, x);
if (!BDIGITS(x)[RBIGNUM(x)->len-1]) RBIGNUM(x)->len--; bigtrunc(x);
} while (yy % 2 == 0); } while (yy % 2 == 0);
z = z ? rb_big_mul0(z, x) : x; z = z ? rb_big_mul0(z, x) : x;
if (!BDIGITS(z)[RBIGNUM(z)->len-1]) RBIGNUM(z)->len--; bigtrunc(z);
} }
return bignorm(z); return bignorm(z);
} }