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

* bignum.c (bigdivrem_restoring): Extracted from bigdivrem_normal.

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@42543 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2013-08-13 14:03:55 +00:00
parent 26feae3958
commit adaa5650cd
2 changed files with 27 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
Tue Aug 13 23:01:16 2013 Tanaka Akira <akr@fsij.org>
* bignum.c (bigdivrem_restoring): Extracted from bigdivrem_normal.
Tue Aug 13 22:12:59 2013 Kenichi Kamiya <kachick1@gmail.com> Tue Aug 13 22:12:59 2013 Kenichi Kamiya <kachick1@gmail.com>
* random.c (rb_random_ulong_limited): coerce before check negative. * random.c (rb_random_ulong_limited): coerce before check negative.

37
bignum.c
View File

@ -2697,23 +2697,11 @@ bigdivrem_single(BDIGIT *qds, const BDIGIT *xds, size_t xn, BDIGIT y)
} }
static void static void
bigdivrem_normal(BDIGIT *zds, size_t zn, const BDIGIT *xds, size_t xn, BDIGIT *yds, size_t yn, int needs_mod) bigdivrem_restoring(BDIGIT *zds, size_t zn, size_t xn, BDIGIT *yds, size_t yn)
{ {
struct big_div_struct bds; struct big_div_struct bds;
BDIGIT q;
int shift;
q = yds[yn-1]; assert(BDIGIT_MSB(yds[yn-1]));
shift = nlz(q);
if (shift) {
bary_small_lshift(yds, yds, yn, shift);
zds[xn] = bary_small_lshift(zds, xds, xn, shift);
}
else {
MEMCPY(zds, xds, BDIGIT, xn);
zds[xn] = 0;
}
if (xn+1 < zn) zds[xn+1] = 0;
bds.xn = xn; bds.xn = xn;
bds.yn = yn; bds.yn = yn;
@ -2735,6 +2723,27 @@ bigdivrem_normal(BDIGIT *zds, size_t zn, const BDIGIT *xds, size_t xn, BDIGIT *y
else { else {
bigdivrem1(&bds); bigdivrem1(&bds);
} }
}
static void
bigdivrem_normal(BDIGIT *zds, size_t zn, const BDIGIT *xds, size_t xn, BDIGIT *yds, size_t yn, int needs_mod)
{
BDIGIT q;
int shift;
q = yds[yn-1];
shift = nlz(q);
if (shift) {
bary_small_lshift(yds, yds, yn, shift);
zds[xn] = bary_small_lshift(zds, xds, xn, shift);
}
else {
MEMCPY(zds, xds, BDIGIT, xn);
zds[xn] = 0;
}
if (xn+1 < zn) zds[xn+1] = 0;
bigdivrem_restoring(zds, zn, xn, yds, yn);
if (needs_mod && shift) { if (needs_mod && shift) {
bary_small_rshift(zds, zds, yn, shift, 0); bary_small_rshift(zds, zds, yn, shift, 0);