From b1e052d0805b97c83fd0ff04580d4c5d555613c7 Mon Sep 17 00:00:00 2001 From: akr Date: Sat, 29 Jun 2013 16:58:58 +0000 Subject: * bignum.c (big_rshift): Use abs2twocomp and twocomp2abs_bang. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@41698 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ bignum.c | 29 ++++++++++++----------------- 2 files changed, 16 insertions(+), 17 deletions(-) diff --git a/ChangeLog b/ChangeLog index 500ab585d9..b80d5adcdc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Sun Jun 30 01:57:08 2013 Tanaka Akira + + * bignum.c (big_rshift): Use abs2twocomp and twocomp2abs_bang. + Sun Jun 30 00:14:20 2013 Tanaka Akira * bignum.c (RBIGNUM_SET_NEGATIVE_SIGN): New macro. diff --git a/bignum.c b/bignum.c index 15172503d0..2990d69cc4 100644 --- a/bignum.c +++ b/bignum.c @@ -5163,33 +5163,28 @@ big_rshift(VALUE x, unsigned long shift) long s1 = shift/BITSPERDIG; int s2 = (int)(shift%BITSPERDIG); VALUE z; - long i, j; - volatile VALUE save_x; + long j; + long xl; + BDIGIT hibitsx; if (s1 > RBIGNUM_LEN(x)) { - if (RBIGNUM_SIGN(x)) + if (RBIGNUM_POSITIVE_P(x) || bary_zero_p(BDIGITS(x), RBIGNUM_LEN(x))) return INT2FIX(0); else return INT2FIX(-1); } - if (!RBIGNUM_SIGN(x)) { - x = rb_big_clone(x); - get2comp(x); - } - save_x = x; + hibitsx = abs2twocomp(&x, &xl); xds = BDIGITS(x); - i = RBIGNUM_LEN(x); j = i - s1; - if (j == 0) { - if (RBIGNUM_SIGN(x)) return INT2FIX(0); + j = xl - s1; + if (j <= 0) { + if (!hibitsx) return INT2FIX(0); else return INT2FIX(-1); } - z = bignew(j, RBIGNUM_SIGN(x)); + z = bignew(j, 0); zds = BDIGITS(z); - bary_small_rshift(zds, xds+s1, j, s2, !RBIGNUM_SIGN(x)); - if (!RBIGNUM_SIGN(x)) { - get2comp(z); - } - RB_GC_GUARD(save_x); + bary_small_rshift(zds, xds+s1, j, s2, hibitsx != 0); + twocomp2abs_bang(z, hibitsx != 0); + RB_GC_GUARD(x); return z; } -- cgit v1.2.3