===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/engine/C.c,v
retrieving revision 1.2
retrieving revision 1.8
diff -u -p -r1.2 -r1.8
--- OpenXM_contrib2/asir2000/engine/C.c	2000/08/21 08:31:24	1.2
+++ OpenXM_contrib2/asir2000/engine/C.c	2001/06/20 09:30:33	1.8
@@ -23,7 +23,7 @@
  * shall be made on your publication or presentation in any form of the
  * results obtained by use of the SOFTWARE.
  * (4) In the event that you modify the SOFTWARE, you shall notify FLL by
- * e-mail at risa-admin@flab.fujitsu.co.jp of the detailed specification
+ * e-mail at risa-admin@sec.flab.fujitsu.co.jp of the detailed specification
  * for such modification or the source code of the modified part of the
  * SOFTWARE.
  * 
@@ -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.1.1.1 1999/12/03 07:39:07 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/engine/C.c,v 1.7 2001/05/28 08:22:01 noro Exp $ 
 */
 #include "ca.h"
 #include "inline.h"
@@ -229,6 +229,83 @@ 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,&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));
+		}
+		NEXT(dcr) = 0; MKP(VR(f),dcr0,*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;
@@ -322,6 +399,57 @@ P *f;
 	}
 }
 
+void ptosfum(f,wf)
+P f;
+UM wf;
+{
+	GFS c;
+	int i;
+	DCP dc;
+
+	for ( i = UDEG(f); i >= 0; i-- ) 
+		COEF(wf)[i] = 0;
+
+	for ( dc = DC(f); dc; dc = NEXT(dc) ) {
+		c = (GFS)COEF(dc);
+		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;
+{
+	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(n,nr)
 P n;
 UP *nr;
@@ -743,4 +871,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);
 }