=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/engine/_distm.c,v retrieving revision 1.9 retrieving revision 1.15 diff -u -p -r1.9 -r1.15 --- OpenXM_contrib2/asir2000/engine/_distm.c 2001/09/11 03:13:43 1.9 +++ OpenXM_contrib2/asir2000/engine/_distm.c 2012/12/17 07:20:44 1.15 @@ -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.8 2001/03/19 04:02:03 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/engine/_distm.c,v 1.14 2009/03/16 16:43:02 ohara Exp $ */ #include "ca.h" #include "inline.h" @@ -53,24 +53,13 @@ extern int (*cmpdl)(); extern int do_weyl; -void dpto_dp(); -void _dptodp(); -void _adddl_dup(); -void adddl_destructive(); -void _mulmdm_dup(); -void _free_dp(); -void _comm_mulmd_dup(); -void _weyl_mulmd_dup(); -void _weyl_mulmmm_dup(); -void _weyl_mulmdm_dup(); -void _comm_mulmd_tab(); -void _comm_mulmd_tab_destructive(); - MP _mp_free_list; DP _dp_free_list; DL _dl_free_list; int current_dl_length; +void GC_gcollect(); + void _free_private_storage() { _mp_free_list = 0; @@ -87,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 *)MALLOC(dl_len*sizeof(int)); *(DL *)p = _dl_free_list; _dl_free_list = (DL)p; } @@ -105,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)MALLOC(sizeof(struct oMP)); + p->next = _mp_free_list; _mp_free_list = p; } } @@ -118,17 +107,15 @@ 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)MALLOC(sizeof(struct oDP)); + p->body = (MP)_dp_free_list; _dp_free_list = p; } } /* merge p1 and p2 into pr */ -void _addmd_destructive(mod,p1,p2,pr) -int mod; -DP p1,p2,*pr; +void _addmd_destructive(int mod,DP p1,DP p2,DP *pr) { int n; MP m1,m2,mr,mr0,s; @@ -182,9 +169,7 @@ DP p1,p2,*pr; } } -void _mulmd_dup(mod,p1,p2,pr) -int mod; -DP p1,p2,*pr; +void _mulmd_dup(int mod,DP p1,DP p2,DP *pr) { if ( !do_weyl ) _comm_mulmd_dup(mod,p1,p2,pr); @@ -192,9 +177,7 @@ DP p1,p2,*pr; _weyl_mulmd_dup(mod,p1,p2,pr); } -void _comm_mulmd_dup(mod,p1,p2,pr) -int mod; -DP p1,p2,*pr; +void _comm_mulmd_dup(int mod,DP p1,DP p2,DP *pr) { MP m; DP s,t,u; @@ -212,7 +195,7 @@ DP p1,p2,*pr; l = l1; } if ( l > wlen ) { - if ( w ) GC_free(w); + if ( w ) GCFREE(w); w = (MP *)MALLOC(l*sizeof(MP)); wlen = l; } @@ -226,13 +209,11 @@ DP p1,p2,*pr; } } -void _weyl_mulmd_dup(mod,p1,p2,pr) -int mod; -DP p1,p2,*pr; +void _weyl_mulmd_dup(int mod,DP p1,DP p2,DP *pr) { MP m; DP s,t,u; - int i,l,l1; + int i,l; static MP *w; static int wlen; @@ -241,7 +222,7 @@ DP p1,p2,*pr; else { for ( m = BDY(p1), l = 0; m; m = NEXT(m), l++ ); if ( l > wlen ) { - if ( w ) GC_free(w); + if ( w ) GCFREE(w); w = (MP *)MALLOC(l*sizeof(MP)); wlen = l; } @@ -255,15 +236,11 @@ DP p1,p2,*pr; } } -void _mulmdm_dup(mod,p,m0,pr) -int mod; -DP p; -MP m0; -DP *pr; +void _mulmdm_dup(int mod,DP p,MP m0,DP *pr) { MP m,mr,mr0; DL d,dt,dm; - int c,n,r,i; + int c,n,i,c1,c2; int *pt,*p1,*p2; if ( !p ) @@ -272,7 +249,9 @@ DP *pr; for ( mr0 = 0, m = BDY(p), c = ITOS(C(m0)), d = m0->dl, n = NV(p); m; m = NEXT(m) ) { _NEXTMP(mr0,mr); - C(mr) = STOI(dmar(ITOS(C(m)),c,0,mod)); + c1 = ITOS(C(m)); + DMAR(c1,c,0,mod,c2); + C(mr) = (P)STOI(c2); _NEWDL_NOINIT(dt,n); mr->dl = dt; dm = m->dl; dt->td = d->td + dm->td; @@ -285,13 +264,7 @@ DP *pr; } } -void _weyl_mulmmm_dup_bug(); - -void _weyl_mulmdm_dup(mod,m0,p,pr) -int mod; -MP m0; -DP p; -DP *pr; +void _weyl_mulmdm_dup(int mod,MP m0,DP p,DP *pr) { DP r,t,t1; MP m; @@ -307,7 +280,7 @@ DP *pr; else { for ( m = BDY(p), l = 0; m; m = NEXT(m), l++ ); if ( l > wlen ) { - if ( w ) GC_free(w); + if ( w ) GCFREE(w); w = (MP *)MALLOC(l*sizeof(MP)); wlen = l; } @@ -319,8 +292,8 @@ DP *pr; for ( i = 0, tlen = 1; i < n2; i++ ) tlen *= d0->d[n2+i]+1; if ( tlen > rtlen ) { - if ( tab ) GC_free(tab); - if ( psum ) GC_free(psum); + if ( tab ) GCFREE(tab); + if ( psum ) GCFREE(psum); rtlen = tlen; tab = (struct cdlm *)MALLOC(rtlen*sizeof(struct cdlm)); psum = (MP *)MALLOC(rtlen*sizeof(MP)); @@ -349,18 +322,11 @@ DP *pr; /* m0 = x0^d0*x1^d1*... * dx0^d(n/2)*dx1^d(n/2+1)*... */ -void _weyl_mulmmm_dup(mod,m0,m1,n,rtab,rtablen) -int mod; -MP m0,m1; -int n; -struct cdlm *rtab; -int rtablen; +void _weyl_mulmmm_dup(int mod,MP m0,MP m1,int n,struct cdlm *rtab,int rtablen) { - MP m,mr,mr0; - DP r,t,t1; - int c,c0,c1,cc; + int c,c0,c1; DL d,d0,d1,dt; - int i,j,a,b,k,l,n2,s,min,h,curlen; + int i,j,a,b,k,l,n2,s,min,curlen; struct cdlm *p; static int *ctab; static struct cdlm *tab; @@ -389,7 +355,7 @@ int rtablen; rtab[0].d = d; if ( rtablen > tmptablen ) { - if ( tmptab ) GC_free(tmptab); + if ( tmptab ) GCFREE(tmptab); tmptab = (struct cdlm *)MALLOC(rtablen*sizeof(struct cdlm)); tmptablen = rtablen; } @@ -397,10 +363,13 @@ int rtablen; 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; @@ -413,14 +382,12 @@ int rtablen; continue; } if ( k+1 > tablen ) { - if ( tab ) GC_free(tab); - if ( ctab ) GC_free(ctab); + if ( tab ) GCFREE(tab); + if ( ctab ) GCFREE(ctab); tablen = k+1; 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); @@ -429,17 +396,17 @@ int rtablen; 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]; } @@ -469,14 +436,7 @@ int rtablen; ] */ -void _comm_mulmd_tab(mod,nv,t,n,t1,n1,rt) -int mod; -int nv; -struct cdlm *t; -int n; -struct cdlm *t1; -int n1; -struct cdlm *rt; +void _comm_mulmd_tab(int mod,int nv,struct cdlm *t,int n,struct cdlm *t1,int n1,struct cdlm *rt) { int i,j; struct cdlm *p; @@ -498,13 +458,7 @@ struct cdlm *rt; } } -void _comm_mulmd_tab_destructive(mod,nv,t,n,t1,n1) -int mod; -int nv; -struct cdlm *t; -int n; -struct cdlm *t1; -int n1; +void _comm_mulmd_tab_destructive(int mod,int nv,struct cdlm *t,int n,struct cdlm *t1,int n1) { int i,j; struct cdlm *p; @@ -533,9 +487,7 @@ int n1; } } -void dlto_dl(d,dr) -DL d; -DL *dr; +void dlto_dl(DL d,DL *dr) { int i,n; DL t; @@ -547,9 +499,7 @@ DL *dr; t->d[i] = d->d[i]; } -void _dltodl(d,dr) -DL d; -DL *dr; +void _dltodl(DL d,DL *dr) { int i,n; DL t; @@ -561,10 +511,7 @@ DL *dr; t->d[i] = d->d[i]; } -void _adddl_dup(n,d1,d2,dr) -int n; -DL d1,d2; -DL *dr; +void _adddl_dup(int n,DL d1,DL d2,DL *dr) { DL dt; int i; @@ -576,17 +523,14 @@ DL *dr; dt->d[i] = d1->d[i]+d2->d[i]; } -void _free_dlarray(a,n) -DL *a; -int n; +void _free_dlarray(DL *a,int n) { int i; for ( i = 0; i < n; i++ ) { _FREEDL(a[i]); } } -void _free_dp(f) -DP f; +void _free_dp(DP f) { MP m,s; @@ -599,9 +543,7 @@ DP f; _FREEDP(f); } -void dpto_dp(p,r) -DP p; -DP *r; +void dpto_dp(DP p,DP *r) { MP m,mr0,mr; DL t; @@ -623,9 +565,7 @@ DP *r; } } -void _dptodp(p,r) -DP p; -DP *r; +void _dptodp(DP p,DP *r) { MP m,mr0,mr; @@ -650,9 +590,7 @@ DP *r; * return : a merged list */ -NODE _symb_merge(m1,m2,n) -NODE m1,m2; -int n; +NODE _symb_merge(NODE m1,NODE m2,int n) { NODE top,prev,cur,m,t; @@ -696,26 +634,9 @@ int n; } } -/* XXX : bellow should be placed in another file */ - -void dpto_dp(); -void _dptodp(); -void _adddl_dup(); -void adddl_destructive(); -void _muldm_dup(); -void _free_dp(); -void _comm_muld_dup(); -void _weyl_muld_dup(); -void _weyl_mulmm_dup(); -void _weyl_muldm_dup(); -void _comm_muld_tab(); -void _comm_muld_tab_destructive(); - /* merge p1 and p2 into pr */ -void _addd_destructive(vl,p1,p2,pr) -VL vl; -DP p1,p2,*pr; +void _addd_destructive(VL vl,DP p1,DP p2,DP *pr) { int n; MP m1,m2,mr,mr0,s; @@ -767,9 +688,7 @@ DP p1,p2,*pr; } } -void _muld_dup(vl,p1,p2,pr) -VL vl; -DP p1,p2,*pr; +void _muld_dup(VL vl,DP p1,DP p2,DP *pr) { if ( !do_weyl ) _comm_muld_dup(vl,p1,p2,pr); @@ -777,9 +696,7 @@ DP p1,p2,*pr; _weyl_muld_dup(vl,p1,p2,pr); } -void _comm_muld_dup(vl,p1,p2,pr) -VL vl; -DP p1,p2,*pr; +void _comm_muld_dup(VL vl,DP p1,DP p2,DP *pr) { MP m; DP s,t,u; @@ -797,7 +714,7 @@ DP p1,p2,*pr; l = l1; } if ( l > wlen ) { - if ( w ) GC_free(w); + if ( w ) GCFREE(w); w = (MP *)MALLOC(l*sizeof(MP)); wlen = l; } @@ -811,13 +728,11 @@ DP p1,p2,*pr; } } -void _weyl_muld_dup(vl,p1,p2,pr) -VL vl; -DP p1,p2,*pr; +void _weyl_muld_dup(VL vl,DP p1,DP p2,DP *pr) { MP m; DP s,t,u; - int i,l,l1; + int i,l; static MP *w; static int wlen; @@ -826,7 +741,7 @@ DP p1,p2,*pr; else { for ( m = BDY(p1), l = 0; m; m = NEXT(m), l++ ); if ( l > wlen ) { - if ( w ) GC_free(w); + if ( w ) GCFREE(w); w = (MP *)MALLOC(l*sizeof(MP)); wlen = l; } @@ -840,16 +755,12 @@ DP p1,p2,*pr; } } -void _muldm_dup(vl,p,m0,pr) -VL vl; -DP p; -MP m0; -DP *pr; +void _muldm_dup(VL vl,DP p,MP m0,DP *pr) { MP m,mr,mr0; DL d,dt,dm; P c; - int n,r,i; + int n,i; int *pt,*p1,*p2; if ( !p ) @@ -871,11 +782,7 @@ DP *pr; } } -void _weyl_muldm_dup(vl,m0,p,pr) -VL vl; -MP m0; -DP p; -DP *pr; +void _weyl_muldm_dup(VL vl,MP m0,DP p,DP *pr) { DP r,t,t1; MP m; @@ -891,7 +798,7 @@ DP *pr; else { for ( m = BDY(p), l = 0; m; m = NEXT(m), l++ ); if ( l > wlen ) { - if ( w ) GC_free(w); + if ( w ) GCFREE(w); w = (MP *)MALLOC(l*sizeof(MP)); wlen = l; } @@ -903,8 +810,8 @@ DP *pr; for ( i = 0, tlen = 1; i < n2; i++ ) tlen *= d0->d[n2+i]+1; if ( tlen > rtlen ) { - if ( tab ) GC_free(tab); - if ( psum ) GC_free(psum); + if ( tab ) GCFREE(tab); + if ( psum ) GCFREE(psum); rtlen = tlen; tab = (struct cdl *)MALLOC(rtlen*sizeof(struct cdl)); psum = (MP *)MALLOC(rtlen*sizeof(MP)); @@ -933,21 +840,13 @@ DP *pr; /* m0 = x0^d0*x1^d1*... * dx0^d(n/2)*dx1^d(n/2+1)*... */ -void _weyl_mulmm_dup(vl,m0,m1,n,rtab,rtablen) -VL vl; -MP m0,m1; -int n; -struct cdl *rtab; -int rtablen; +void _weyl_mulmm_dup(VL vl,MP m0,MP m1,int n,struct cdl *rtab,int rtablen) { - MP m,mr,mr0; - DP r,t,t1; P c; - int c0,c1,cc; DL d,d0,d1,dt; - int i,j,a,b,k,l,n2,s,min,h,curlen; + int i,j,a,b,k,l,n2,s,min,curlen; struct cdl *p; - static P *ctab; + static Q *ctab; static struct cdl *tab; static int tablen; static struct cdl *tmptab; @@ -973,7 +872,7 @@ int rtablen; rtab[0].d = d; if ( rtablen > tmptablen ) { - if ( tmptab ) GC_free(tmptab); + if ( tmptab ) GCFREE(tmptab); tmptab = (struct cdl *)MALLOC(rtablen*sizeof(struct cdl)); tmptablen = rtablen; } @@ -981,10 +880,13 @@ int rtablen; 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; @@ -997,14 +899,12 @@ int rtablen; continue; } if ( k+1 > tablen ) { - if ( tab ) GC_free(tab); - if ( ctab ) GC_free(ctab); + if ( tab ) GCFREE(tab); + if ( ctab ) GCFREE(ctab); tablen = k+1; tab = (struct cdl *)MALLOC(tablen*sizeof(struct cdl)); - ctab = (P *)MALLOC(tablen*sizeof(P)); + 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); @@ -1013,19 +913,19 @@ int rtablen; 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]; + 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 = ctab[j]; + tab[j].c = (P)ctab[j]; } #if 0 _comm_muld_tab(vl,n,rtab,curlen,tab,k+1,tmptab); @@ -1053,14 +953,7 @@ int rtablen; ] */ -void _comm_muld_tab(vl,nv,t,n,t1,n1,rt) -VL vl; -int nv; -struct cdl *t; -int n; -struct cdl *t1; -int n1; -struct cdl *rt; +void _comm_muld_tab(VL vl,int nv,struct cdl *t,int n,struct cdl *t1,int n1,struct cdl *rt) { int i,j; struct cdl *p; @@ -1082,13 +975,7 @@ struct cdl *rt; } } -void _comm_muld_tab_destructive(vl,nv,t,n,t1,n1) -VL vl; -int nv; -struct cdl *t; -int n; -struct cdl *t1; -int n1; +void _comm_muld_tab_destructive(VL vl,int nv,struct cdl *t,int n,struct cdl *t1,int n1) { int i,j; struct cdl *p;