===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/engine/C.c,v
retrieving revision 1.9
retrieving revision 1.14
diff -u -p -r1.9 -r1.14
--- OpenXM_contrib2/asir2000/engine/C.c	2001/06/25 01:35:20	1.9
+++ OpenXM_contrib2/asir2000/engine/C.c	2003/01/16 00:33:28	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/C.c,v 1.8 2001/06/20 09:30:33 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/engine/C.c,v 1.13 2003/01/04 09:06:17 noro Exp $ 
 */
 #include "ca.h"
 #include "inline.h"
@@ -54,9 +54,7 @@
 V up_var;
 
 /* binary has at least 32 leading 0 chars. */
-void binaryton(binary,np)
-char *binary;
-N *np;
+void binaryton(char *binary,N *np)
 {
 	int i,w,len;
 	N n;
@@ -80,9 +78,7 @@ N *np;
 }
 
 /* hex has at least 8 leading 0 chars. */
-void hexton(hex,np)
-char *hex;
-N *np;
+void hexton(char *hex,N *np)
 {
 	int i,w,len;
 	N n;
@@ -105,9 +101,7 @@ N *np;
 	}
 }
 
-void ntobn(base,n,nrp)
-int base;
-N n,*nrp;
+void ntobn(int base,N n,N *nrp)
 {
 	int i,d,plc;
 	unsigned int *c,*x,*w;
@@ -143,9 +137,7 @@ N n,*nrp;
 		BD(nr)[i] = c[i];
 }
 
-void bnton(base,n,nrp)
-int base;
-N n,*nrp;
+void bnton(int base,N n,N *nrp)
 {
 	unsigned int carry;
 	unsigned int *x,*w;
@@ -173,10 +165,7 @@ N n,*nrp;
 		BD(nr)[i] = x[i];
 }
 
-void ptomp(m,p,pr)
-int m;
-P p;
-P *pr;
+void ptomp(int m,P p,P *pr)
 {
 	DCP dc,dcr,dcr0;
 	Q q;
@@ -210,9 +199,7 @@ P *pr;
 	}
 }
 		
-void mptop(f,gp)
-P f;
-P *gp;
+void mptop(P f,P *gp)
 {
 	DCP dc,dcr,dcr0;
 	Q q;
@@ -229,9 +216,7 @@ P *gp;
 	}
 }
 
-void ptosfp(p,pr)
-P p;
-P *pr;
+void ptosfp(P p,P *pr)
 {
 	DCP dc,dcr,dcr0;
 	GFS a;
@@ -240,7 +225,11 @@ P *pr;
 	if ( !p )
 		*pr = 0;
 	else if ( NUM(p) ) {
-		qtogfs((Q)p,&a); *pr = (P)a;
+		if ( NID((Num)p) == N_GFS )
+			*pr = (P)p;
+		else {
+			qtogfs((Q)p,&a); *pr = (P)a;
+		}
 	} else {
 		for ( dc = DC(p), dcr0 = 0; dc; dc = NEXT(dc) ) {
 			ptosfp(COEF(dc),&t);
@@ -256,9 +245,7 @@ P *pr;
 	}
 }
 
-void sfptop(f,gp)
-P f;
-P *gp;
+void sfptop(P f,P *gp)
 {
 	DCP dc,dcr,dcr0;
 	Q q;
@@ -278,19 +265,35 @@ P *gp;
 	}
 }
 
