X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/blobdiff_plain/b817bfc642225b8c3c0b6a7e42d1fb949b61a606..20fa0f6976d598481208c0583d72b2ccef637be9:/gf-gcd.c

diff --git a/gf-gcd.c b/gf-gcd.c
index 8eb9bbf..03cee47 100644
--- a/gf-gcd.c
+++ b/gf-gcd.c
@@ -1,13 +1,13 @@
 /* -*-c-*-
  *
- * $Id: gf-gcd.c,v 1.3 2004/04/08 01:36:15 mdw Exp $
+ * $Id$
  *
  * Euclidian algorithm on binary polynomials
  *
  * (c) 2004 Straylight/Edgeware
  */
 
-/*----- Licensing notice --------------------------------------------------* 
+/*----- Licensing notice --------------------------------------------------*
  *
  * This file is part of Catacomb.
  *
@@ -15,12 +15,12 @@
  * it under the terms of the GNU Library General Public License as
  * published by the Free Software Foundation; either version 2 of the
  * License, or (at your option) any later version.
- * 
+ *
  * Catacomb is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Library General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Library General Public
  * License along with Catacomb; if not, write to the Free
  * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
@@ -51,7 +51,7 @@ void gf_gcd(mp **gcd, mp **xx, mp **yy, mp *a, mp *b)
   mp *x = MP_ONE, *X = MP_ZERO;
   mp *y = MP_ZERO, *Y = MP_ONE;
   mp *u, *v;
-  mp *q = MP_NEW;
+  mp *q = MP_NEW, *t, *spare = MP_NEW;
   unsigned f = 0;
 
 #define f_swap 1u
@@ -69,7 +69,7 @@ void gf_gcd(mp **gcd, mp **xx, mp **yy, mp *a, mp *b)
    */
 
   if (MPX_UCMP(a->v, a->vl, <, b->v, b->vl)) {
-    { mp *t = a; a = b; b = t; }
+    t = a; a = b; b = t;
     f |= f_swap;
   }
 
@@ -106,34 +106,25 @@ void gf_gcd(mp **gcd, mp **xx, mp **yy, mp *a, mp *b)
     return;
   }
 
-  /* --- Take a reference to the arguments --- */
-
-  a = MP_COPY(a);
-  b = MP_COPY(b);
-
-  /* --- Make sure @a@ and @b@ are not both even --- */
-
-  MP_SPLIT(a); a->f &= ~MP_NEG;
-  MP_SPLIT(b); b->f &= ~MP_NEG;
+  /* --- Main extended Euclidean algorithm --- */
 
   u = MP_COPY(a);
   v = MP_COPY(b);
 
-  while (MP_LEN(v)) {
-    mp *t;
+  while (!MP_ZEROP(v)) {
     gf_div(&q, &u, u, v);
     if (f & f_ext) {
-      t = gf_mul(MP_NEW, X, q);
-      t = gf_add(t, x, t);
-      MP_DROP(x); x = X; X = t;
-      t = gf_mul(MP_NEW, Y, q);
-      t = gf_add(t, y, t);
-      MP_DROP(y); y = Y; Y = t;
+      t = gf_mul(spare, X, q);
+      t = gf_add(t, t, x);
+      spare = x; x = X; X = t;
+      t = gf_mul(spare, Y, q);
+      t = gf_add(t, t, y);
+      spare = y; y = Y; Y = t;
     }
     t = u; u = v; v = t;
   }
 
-  MP_DROP(q);
+  MP_DROP(q); if (spare) MP_DROP(spare);
   if (!gcd)
     MP_DROP(u);
   else {
@@ -149,7 +140,7 @@ void gf_gcd(mp **gcd, mp **xx, mp **yy, mp *a, mp *b)
     /* --- If @a@ and @b@ got swapped, swap the coefficients back --- */
 
     if (f & f_swap) {
-      mp *t = x; x = y; y = t;
+      t = x; x = y; y = t;
       t = a; a = b; b = t;
     }
 
@@ -172,7 +163,6 @@ void gf_gcd(mp **gcd, mp **xx, mp **yy, mp *a, mp *b)
 
   MP_DROP(v);
   MP_DROP(X); MP_DROP(Y);
-  MP_DROP(a); MP_DROP(b);
 }
 
 /* -- @gf_modinv@ --- *
@@ -214,8 +204,8 @@ static int gcd(dstr *v)
   gf_gcd(&gg, &xx, &yy, a, b);
   if (!MP_EQ(x, xx)) {
     fputs("\n*** gf_gcd(x) failed", stderr);
-    fputs("\na      = ", stderr); mp_writefile(a, stderr, 16);
-    fputs("\nb      = ", stderr); mp_writefile(b, stderr, 16);
+    fputs("\na	    = ", stderr); mp_writefile(a, stderr, 16);
+    fputs("\nb	    = ", stderr); mp_writefile(b, stderr, 16);
     fputs("\nexpect = ", stderr); mp_writefile(x, stderr, 16);
     fputs("\nresult = ", stderr); mp_writefile(xx, stderr, 16);
     fputc('\n', stderr);
@@ -223,8 +213,8 @@ static int gcd(dstr *v)
   }
   if (!MP_EQ(y, yy)) {
     fputs("\n*** gf_gcd(y) failed", stderr);
-    fputs("\na      = ", stderr); mp_writefile(a, stderr, 16);
-    fputs("\nb      = ", stderr); mp_writefile(b, stderr, 16);
+    fputs("\na	    = ", stderr); mp_writefile(a, stderr, 16);
+    fputs("\nb	    = ", stderr); mp_writefile(b, stderr, 16);
     fputs("\nexpect = ", stderr); mp_writefile(y, stderr, 16);
     fputs("\nresult = ", stderr); mp_writefile(yy, stderr, 16);
     fputc('\n', stderr);
@@ -243,8 +233,8 @@ static int gcd(dstr *v)
 
   if (!MP_EQ(g, gg)) {
     fputs("\n*** gf_gcd(gcd) failed", stderr);
-    fputs("\na      = ", stderr); mp_writefile(a, stderr, 16);
-    fputs("\nb      = ", stderr); mp_writefile(b, stderr, 16);
+    fputs("\na	    = ", stderr); mp_writefile(a, stderr, 16);
+    fputs("\nb	    = ", stderr); mp_writefile(b, stderr, 16);
     fputs("\nexpect = ", stderr); mp_writefile(g, stderr, 16);
     fputs("\nresult = ", stderr); mp_writefile(gg, stderr, 16);
     fputc('\n', stderr);