X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/blobdiff_plain/c3caa2face1cda7002eb58245ad75865bf437455..4739c68a6cb81cae53cd7df694ecd6176d6f11f8:/gfreduce.c

diff --git a/gfreduce.c b/gfreduce.c
index 819c276..ae31d5c 100644
--- a/gfreduce.c
+++ b/gfreduce.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: gfreduce.c,v 1.2 2004/03/21 22:52:06 mdw Exp $
+ * $Id: gfreduce.c,v 1.5 2004/04/08 01:36:15 mdw Exp $
  *
  * Efficient reduction modulo sparse binary polynomials
  *
@@ -27,17 +27,6 @@
  * MA 02111-1307, USA.
  */
 
-/*----- Revision history --------------------------------------------------* 
- *
- * $Log: gfreduce.c,v $
- * Revision 1.2  2004/03/21 22:52:06  mdw
- * Merge and close elliptic curve branch.
- *
- * Revision 1.1.2.1  2004/03/21 22:39:46  mdw
- * Elliptic curves on binary fields work.
- *
- */
-
 /*----- Header files ------------------------------------------------------*/
 
 #include <mLib/alloc.h>
@@ -95,7 +84,8 @@ DA_DECL(instr_v, gfreduce_instr);
 void gfreduce_create(gfreduce *r, mp *p)
 {
   instr_v iv = DA_INIT;
-  unsigned long d, dw;
+  unsigned long d;
+  unsigned dw;
   mpscan sc;
   unsigned long i;
   gfreduce_instr *ip;
@@ -159,8 +149,8 @@ void gfreduce_create(gfreduce *r, mp *p)
       w = ww;
       wi = DA_LEN(&iv);
     }
-    INSTR(GFRI_LSL, (i - d)%MPW_BITS);
-    if ((i - d)%MPW_BITS)
+    INSTR(GFRI_LSL, (MPW_BITS + i - d)%MPW_BITS);
+    if ((MPW_BITS + i - d)%MPW_BITS)
       f |= f_lsr;
   }
   wl = DA_LEN(&iv);
@@ -440,7 +430,7 @@ mp *gfreduce_quadsolve(gfreduce *r, mp *d, mp *x)
   }
   MP_DROP(t);
   MP_DROP(x);
-  d->v[0] &= ~(mpw)1;
+  if (d) d->v[0] &= ~(mpw)1;
   return (d);
 }