X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/blobdiff_plain/07dc33b2437c0da301ba93f650bf5b08d2206911..02dfbd5b7af7816959dbd39c1fe628451204e35f:/mpx-ksqr.c

diff --git a/mpx-ksqr.c b/mpx-ksqr.c
index e6c40f6..92fd0cc 100644
--- a/mpx-ksqr.c
+++ b/mpx-ksqr.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: mpx-ksqr.c,v 1.4 2000/07/29 17:04:02 mdw Exp $
+ * $Id$
  *
  * Karatsuba-based squaring algorithm
  *
@@ -27,38 +27,19 @@
  * MA 02111-1307, USA.
  */
 
-/*----- Revision history --------------------------------------------------* 
- *
- * $Log: mpx-ksqr.c,v $
- * Revision 1.4  2000/07/29 17:04:02  mdw
- * Remove useless header `mpscan.h'.
- *
- * Revision 1.3  2000/06/17 11:42:54  mdw
- * Moved the Karatsuba macros into a separate file for better sharing.
- * Fixed some comments.  Use an improved technique so that all the
- * operations are squarings.
- *
- * Revision 1.2  1999/12/13 15:35:01  mdw
- * Simplify and improve.
- *
- * Revision 1.1  1999/12/11 10:57:43  mdw
- * Karatsuba squaring algorithm.
- *
- */
-
 /*----- Header files ------------------------------------------------------*/
 
 #include <assert.h>
 #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 4
 #endif
 
 /*----- Main code ---------------------------------------------------------*/
@@ -77,9 +58,9 @@
  *		large numbers, although more expensive on small ones, and
  *		rather simpler than full-blown Karatsuba multiplication.
  *
- *		The destination must be twice as large as the argument.  The
- *		scratch space must be twice as large as the argument, plus
- *		the magic number @KARATSUBA_SLOP@.
+ *		The destination must be three times as large as the larger
+ *		argument.  The scratch space must be five times as large as
+ *		the larger argument.
  */
 
 void mpx_ksqr(mpw *dv, mpw *dvl,
@@ -99,7 +80,7 @@ void mpx_ksqr(mpw *dv, mpw *dvl,
 
   MPX_SHRINK(av, avl);
 
-  if (avl - av <= KARATSUBA_CUTOFF) {
+  if (avl - av <= MPK_THRESH) {
     mpx_usqr(dv, dvl, av, avl);
     return;
   }
@@ -120,11 +101,6 @@ void mpx_ksqr(mpw *dv, mpw *dvl,
   m = (avl - av + 1) >> 1;
   avm = av + m;
 
-  assert(((void)"Destination too small for Karatsuba square",
-	  dvl - dv >= 4 * m));
-  assert(((void)"Not enough workspace for Karatsuba square",
-	  svl - sv >= 4 * m));
-
   /* --- Sort out everything --- */
 
   {
@@ -132,13 +108,15 @@ void mpx_ksqr(mpw *dv, mpw *dvl,
     mpw *tdv = dv + m;
     mpw *rdv = tdv + m;
 
+    assert(rdv + m + 4 < dvl);
+    assert(ssv < svl);
     UADD2(sv, svm, av, avm, avm, avl);
-    if (m > KARATSUBA_CUTOFF)
+    if (m > MPK_THRESH)
       mpx_ksqr(tdv, rdv + m + 4, sv, svm + 1, ssv, svl);
     else
       mpx_usqr(tdv, rdv + m + 4, sv, svm + 1);
 
-    if (m > KARATSUBA_CUTOFF)
+    if (m > MPK_THRESH)
       mpx_ksqr(sv, ssv, avm, avl, ssv, svl);
     else
       mpx_usqr(sv, ssv, avm, avl);
@@ -146,7 +124,7 @@ void mpx_ksqr(mpw *dv, mpw *dvl,
     UADD(rdv, sv, svm + 1);
     USUB(tdv, sv, svn);
     
-    if (m > KARATSUBA_CUTOFF)
+    if (m > MPK_THRESH)
       mpx_ksqr(sv, ssv, av, avm, ssv, svl);
     else
       mpx_usqr(sv, ssv, av, avm);
@@ -203,11 +181,11 @@ static int usqr(dstr *v)
   LOAD(a, al, &v[0]);
   LOAD(c, cl, &v[1]);
   m = al - a + 1;
-  ALLOC(d, dl, 2 * m);
-  ALLOC(s, sl, 2 * m + 32);
+  ALLOC(d, dl, 3 * m);
+  ALLOC(s, sl, 5 * m);
 
   mpx_ksqr(d, dl, a, al, s, sl);
-  if (MPX_UCMP(d, dl, !=, c, cl)) {
+  if (!mpx_ueq(d, dl, c, cl)) {
     fprintf(stderr, "\n*** usqr failed\n");
     dumpmp("       a", a, al);
     dumpmp("expected", c, cl);
@@ -215,7 +193,7 @@ static int usqr(dstr *v)
     ok = 0;
   }
 
-  free(a); free(c); free(d); free(s);
+  xfree(a); xfree(c); xfree(d); xfree(s);
   return (ok);
 }