X-Git-Url: https://git.distorted.org.uk/~mdw/catacomb/blobdiff_plain/50c46275b6a5100b020493adbd27bc361704ffda..cf76bcbb2097c36912fae1c8a6cc77f0ce4bfafd:/calc/gfx.cal

diff --git a/calc/gfx.cal b/calc/gfx.cal
index 45f534be..e38f4b70 100644
--- a/calc/gfx.cal
+++ b/calc/gfx.cal
@@ -97,24 +97,36 @@ define gf_mod(x, y)
   return gf(l[[1]]);
 }
 
-define gf_inv(a, b)
+define gf_gcd(a, b)
 {
-  local g, x, y, X, Y, u, v, t, q, r;
-  x = gf(1); X = gf(0);
-  y = gf(0); Y = gf(1);
-
-  if (b == gf(0)) { g = a; } else if (a == gf(0)) { g = b; }
+  local swap = 0;
+  local g, x = 1, X = 0, y = 0, Y = 1, q, r, t;
+  if (a.x < b.x) {
+    t = a; a = b; b = t;
+    swap = 1;
+  }
+  if (b == gf(0))
+    g = a;
   else {
     while (b != gf(0)) {
-      q = gf_div(b, a); r = gf_mod(b, a);
+      q = gf_div(a, b); r = gf_mod(a, b);
       t = X * q + x; x = X; X = t;
       t = Y * q + y; y = Y; Y = t;
-      b = a; a = r;
+      a = b; b = r;
     }
     g = a;
   }
-  if (g != gf(1)) quit "not coprime in gf_inv";
-  return Y;
+  if (swap) {
+    t = x; x = y; y = t;
+  }
+  return list(g, x, y);
+}
+
+define gf_inv(a, b)
+{
+  local l = gf_gcd(b, a);
+  if (l[[0]] != gf(1)) quit "not coprime in gf_inv";
+  return l[[2]];
 }
 
 /*----- That's all, folks -------------------------------------------------*/