-void sf_galois_action(p,e,pr)
-P p;
-Q e;
-P *pr;
+void sfptopsfp(P f,V v,P *gp)
 {
 	DCP dc,dcr,dcr0;
+	Q q;
+	P fq;
+
+	if ( !f ) 
+		*gp = 0;
+	else if ( NUM(f) )
+		gfstopgfs((GFS)f,v,gp);
+	else {
+		for ( dc = DC(f), dcr0 = 0; dc; dc = NEXT(dc) ) {
+			NEXTDC(dcr0,dcr); DEG(dcr) = DEG(dc); 
+			sfptopsfp(COEF(dc),v,&COEF(dcr));
+		}
+		NEXT(dcr) = 0; MKP(VR(f),dcr0,*gp);
+	}
+}
+
+void sf_galois_action(P p,Q e,P *pr)
+{
+	DCP dc,dcr,dcr0;
 	GFS a;
 	P t;
 
 	if ( !p )
 		*pr = 0;
 	else if ( NUM(p) ) {
-		gfs_galois_action(p,e,&a); *pr = (P)a;
+		gfs_galois_action((GFS)p,e,&a); *pr = (P)a;
 	} else {
 		for ( dc = DC(p), dcr0 = 0; dc; dc = NEXT(dc) ) {
 			sf_galois_action(COEF(dc),e,&t);
@@ -306,11 +309,36 @@ P *pr;
 	}
 }
 
-void ptolmp(p,pr)
-P p;
-P *pr;
+/* GF(pn)={0,1,a,a^2,...} -> GF(pm)={0,1,b,b^2,..} ; a -> b^k */
+
+void sf_embed(P p,int k,int pm,P *pr)
 {
 	DCP dc,dcr,dcr0;
+	GFS a;
+	P t;
+
+	if ( !p )
+		*pr = 0;
+	else if ( NUM(p) ) {
+		gfs_embed((GFS)p,k,pm,&a); *pr = (P)a;
+	} else {
+		for ( dc = DC(p), dcr0 = 0; dc; dc = NEXT(dc) ) {
+			sf_embed(COEF(dc),k,pm,&t);
+			if ( t ) {
+				NEXTDC(dcr0,dcr); DEG(dcr) = DEG(dc); COEF(dcr) = t;
+			}
+		}
+		if ( !dcr0 ) 
+			*pr = 0;
+		else {
+			NEXT(dcr) = 0; MKP(VR(p),dcr0,*pr);
+		}
+	}
+}
+
+void ptolmp(P p,P *pr)
+{
+	DCP dc,dcr,dcr0;
 	LM a;
 	P t;
 
@@ -333,9 +361,7 @@ P *pr;
 	}
 }
 		
-void lmptop(f,gp)
-P f;
-P *gp;
+void lmptop(P f,P *gp)
 {
 	DCP dc,dcr,dcr0;
 	Q q;
@@ -352,10 +378,7 @@ P *gp;
 	}
 }
 
-void ptoum(m,f,wf)
-int m;
-P f;
-UM wf;
+void ptoum(int m,P f,UM wf)
 {
 	unsigned int r;
 	int i;
@@ -373,10 +396,7 @@ UM wf;
 	degum(wf,UDEG(f));
 }
 
-void umtop(v,w,f)
-V v;
-UM w;
-P *f;
+void umtop(V v,UM w,P *f)
 {
 	int *c;
 	DCP dc,dc0;
@@ -399,9 +419,7 @@ P *f;
 	}
 }
 
-void ptosfum(f,wf)
-P f;
-UM wf;
+void ptosfum(P f,UM wf)
 {
 	GFS c;
 	int i;
@@ -409,7 +427,8 @@ UM wf;
 
 	if ( OID(f) == O_N ) {
 		DEG(wf) = 0;
-		COEF(wf)[0] = FTOIF(CONT((GFS)f));
+		ntogfs((Obj)f,&c);
+		COEF(wf)[0] = FTOIF(CONT(c));
 		return;
 	}
 
@@ -417,17 +436,14 @@ UM wf;
 		COEF(wf)[i] = 0;
 
 	for ( dc = DC(f); dc; dc = NEXT(dc) ) {
-		c = (GFS)COEF(dc);
+		ntogfs((Obj)COEF(dc),&c);
 		if ( c )
 			COEF(wf)[QTOS(DEG(dc))] = FTOIF(CONT(c));
 	}
 	degum(wf,UDEG(f));
 }
 
-void sfumtop(v,w,f)
-V v;
-UM w;
-P *f;
+void sfumtop(V v,UM w,P *f)
 {
 	int *c;
 	DCP dc,dc0;
@@ -456,9 +472,7 @@ P *f;
 	}
 }
 
-void ptoup(n,nr)
-P n;
-UP *nr;
+void ptoup(P n,UP *nr)
 {
 	DCP dc;
 	UP r;
@@ -479,9 +493,7 @@ UP *nr;
 	}
 }
 
-void uptop(n,nr)
-UP n;
-P *nr;
+void uptop(UP n,P *nr)
 {
 	int i;
 	DCP dc0,dc;
@@ -501,10 +513,7 @@ P *nr;
 	}
 }
 
-void ulmptoum(m,f,wf)
-int m;
-UP f;
-UM wf;
+void ulmptoum(int m,UP f,UM wf)
 {
 	int i,d;
 	LM *c;
@@ -519,10 +528,7 @@ UM wf;
 	}
 }
 
-void objtobobj(base,p,rp)
-int base;
-Obj p;
-Obj *rp;
+void objtobobj(int base,Obj p,Obj *rp)
 {
 	if ( !p )
 		*rp = 0;
@@ -545,10 +551,7 @@ Obj *rp;
 		}
 }
 
