===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/engine/_distm.c,v
retrieving revision 1.11
retrieving revision 1.14
diff -u -p -r1.11 -r1.14
--- OpenXM_contrib2/asir2000/engine/_distm.c	2001/10/09 01:36:11	1.11
+++ OpenXM_contrib2/asir2000/engine/_distm.c	2009/03/16 16:43:02	1.14
@@ -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/_distm.c,v 1.10 2001/09/17 01:18:35 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/engine/_distm.c,v 1.13 2002/07/24 07:38:55 noro Exp $ 
 */
 #include "ca.h"
 #include "inline.h"
@@ -76,12 +76,12 @@ void _DL_alloc()
 
 /*	fprintf(stderr,"DL_alloc : %d \n",++DL_alloc_count); */
 	dl_len = (current_dl_length+1);
-#if defined(LONG_IS_64BIT)
+#if SIZEOF_LONG == 8
 	if ( dl_len & 1 )
 		dl_len += 1;
 #endif
-	p = (int *)GC_malloc(128*dl_len*sizeof(int));
 	for ( i = 0; i < 128; i++, p += dl_len ) {
+		p = (int *)GC_malloc(dl_len*sizeof(int));
 		*(DL *)p = _dl_free_list;
 		_dl_free_list = (DL)p;
 	}
@@ -94,9 +94,9 @@ void _MP_alloc()
 	static int MP_alloc_count;
 
 /*	fprintf(stderr,"MP_alloc : %d \n",++MP_alloc_count); */
-	p = (MP)GC_malloc(1024*sizeof(struct oMP));
 	for ( i = 0; i < 1024; i++ ) {
-		p[i].next = _mp_free_list; _mp_free_list = &p[i];
+		p = (MP)GC_malloc(sizeof(struct oMP));
+		p->next = _mp_free_list; _mp_free_list = p;
 	}
 }
 		
@@ -107,9 +107,9 @@ void _DP_alloc()
 	static int DP_alloc_count;
 
 /*	fprintf(stderr,"DP_alloc : %d \n",++DP_alloc_count); */
-	p = (DP)GC_malloc(1024*sizeof(struct oDP));
 	for ( i = 0; i < 1024; i++ ) {
-		p[i].body = (MP)_dp_free_list; _dp_free_list = &p[i];
+		p = (DP)GC_malloc(sizeof(struct oDP));
+		p->body = (MP)_dp_free_list; _dp_free_list = p;
 	}
 }
 
@@ -363,10 +363,13 @@ void _weyl_mulmmm_dup(int mod,MP m0,MP m1,int n,struct
 	for ( i = 0; i < n2; i++ ) {
 		a = d0->d[i]; b = d1->d[n2+i];
 		k = d0->d[n2+i]; l = d1->d[i];
+
+		/* degree of xi^a*(Di^k*xi^l)*Di^b */
+		a += l;
+		b += k;
+		s = MUL_WEIGHT(a,i)+MUL_WEIGHT(b,n2+i);
+
 		if ( !k || !l ) {
-			a += l;
-			b += k;
-			s = a+b;
 			for ( j = 0, p = rtab; j < curlen; j++, p++ ) {
 				if ( p->c ) {
 					dt = p->d;
@@ -385,8 +388,6 @@ void _weyl_mulmmm_dup(int mod,MP m0,MP m1,int n,struct
 			tab = (struct cdlm *)MALLOC(tablen*sizeof(struct cdlm));
 			ctab = (int *)MALLOC(tablen*sizeof(int));
 		}
-		/* degree of xi^a*(Di^k*xi^l)*Di^b */
-		s = a+k+l+b;
 		/* compute xi^a*(Di^k*xi^l)*Di^b */
 		min = MIN(k,l);
 		mkwcm(k,l,mod,ctab);
@@ -395,17 +396,17 @@ void _weyl_mulmmm_dup(int mod,MP m0,MP m1,int n,struct
 		if ( n & 1 )
 			for ( j = 0; j <= min; j++ ) {
 				_NEWDL(d,n);
-				d->d[i] = l-j+a; d->d[n2+i] = k-j+b;
+				d->d[i] = a-j; d->d[n2+i] = b-j;
 				d->td = s;
-				d->d[n-1] = s-(d->d[i]+d->d[n2+i]); 
+				d->d[n-1] = s-(MUL_WEIGHT(a-j,i)+MUL_WEIGHT(b-j,n2+i)); 
 				tab[j].d = d;
 				tab[j].c = ctab[j];
 			}
 		else
 			for ( j = 0; j <= min; j++ ) {
 				_NEWDL(d,n);
-				d->d[i] = l-j+a; d->d[n2+i] = k-j+b;
-				d->td = d->d[i]+d->d[n2+i]; /* XXX */
+				d->d[i] = a-j; d->d[n2+i] = b-j;
+				d->td = MUL_WEIGHT(a-j,i)+MUL_WEIGHT(b-j,n2+i);  /* XXX */
 				tab[j].d = d;
 				tab[j].c = ctab[j];
 			}
@@ -879,10 +880,13 @@ void _weyl_mulmm_dup(VL vl,MP m0,MP m1,int n,struct cd
 	for ( i = 0; i < n2; i++ ) {
 		a = d0->d[i]; b = d1->d[n2+i];
 		k = d0->d[n2+i]; l = d1->d[i];
+
+		/* degree of xi^a*(Di^k*xi^l)*Di^b */
+		a += l;
+		b += k;
+		s = MUL_WEIGHT(a,i)+MUL_WEIGHT(b,n2+i);
+
 		if ( !k || !l ) {
-			a += l;
-			b += k;
-			s = a+b;
 			for ( j = 0, p = rtab; j < curlen; j++, p++ ) {
 				if ( p->c ) {
 					dt = p->d;
@@ -901,8 +905,6 @@ void _weyl_mulmm_dup(VL vl,MP m0,MP m1,int n,struct cd
 			tab = (struct cdl *)MALLOC(tablen*sizeof(struct cdl));
 			ctab = (Q *)MALLOC(tablen*sizeof(P));
 		}
-		/* degree of xi^a*(Di^k*xi^l)*Di^b */
-		s = a+k+l+b;
 		/* compute xi^a*(Di^k*xi^l)*Di^b */
 		min = MIN(k,l);
 		mkwc(k,l,ctab);
@@ -911,17 +913,17 @@ void _weyl_mulmm_dup(VL vl,MP m0,MP m1,int n,struct cd
 		if ( n & 1 )
 			for ( j = 0; j <= min; j++ ) {
 				_NEWDL(d,n);
-				d->d[i] = l-j+a; d->d[n2+i] = k-j+b;
+				d->d[i] = a-j; d->d[n2+i] = b-j;
 				d->td = s;
-				d->d[n-1] = s-(d->d[i]+d->d[n2+i]); 
+				d->d[n-1] = s-(MUL_WEIGHT(a-j,i)+MUL_WEIGHT(b-j,n2+i));
 				tab[j].d = d;
 				tab[j].c = (P)ctab[j];
 			}
 		else
 			for ( j = 0; j <= min; j++ ) {
 				_NEWDL(d,n);
-				d->d[i] = l-j+a; d->d[n2+i] = k-j+b;
-				d->td = d->d[i]+d->d[n2+i]; /* XXX */
+				d->d[i] = a-j; d->d[n2+i] = b-j;
+				d->td = MUL_WEIGHT(a-j,i)+MUL_WEIGHT(b-j,n2+i); /* XXX */
 				tab[j].d = d;
 				tab[j].c = (P)ctab[j];
 			}