1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* bignum.c (bdigs_small_rshift): Extracted from big_rshift.

Browse Source 
(bigdivrem): Use bdigs_small_rshift.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@41307 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2013-06-15 01:03:37 +00:00
parent f3b537c524
commit 6193a3148a
2 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Sat Jun 15 10:02:26 2013 Tanaka Akira <akr@fsij.org>
* bignum.c (bdigs_small_rshift): Extracted from big_rshift.
(bigdivrem): Use bdigs_small_rshift.
Sat Jun 15 08:37:28 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> Sat Jun 15 08:37:28 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* vm_eval.c (eval_string_with_cref): propagate absolute path from the * vm_eval.c (eval_string_with_cref): propagate absolute path from the

35
bignum.c
View File

@ -52,6 +52,7 @@ static VALUE big_three = Qnil;
static int nlz(BDIGIT x); static int nlz(BDIGIT x);
static BDIGIT bdigs_small_lshift(BDIGIT *zds, BDIGIT *xds, long n, int shift); static BDIGIT bdigs_small_lshift(BDIGIT *zds, BDIGIT *xds, long n, int shift);
static void bdigs_small_rshift(BDIGIT *zds, BDIGIT *xds, long n, int shift, int sign_bit);
#define BIGNUM_DEBUG 0 #define BIGNUM_DEBUG 0
#if BIGNUM_DEBUG #if BIGNUM_DEBUG
@ -3845,13 +3846,7 @@ bigdivrem(VALUE x, VALUE y, volatile VALUE *divp, volatile VALUE *modp)
if (modp) { /* normalize remainder */ if (modp) { /* normalize remainder */
while (ny > 1 && !zds[ny-1]) --ny; while (ny > 1 && !zds[ny-1]) --ny;
if (dd) { if (dd) {
t2 = 0; i = ny; bdigs_small_rshift(zds, zds, ny, dd, 0);
while (i--) {
t2 = (t2 | zds[i]) >> dd;
q = zds[i];
zds[i] = BIGLO(t2);
t2 = BIGUP(q);
}
} }
if (!zds[ny-1]) ny--; if (!zds[ny-1]) ny--;
*modp = zz = bignew(ny, RBIGNUM_SIGN(x)); *modp = zz = bignew(ny, RBIGNUM_SIGN(x));
@ -4621,6 +4616,22 @@ rb_big_rshift(VALUE x, VALUE y)
return bignorm(x); return bignorm(x);
} }
static void
bdigs_small_rshift(BDIGIT *zds, BDIGIT *xds, long n, int shift, int sign_bit)
{
BDIGIT_DBL num = 0;
BDIGIT x;
if (sign_bit) {
num = (~(BDIGIT_DBL)0) << BITSPERDIG;
}
while (n--) {
num = (num | xds[n]) >> shift;
x = xds[n];
zds[n] = BIGLO(num);
num = BIGUP(x);
}
}
static VALUE static VALUE
big_rshift(VALUE x, unsigned long shift) big_rshift(VALUE x, unsigned long shift)
{ {
@ -4628,7 +4639,6 @@ big_rshift(VALUE x, unsigned long shift)
long s1 = shift/BITSPERDIG; long s1 = shift/BITSPERDIG;
int s2 = (int)(shift%BITSPERDIG); int s2 = (int)(shift%BITSPERDIG);
VALUE z; VALUE z;
BDIGIT_DBL num = 0;
long i, j; long i, j;
volatile VALUE save_x; volatile VALUE save_x;
@ -4650,15 +4660,8 @@ big_rshift(VALUE x, unsigned long shift)
else return INT2FIX(-1); else return INT2FIX(-1);
} }
z = bignew(j, RBIGNUM_SIGN(x)); z = bignew(j, RBIGNUM_SIGN(x));
if (!RBIGNUM_SIGN(x)) {
num = ((BDIGIT_DBL)~0) << BITSPERDIG;
}
zds = BDIGITS(z); zds = BDIGITS(z);
while (i--, j--) { bdigs_small_rshift(zds, xds+s1, j, s2, !RBIGNUM_SIGN(x));
num = (num | xds[i]) >> s2;
zds[j] = BIGLO(num);
num = BIGUP(xds[i]);
}
if (!RBIGNUM_SIGN(x)) { if (!RBIGNUM_SIGN(x)) {
get2comp(z); get2comp(z);
} }