From 0acedf8066b7a4654fd9a5e45260a1bc66421f43 Mon Sep 17 00:00:00 2001 From: matz Date: Tue, 26 May 2009 02:19:33 +0000 Subject: * bignum.c (bignew_1): inline memory allocation. * bignum.c (bigtrunc): call rb_big_resize() only when needed. * bignum.c (bigfixize): declare inline. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@23574 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 8 ++++++++ bignum.c | 18 ++++++++++++------ 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index a81de6e3c1..7cf3e05cb4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,14 @@ Tue May 26 11:01:41 2009 TAKANO Mitsuhiro (takano32) * lib/mkmf.rb: use map! to replace strings in $objs array. +Tue May 26 10:12:08 2009 Yukihiro Matsumoto + + * bignum.c (bignew_1): inline memory allocation. + + * bignum.c (bigtrunc): call rb_big_resize() only when needed. + + * bignum.c (bigfixize): declare inline. + Tue May 26 05:39:28 2009 Nobuyoshi Nakada * include/ruby/ruby.h (FilePathValue): prevent from GC. diff --git a/bignum.c b/bignum.c index a6589a2531..73ac941fcd 100644 --- a/bignum.c +++ b/bignum.c @@ -132,7 +132,8 @@ bignew_1(VALUE klass, long len, int sign) RBIGNUM_SET_LEN(big, len); } else { - rb_big_resize((VALUE)big, len); + RBIGNUM(big)->as.heap.digits = ALLOC_N(BDIGIT, len); + RBIGNUM(big)->as.heap.len = len; } return (VALUE)big; @@ -186,11 +187,13 @@ bigtrunc(VALUE x) if (len == 0) return x; while (--len && !ds[len]); - rb_big_resize(x, len+1); + if (RBIGNUM_LEN(x) > len+1) { + rb_big_resize(x, len+1); + } return x; } -static VALUE +static inline VALUE bigfixize(VALUE x) { long len = RBIGNUM_LEN(x); @@ -2392,7 +2395,8 @@ rb_big_fdiv(VALUE x, VALUE y) VALUE z; int ex, ey; - ex = (RBIGNUM_LEN(bigtrunc(x)) - 1) * BITSPERDIG; + bigtrunc(x); + ex = (RBIGNUM_LEN(x) - 1) * BITSPERDIG; ex += bdigbitsize(BDIGITS(x)[RBIGNUM_LEN(x) - 1]); ex -= 2 * DBL_BIGDIG * BITSPERDIG; if (ex) x = big_shift(x, ex); @@ -2401,7 +2405,8 @@ rb_big_fdiv(VALUE x, VALUE y) case T_FIXNUM: y = rb_int2big(FIX2LONG(y)); case T_BIGNUM: { - ey = (RBIGNUM_LEN(bigtrunc(y)) - 1) * BITSPERDIG; + bigtrunc(y); + ey = (RBIGNUM_LEN(y) - 1) * BITSPERDIG; ey += bdigbitsize(BDIGITS(y)[RBIGNUM_LEN(y) - 1]); ey -= DBL_BIGDIG * BITSPERDIG; if (ey) y = big_shift(y, ey); @@ -2875,7 +2880,8 @@ rb_big_aref(VALUE x, VALUE y) if (TYPE(y) == T_BIGNUM) { if (!RBIGNUM_SIGN(y)) return INT2FIX(0); - if (RBIGNUM_LEN(bigtrunc(y)) > DIGSPERLONG) { + bigtrunc(y); + if (RBIGNUM_LEN(y) > DIGSPERLONG) { out_of_range: return RBIGNUM_SIGN(x) ? INT2FIX(0) : INT2FIX(1); } -- cgit v1.2.3