=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/engine/M.c,v retrieving revision 1.3 retrieving revision 1.6 diff -u -p -r1.3 -r1.6 --- OpenXM_contrib2/asir2000/engine/M.c 2000/08/22 05:04:04 1.3 +++ OpenXM_contrib2/asir2000/engine/M.c 2001/06/25 01:35:21 1.6 @@ -45,7 +45,7 @@ * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE, * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE. * - * $OpenXM: OpenXM_contrib2/asir2000/engine/M.c,v 1.2 2000/08/21 08:31:25 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/engine/M.c,v 1.5 2001/06/07 04:54:40 noro Exp $ */ #include "ca.h" #include "base.h" @@ -224,9 +224,7 @@ ML *pl; mgcd = W_UMALLOC(n); for ( j = 0, d = n; j < count && d; ) { - m = lprime[index++]; - if ( !m ) - error("sqfrum : lprime[] exhausted."); + m = get_lprime(index++); if ( rem(NM((Q)COEF(DC(f))),m) == 0 ) continue; ptoum(m,f,wf); @@ -394,6 +392,23 @@ int n,bound; return p; } +BM BMALLOC(n,bound) +int n,bound; +{ + BM p; + UM *c; + int i; + + p = (BM)MALLOC(TRUESIZE(oBM,n,UM)); + DEG(p) = n; + for ( i = 0, c = (UM *)COEF(p); i <= n; i++ ) { + c[i] = UMALLOC(bound); + DEG(c[i]) = -1; + bzero((char *)COEF(c[i]),(bound+1)*sizeof(int)); + } + return p; +} + void mullum(mod,n,f1,f2,fr) int mod,n; LUM f1,f2,fr; @@ -546,7 +561,7 @@ register int **c; return (-1); } -#if defined(__GNUC__) || defined(THINK_C) +#if defined(__GNUC__) const #endif int sprime[] = { @@ -701,5 +716,3 @@ int sprime[] = { 16273,16301,16319,16333,16339,16349,16361,16363,16369,16381, 0 }; - -#include "prime.h"