Merge branch 'master' of git+ssh://metalzone.distorted.org.uk/~mdw/public-git/catacomb/

[u/mdw/catacomb] / f-prime.c

diff --git a/f-prime.c b/f-prime.c
index f2fd7eb..422c386 100644 (file)
--- a/f-prime.c
+++ b/f-prime.c
@@ -111,20 +111,20 @@ static mp *fsqrt(field *ff, mp *d, mp *x) {
 
 static mp *fdbl(field *ff, mp *d, mp *x) {
   fctx_prime *f = (fctx_prime *)ff; d = mp_lsl(d, x, 1);
-  if (MP_CMP(d, >, f->mm.m)) d = mp_sub(d, d, f->mm.m);
+  if (MP_CMP(d, >=, f->mm.m)) d = mp_sub(d, d, f->mm.m);
   return (d);
 }
 
 static mp *ftpl(field *ff, mp *d, mp *x) {
   fctx_prime *f = (fctx_prime *)ff; MP_DEST(d, MP_LEN(x) + 1, x->f);
-  MPX_UMULN(d->v, d->vl, x->v, x->vl, 3);
-  while (MP_CMP(d, >, f->mm.m)) d = mp_sub(d, d, f->mm.m);
+  MPX_UMULN(d->v, d->vl, x->v, x->vl, 3); d->f &= ~MP_UNDEF;
+  while (MP_CMP(d, >=, f->mm.m)) d = mp_sub(d, d, f->mm.m);
   return (d);
 }
 
 static mp *fqdl(field *ff, mp *d, mp *x) {
   fctx_prime *f = (fctx_prime *)ff; d = mp_lsl(d, x, 2);
-  while (MP_CMP(d, >, f->mm.m)) d = mp_sub(d, d, f->mm.m);
+  while (MP_CMP(d, >=, f->mm.m)) d = mp_sub(d, d, f->mm.m);
   return (d);
 }