akr	2013-08-14 00:21:42 +0900 (Wed, 14 Aug 2013)

  New Revision: 42545

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=42545

  Log:
    * bignum.c (big_div_struct): Remove xn and j field.  Add zn field. 
      (bigdivrem1): Follow the above change.
      (bigdivrem_restoring): Ditto.

  Modified files:
    trunk/ChangeLog
    trunk/bignum.c
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 42544)
+++ ChangeLog	(revision 42545)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Wed Aug 14 00:18:39 2013  Tanaka Akira  <akr@f...>
+
+	* bignum.c (big_div_struct): Remove xn and j field.  Add zn field. 
+	  (bigdivrem1): Follow the above change.
+	  (bigdivrem_restoring): Ditto.
+
 Tue Aug 13 23:38:17 2013  Tanaka Akira  <akr@f...>
 
 	* bignum.c (big_div_struct): ynzero field removed.
Index: bignum.c
===================================================================
--- bignum.c	(revision 42544)
+++ bignum.c	(revision 42545)
@@ -2625,7 +2625,7 @@ bary_mul(BDIGIT *zds, size_t zn, const B https://github.com/ruby/ruby/blob/trunk/bignum.c#L2625
 }
 
 struct big_div_struct {
-    size_t xn, yn, j;
+    size_t yn, zn;
     BDIGIT *yds, *zds;
     volatile VALUE stop;
 };
@@ -2635,33 +2635,33 @@ bigdivrem1(void *ptr) https://github.com/ruby/ruby/blob/trunk/bignum.c#L2635
 {
     struct big_div_struct *bds = (struct big_div_struct*)ptr;
     size_t yn = bds->yn;
-    size_t j;
+    size_t zn = bds->zn;
     BDIGIT *yds = bds->yds, *zds = bds->zds;
     BDIGIT_DBL_SIGNED num;
     BDIGIT q;
 
-    j = bds->j;
     do {
 	if (bds->stop) {
-	    bds->j = j;
+	    bds->zn = zn;
 	    return 0;
         }
-	if (zds[j] == yds[yn-1]) q = BDIGMAX;
-	else q = (BDIGIT)((BIGUP(zds[j]) + zds[j-1])/yds[yn-1]);
+	if (zds[zn-1] == yds[yn-1]) q = BDIGMAX;
+	else q = (BDIGIT)((BIGUP(zds[zn-1]) + zds[zn-2])/yds[yn-1]);
 	if (q) {
-            num = bigdivrem_mulsub(zds+j-yn, yn+1,
+            num = bigdivrem_mulsub(zds+zn-(yn+1), yn+1,
                                    q,
                                    yds, yn);
 	    while (num) { /* "add back" required */
 		q--;
-                num = bary_add(zds+j-yn, yn,
-                               zds+j-yn, yn,
+                num = bary_add(zds+zn-(yn+1), yn,
+                               zds+zn-(yn+1), yn,
                                yds, yn);
                 num--;
 	    }
 	}
-	zds[j] = q;
-    } while (--j >= yn);
+        zn--;
+	zds[zn] = q;
+    } while (zn > yn);
     return 0;
 }
 
@@ -2704,12 +2704,11 @@ bigdivrem_restoring(BDIGIT *zds, size_t https://github.com/ruby/ruby/blob/trunk/bignum.c#L2704
     assert(BDIGIT_MSB(yds[yn-1]));
 
     for (ynzero = 0; !yds[ynzero]; ynzero++);
-    bds.xn = xn - ynzero;
     bds.yn = yn - ynzero;
     bds.zds = zds + ynzero;
     bds.yds = yds + ynzero;
     bds.stop = Qfalse;
-    bds.j = zn - 1 - ynzero;
+    bds.zn = zn - ynzero;
     if (xn > 10000 || yn > 10000) {
       retry:
 	bds.stop = Qfalse;

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/