X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/blobdiff_plain/7d5fa32a96bb9badc88fe1b07086c6f770c0de31..b9a27a112e666cdf07b55e47856e5f0611d69a7b:/mpx-kmul.c

diff --git a/mpx-kmul.c b/mpx-kmul.c
index dd492ad..f6b0b4f 100644
--- a/mpx-kmul.c
+++ b/mpx-kmul.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: mpx-kmul.c,v 1.4 2000/06/17 11:42:11 mdw Exp $
+ * $Id: mpx-kmul.c,v 1.7 2000/10/08 15:48:35 mdw Exp $
  *
  * Karatsuba's multiplication algorithm
  *
@@ -30,6 +30,15 @@
 /*----- Revision history --------------------------------------------------* 
  *
  * $Log: mpx-kmul.c,v $
+ * 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.
@@ -51,13 +60,13 @@
 #include <stdio.h>
 
 #include "mpx.h"
-#include "mpx-kmac.h"
+#include "karatsuba.h"
 
 /*----- Tweakables --------------------------------------------------------*/
 
 #ifdef TEST_RIG
-#  undef KARATSUBA_CUTOFF
-#  define KARATSUBA_CUTOFF 2
+#  undef MPK_THRESH
+#  define MPK_THRESH 2
 #endif
 
 /*----- Main code ---------------------------------------------------------*/
@@ -78,7 +87,7 @@
  *
  *		The destination must be twice as large as the larger
  *		argument.  The scratch space must be twice as large as the
- *		larger argument, plus the magic number @KARATSUBA_SLOP@.
+ *		larger argument, plus the magic number @MPK_SLOP@.
  */
 
 void mpx_kmul(mpw *dv, mpw *dvl,
@@ -100,7 +109,7 @@ void mpx_kmul(mpw *dv, mpw *dvl,
   MPX_SHRINK(av, avl);
   MPX_SHRINK(bv, bvl);
 
-  if (avl - av <= KARATSUBA_CUTOFF || bvl - bv <= KARATSUBA_CUTOFF) {
+  if (avl - av <= MPK_THRESH || bvl - bv <= MPK_THRESH) {
     mpx_umul(dv, dvl, av, avl, bv, bvl);
     return;
   }
@@ -120,7 +129,7 @@ void mpx_kmul(mpw *dv, mpw *dvl,
   /* --- First things --- *
    *
    * Sort out where to break the factors in half.  I'll choose the midpoint
-   * of the largest one, since this minimizes the amount of work I have to do
+   * of the larger one, since this minimizes the amount of work I have to do
    * most effectively.
    */
 
@@ -153,7 +162,7 @@ void mpx_kmul(mpw *dv, mpw *dvl,
 
     UADD2(sv, bsv, av, avm, avm, avl);
     UADD2(bsv, ssv, bv, bvm, bvm, bvl);
-    if (m > KARATSUBA_CUTOFF)
+    if (m > MPK_THRESH)
       mpx_kmul(rdv, rdvl, sv, bsv, bsv, ssv, ssv, svl);
     else
       mpx_umul(rdv, rdvl, sv, bsv, bsv, ssv);
@@ -169,7 +178,7 @@ void mpx_kmul(mpw *dv, mpw *dvl,
     if (avl == avm || bvl == bvm)
       MPX_ZERO(rdv + m + 1, dvl);
     else {
-      if (m > KARATSUBA_CUTOFF)
+      if (m > MPK_THRESH)
 	mpx_kmul(sv, ssv, avm, avl, bvm, bvl, ssv, svl);
       else
 	mpx_umul(sv, ssv, avm, avl, bvm, bvl);
@@ -178,7 +187,7 @@ void mpx_kmul(mpw *dv, mpw *dvl,
       USUB(tdv, sv, svn);
     }
 
-    if (m > KARATSUBA_CUTOFF)
+    if (m > MPK_THRESH)
       mpx_kmul(sv, ssv, av, avm, bv, bvm, ssv, svl);
     else
       mpx_umul(sv, ssv, av, avm, bv, bvm);
@@ -195,8 +204,6 @@ void mpx_kmul(mpw *dv, mpw *dvl,
 #include <mLib/alloc.h>
 #include <mLib/testrig.h>
 
-#include "mpscan.h"
-
 #define ALLOC(v, vl, sz) do {                                           \
   size_t _sz = (sz);                                                    \
   mpw *_vv = xmalloc(MPWS(_sz));                                        \
@@ -243,7 +250,7 @@ static int umul(dstr *v)
   ALLOC(s, sl, 2 * m + 32);
 
   mpx_kmul(d, dl, a, al, b, bl, s, sl);
-  if (MPX_UCMP(d, dl, !=, c, cl)) {
+  if (!mpx_ueq(d, dl, c, cl)) {
     fprintf(stderr, "\n*** umul failed\n");
     dumpmp("       a", a, al);
     dumpmp("       b", b, bl);