X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/blobdiff_plain/dd22938ef0d9b0131dad9171a8a95866ceec9607..908ebb29ff621f582b34d48fd4278b60b78379b6:/mpx-kmul.c

diff --git a/mpx-kmul.c b/mpx-kmul.c
index 1981a28..081de88 100644
--- a/mpx-kmul.c
+++ b/mpx-kmul.c
@@ -1,13 +1,13 @@
 /* -*-c-*-
  *
- * $Id: mpx-kmul.c,v 1.8 2002/10/09 00:36:03 mdw Exp $
+ * $Id$
  *
  * Karatsuba's multiplication algorithm
  *
  * (c) 1999 Straylight/Edgeware
  */
 
-/*----- Licensing notice --------------------------------------------------* 
+/*----- Licensing notice --------------------------------------------------*
  *
  * This file is part of Catacomb.
  *
@@ -15,48 +15,18 @@
  * 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,
  * MA 02111-1307, USA.
  */
 
-/*----- Revision history --------------------------------------------------* 
- *
- * $Log: mpx-kmul.c,v $
- * Revision 1.8  2002/10/09 00:36:03  mdw
- * Fix bounds on workspace for Karatsuba operations.
- *
- * Revision 1.7  2000/10/08 15:48:35  mdw
- * Rename Karatsuba constants now that we have @gfx_kmul@ too.
- *
- * Revision 1.6  2000/10/08 12:11:01  mdw
- * Use @mpx_ueq@ instead of @MPX_UCMP@.
- *
- * Revision 1.5  2000/07/29 17:04:02  mdw
- * Remove useless header `mpscan.h'.
- *
- * Revision 1.4  2000/06/17 11:42:11  mdw
- * Moved the Karatsuba macros into a separate file for better sharing.
- * Fixed some comments.
- *
- * Revision 1.3  1999/12/13 15:35:01  mdw
- * Simplify and improve.
- *
- * Revision 1.2  1999/12/11 10:58:02  mdw
- * Remove tweakable comments.
- *
- * Revision 1.1  1999/12/10 23:23:51  mdw
- * Karatsuba-Ofman multiplication algorithm.
- *
- */
-
 /*----- Header files ------------------------------------------------------*/
 
 #include <assert.h>
@@ -158,8 +128,8 @@ void mpx_kmul(mpw *dv, mpw *dvl,
     mpw *bsv = sv + m + 1, *ssv = bsv + m + 1;
     mpw *rdv = dv + m, *rdvl = rdv + 2 * (m + 2);
 
-    assert(rdvl < dvl);
-    assert(ssv < svl);
+    assert(rdvl <= dvl);
+    assert(ssv <= svl);
     UADD2(sv, bsv, av, avm, avm, avl);
     UADD2(bsv, ssv, bv, bvm, bvm, bvl);
     if (m > MPK_THRESH)
@@ -204,21 +174,21 @@ void mpx_kmul(mpw *dv, mpw *dvl,
 #include <mLib/alloc.h>
 #include <mLib/testrig.h>
 
-#define ALLOC(v, vl, sz) do {                                           \
-  size_t _sz = (sz);                                                    \
-  mpw *_vv = xmalloc(MPWS(_sz));                                        \
-  mpw *_vvl = _vv + _sz;                                                \
-  (v) = _vv;                                                            \
-  (vl) = _vvl;                                                          \
+#define ALLOC(v, vl, sz) do {						\
+  size_t _sz = (sz);							\
+  mpw *_vv = xmalloc(MPWS(_sz));					\
+  mpw *_vvl = _vv + _sz;						\
+  (v) = _vv;								\
+  (vl) = _vvl;								\
 } while (0)
 
-#define LOAD(v, vl, d) do {                                             \
-  const dstr *_d = (d);                                                 \
-  mpw *_v, *_vl;                                                        \
-  ALLOC(_v, _vl, MPW_RQ(_d->len));                                      \
-  mpx_loadb(_v, _vl, _d->buf, _d->len);                                 \
-  (v) = _v;                                                             \
-  (vl) = _vl;                                                           \
+#define LOAD(v, vl, d) do {						\
+  const dstr *_d = (d);							\
+  mpw *_v, *_vl;							\
+  ALLOC(_v, _vl, MPW_RQ(_d->len));					\
+  mpx_loadb(_v, _vl, _d->buf, _d->len);					\
+  (v) = _v;								\
+  (vl) = _vl;								\
 } while (0)
 
 #define MAX(x, y) ((x) > (y) ? (x) : (y))
@@ -252,14 +222,14 @@ static int umul(dstr *v)
   mpx_kmul(d, dl, a, al, b, bl, s, sl);
   if (!mpx_ueq(d, dl, c, cl)) {
     fprintf(stderr, "\n*** umul failed\n");
-    dumpmp("       a", a, al);
-    dumpmp("       b", b, bl);
+    dumpmp("	   a", a, al);
+    dumpmp("	   b", b, bl);
     dumpmp("expected", c, cl);
     dumpmp("  result", d, dl);
     ok = 0;
   }
 
-  free(a); free(b); free(c); free(d); free(s);
+  xfree(a); xfree(b); xfree(c); xfree(d); xfree(s);
   return (ok);
 }