projects
/
u
/
mdw
/
catacomb
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix memory leaks.
[u/mdw/catacomb]
/
mpx-ksqr.c
diff --git
a/mpx-ksqr.c
b/mpx-ksqr.c
index
e6c40f6
..
25dbb70
100644
(file)
--- a/
mpx-ksqr.c
+++ b/
mpx-ksqr.c
@@
-1,6
+1,6
@@
/* -*-c-*-
*
/* -*-c-*-
*
- * $Id: mpx-ksqr.c,v 1.
4 2000/07/29 17:04:02
mdw Exp $
+ * $Id: mpx-ksqr.c,v 1.
6 2000/10/08 15:48:35
mdw Exp $
*
* Karatsuba-based squaring algorithm
*
*
* Karatsuba-based squaring algorithm
*
@@
-30,6
+30,12
@@
/*----- Revision history --------------------------------------------------*
*
* $Log: mpx-ksqr.c,v $
/*----- Revision history --------------------------------------------------*
*
* $Log: mpx-ksqr.c,v $
+ * Revision 1.6 2000/10/08 15:48:35 mdw
+ * Rename Karatsuba constants now that we have @gfx_kmul@ too.
+ *
+ * Revision 1.5 2000/10/08 12:11:01 mdw
+ * Use @mpx_ueq@ instead of @MPX_UCMP@.
+ *
* Revision 1.4 2000/07/29 17:04:02 mdw
* Remove useless header `mpscan.h'.
*
* Revision 1.4 2000/07/29 17:04:02 mdw
* Remove useless header `mpscan.h'.
*
@@
-52,13
+58,13
@@
#include <stdio.h>
#include "mpx.h"
#include <stdio.h>
#include "mpx.h"
-#include "
mpx-kmac
.h"
+#include "
karatsuba
.h"
/*----- Tweakables --------------------------------------------------------*/
#ifdef TEST_RIG
/*----- Tweakables --------------------------------------------------------*/
#ifdef TEST_RIG
-# undef
KARATSUBA_CUTOFF
-# define
KARATSUBA_CUTOFF
2
+# undef
MPK_THRESH
+# define
MPK_THRESH
2
#endif
/*----- Main code ---------------------------------------------------------*/
#endif
/*----- Main code ---------------------------------------------------------*/
@@
-79,7
+85,7
@@
*
* The destination must be twice as large as the argument. The
* scratch space must be twice as large as the argument, plus
*
* 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 magic number @
MPK
_SLOP@.
*/
void mpx_ksqr(mpw *dv, mpw *dvl,
*/
void mpx_ksqr(mpw *dv, mpw *dvl,
@@
-99,7
+105,7
@@
void mpx_ksqr(mpw *dv, mpw *dvl,
MPX_SHRINK(av, avl);
MPX_SHRINK(av, avl);
- if (avl - av <=
KARATSUBA_CUTOFF
) {
+ if (avl - av <=
MPK_THRESH
) {
mpx_usqr(dv, dvl, av, avl);
return;
}
mpx_usqr(dv, dvl, av, avl);
return;
}
@@
-133,12
+139,12
@@
void mpx_ksqr(mpw *dv, mpw *dvl,
mpw *rdv = tdv + m;
UADD2(sv, svm, av, avm, avm, avl);
mpw *rdv = tdv + m;
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);
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);
mpx_ksqr(sv, ssv, avm, avl, ssv, svl);
else
mpx_usqr(sv, ssv, avm, avl);
@@
-146,7
+152,7
@@
void mpx_ksqr(mpw *dv, mpw *dvl,
UADD(rdv, sv, svm + 1);
USUB(tdv, sv, svn);
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);
mpx_ksqr(sv, ssv, av, avm, ssv, svl);
else
mpx_usqr(sv, ssv, av, avm);
@@
-207,7
+213,7
@@
static int usqr(dstr *v)
ALLOC(s, sl, 2 * m + 32);
mpx_ksqr(d, dl, a, al, s, sl);
ALLOC(s, sl, 2 * m + 32);
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);
fprintf(stderr, "\n*** usqr failed\n");
dumpmp(" a", a, al);
dumpmp("expected", c, cl);