===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/engine/C.c,v
retrieving revision 1.4
retrieving revision 1.14
diff -u -p -r1.4 -r1.14
--- OpenXM_contrib2/asir2000/engine/C.c	2001/03/13 01:10:25	1.4
+++ 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.3 2000/08/22 05:04:03 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,17 +216,47 @@ P *gp;
 	}
 }
 
-void sfptop(f,gp)
-P f;
-P *gp;
+void ptosfp(P p,P *pr)
 {
 	DCP dc,dcr,dcr0;
+	GFS a;
+	P t;
+
+	if ( !p )
+		*pr = 0;
+	else if ( NUM(p) ) {
+		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);
+			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 sfptop(P f,P *gp)
+{
+	DCP dc,dcr,dcr0;
 	Q q;
+	MQ fq;
 
 	if ( !f ) 
 		*gp = 0;
 	else if ( NUM(f) ) {
-		gfstomq((GFS)f,gp);
+		gfstomq((GFS)f,&fq);
+		STOQ(CONT(fq),q);
+		*gp = (P)q;
 	} else {
 		for ( dc = DC(f), dcr0 = 0; dc; dc = NEXT(dc) ) {
 			NEXTDC(dcr0,dcr); DEG(dcr) = DEG(dc); sfptop(COEF(dc),&COEF(dcr));
@@ -248,11 +265,80 @@ P *gp;
 	}
 }
 
-void ptolmp(p,pr)
-P p;
-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((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);
+			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);
+		}
+	}
+}
+
+/* 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;
 
@@ -275,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;
@@ -294,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;
@@ -315,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;
@@ -341,11 +419,62 @@ P *f;
 	}
 }
 
-void ptoup(n,nr)
-P n;
-UP *nr;
+void ptosfum(P f,UM wf)
 {
+	GFS c;
+	int i;
 	DCP dc;
+
+	if ( OID(f) == O_N ) {
+		DEG(wf) = 0;
+		ntogfs((Obj)f,&c);
+		COEF(wf)[0] = FTOIF(CONT(c));
+		return;
+	}
+
+	for ( i = UDEG(f); i >= 0; i-- ) 
+		COEF(wf)[i] = 0;
+
+	for ( dc = DC(f); dc; dc = NEXT(dc) ) {
+		ntogfs((Obj)COEF(dc),&c);
+		if ( c )
+			COEF(wf)[QTOS(DEG(dc))] = FTOIF(CONT(c));
+	}
+	degum(wf,UDEG(f));
+}
+
+void sfumtop(V v,UM w,P *f)
+{
+	int *c;
+	DCP dc,dc0;
+	int i,t;
+	GFS q;
+
+	if ( DEG(w) < 0 )
+		*f = 0;
+	else if ( DEG(w) == 0 ) {
+		t = COEF(w)[0];
+		t = IFTOF(t);
+		MKGFS(t,q);
+		*f = (P)q;
+	} else {
+		for ( i = DEG(w), c = COEF(w), dc0 = 0; i >= 0; i-- ) 
+			if ( c[i] ) {
+				NEXTDC(dc0,dc);
+				STOQ(i,DEG(dc));
+				t = COEF(w)[i];
+				t = IFTOF(t);
+				MKGFS(t,q);
+				COEF(dc) = (P)q;
+			}
+		NEXT(dc) = 0;
+		MKP(v,dc0,*f);
+	}
+}
+
+void ptoup(P n,UP *nr)
+{
+	DCP dc;
 	UP r;
 	int d;
 
@@ -364,9 +493,7 @@ UP *nr;
 	}
 }
 
-void uptop(n,nr)
-UP n;
-P *nr;
+void uptop(UP n,P *nr)
 {
 	int i;
 	DCP dc0,dc;
@@ -386,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;
@@ -404,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;
@@ -430,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;
@@ -456,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;
@@ -489,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;
@@ -522,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;
 
@@ -541,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;
 
@@ -560,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;
 
@@ -579,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;
 
@@ -598,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;
@@ -616,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;
@@ -634,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;
@@ -653,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;
@@ -672,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;
@@ -698,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;
@@ -723,9 +807,7 @@ N *rp;
 	}
 }
 
-void mptoum(p,pr)
-P p;
-UM pr;
+void mptoum(P p,UM pr)
 {
 	DCP dc;
 
@@ -741,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;
@@ -762,4 +841,24 @@ P *pr;
 			}
 		NEXT(dc) = 0; MKP(v,dc0,*pr);
 	}
+}
+
+/* f(p) -> f(x) */
+
+void enc_to_p(int p,int a,V v,P *pr)
+{
+	DCP dc,dct;
+	int i,c;
+	Q dq,cq;
+
+	dc = 0;
+	for ( i = 0; a; i++, a /= p ) {
+		c = a%p;
+		if ( c ) {
+			STOQ(i,dq); STOQ(c,cq);
+			NEWDC(dct); DEG(dct) = dq; COEF(dct) = (P)cq;
+			NEXT(dct) = dc; dc = dct;
+		}
+	}
+	MKP(v,dc,*pr);
 }