===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/engine/C.c,v
retrieving revision 1.4
retrieving revision 1.7
diff -u -p -r1.4 -r1.7
--- OpenXM_contrib2/asir2000/engine/C.c	2001/03/13 01:10:25	1.4
+++ OpenXM_contrib2/asir2000/engine/C.c	2001/05/28 08:22:01	1.7
@@ -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.6 2001/03/14 06:04:53 noro Exp $ 
 */
 #include "ca.h"
 #include "inline.h"
@@ -229,17 +229,47 @@ P *gp;
 	}
 }
 
+void ptosfp(p,pr)
+P p;
+P *pr;
+{
+	DCP dc,dcr,dcr0;
+	GFS a;
+	P t;
+
+	if ( !p )
+		*pr = 0;
+	else if ( NUM(p) ) {
+		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(f,gp)
 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,6 +278,34 @@ P *gp;
 	}
 }
 
+void sf_galois_action(p,e,pr)
+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;
+	} 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);
+		}
+	}
+}
+
 void ptolmp(p,pr)
 P p;
 P *pr;
@@ -762,4 +820,27 @@ P *pr;
 			}
 		NEXT(dc) = 0; MKP(v,dc0,*pr);
 	}
+}
+
+/* f(p) -> f(x) */
+
+void enc_to_p(p,a,v,pr)
+int p,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);
 }