-void bobjtoobj(base,p,rp)
-int base;
-Obj p;
-Obj *rp;
+void bobjtoobj(int base,Obj p,Obj *rp)
 {
 	if ( !p )
 		*rp = 0;
@@ -571,10 +574,7 @@ Obj *rp;
 		}
 }
 
-void numtobnum(base,p,rp)
-int base;
-Num p;
-Num *rp;
+void numtobnum(int base,Num p,Num *rp)
 {
 	N nm,dn,body;
 	Q q;
@@ -604,10 +604,7 @@ Num *rp;
 		}
 }
 
-void bnumtonum(base,p,rp)
-int base;
-Num p;
-Num *rp;
+void bnumtonum(int base,Num p,Num *rp)
 {
 	N nm,dn,body;
 	Q q;
@@ -637,10 +634,7 @@ Num *rp;
 		}
 }
 
-void ptobp(base,p,rp)
-int base;
-P p;
-P *rp;
+void ptobp(int base,P p,P *rp)
 {
 	DCP dcr0,dcr,dc;
 
@@ -656,10 +650,7 @@ P *rp;
 	}
 }
 
-void bptop(base,p,rp)
-int base;
-P p;
-P *rp;
+void bptop(int base,P p,P *rp)
 {
 	DCP dcr0,dcr,dc;
 
@@ -675,10 +666,7 @@ P *rp;
 	}
 }
 
-void listtoblist(base,p,rp)
-int base;
-LIST p;
-LIST *rp;
+void listtoblist(int base,LIST p,LIST *rp)
 {
 	NODE nr0,nr,n;
 
@@ -694,10 +682,7 @@ LIST *rp;
 	}
 }
 
-void blisttolist(base,p,rp)
-int base;
-LIST p;
-LIST *rp;
+void blisttolist(int base,LIST p,LIST *rp)
 {
 	NODE nr0,nr,n;
 
@@ -713,10 +698,7 @@ LIST *rp;
 	}
 }
 
-void vecttobvect(base,p,rp)
-int base;
-VECT p;
-VECT *rp;
+void vecttobvect(int base,VECT p,VECT *rp)
 {
 	int i,l;
 	VECT r;
@@ -731,10 +713,7 @@ VECT *rp;
 	}
 }
 
-void bvecttovect(base,p,rp)
-int base;
-VECT p;
-VECT *rp;
+void bvecttovect(int base,VECT p,VECT *rp)
 {
 	int i,l;
 	VECT r;
@@ -749,10 +728,7 @@ VECT *rp;
 	}
 }
 
-void mattobmat(base,p,rp)
-int base;
-MAT p;
-MAT *rp;
+void mattobmat(int base,MAT p,MAT *rp)
 {
 	int row,col,i,j;
 	MAT r;
@@ -768,10 +744,7 @@ MAT *rp;
 	}
 }
 
-void bmattomat(base,p,rp)
-int base;
-MAT p;
-MAT *rp;
+void bmattomat(int base,MAT p,MAT *rp)
 {
 	int row,col,i,j;
 	MAT r;
@@ -787,9 +760,7 @@ MAT *rp;
 	}
 }
 
-void n32ton27(g,rp)
-N g;
-N *rp;
+void n32ton27(N g,N *rp)
 {
 	int i,j,k,l,r,bits,words;
 	unsigned int t;
@@ -813,9 +784,7 @@ N *rp;
 	b[words-1] &= ((1<<r)-1);
 }
 
-void n27ton32(a,rp)
-N a;
-N *rp;
+void n27ton32(N a,N *rp)
 {
 	int i,j,k,l,r,bits,words;
 	unsigned int t;
@@ -838,9 +807,7 @@ N *rp;
 	}
 }
 
-void mptoum(p,pr)
-P p;
-UM pr;
+void mptoum(P p,UM pr)
 {
 	DCP dc;
 
@@ -856,10 +823,7 @@ UM pr;
 	}
 }
 
-void umtomp(v,p,pr)
-V v;
-UM p;
-P *pr;
+void umtomp(V v,UM p,P *pr)
 {
 	DCP dc,dc0;
 	int i;
@@ -881,10 +845,7 @@ P *pr;
 
 /* f(p) -> f(x) */
 
-void enc_to_p(p,a,v,pr)
-int p,a;
-V v;
-P *pr;
+void enc_to_p(int p,int a,V v,P *pr)
 {
 	DCP dc,dct;
 	int i,c;