===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/poly.c,v
retrieving revision 1.12
retrieving revision 1.14
diff -u -p -r1.12 -r1.14
--- OpenXM_contrib2/asir2000/builtin/poly.c	2001/06/29 09:08:52	1.12
+++ OpenXM_contrib2/asir2000/builtin/poly.c	2001/09/03 01:04:25	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/builtin/poly.c,v 1.11 2001/05/28 08:22:00 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/builtin/poly.c,v 1.13 2001/07/13 08:25:21 noro Exp $ 
 */
 #include "ca.h"
 #include "parse.h"
@@ -64,7 +64,7 @@ void Pmergelist(), Pch_mv(), Pre_mv(), Pdeglist();
 void Pptomp(),Pmptop();
 void Pptolmp(),Plmptop();
 void Pptosfp(),Psfptop(),Psf_galois_action(),Psf_embed(),Psf_find_root();
-void Psf_minipoly();
+void Psf_minipoly(),Psf_log();
 void Pptogf2n(),Pgf2ntop(),Pgf2ntovect();
 void Pptogfpn(),Pgfpntop();
 void Pfind_root_gf2n();
@@ -155,6 +155,8 @@ struct ftab poly_tab[] = {
 	{"sf_find_root",Psf_find_root,1},
 	{"sf_minipoly",Psf_minipoly,2},
 	{"sf_embed",Psf_embed,3},
+	{"sf_log",Psf_log,1},
+
 	{"ptosfp",Pptosfp,1},
 	{"sfptop",Psfptop,1},
 	{"ptogf2n",Pptogf2n,1},
@@ -749,6 +751,7 @@ Obj *rp;
 	N n;
 	UP up;
 	UP2 up2;
+	UM dp;
 	Q q,r;
 	P p;
 	NODE n0,n1;
@@ -784,6 +787,14 @@ Obj *rp;
 			setmod_lm(NM((Q)mod));
 			setmod_gfpn((P)defpoly);
 		}
+	} else if ( ac == 3 ) {
+		/* finite extension of a small finite field */
+		current_ff = FF_GFS;
+		setmod_sf(QTOS((Q)ARG0(arg)),QTOS((Q)ARG1(arg)));
+		d = QTOS((Q)ARG2(arg));
+		generate_defpoly_sfum(d,&dp);
+		setmod_gfspn(dp);
+		current_ff = FF_GFSPN;
 	}
 	switch ( current_ff ) {
 		case FF_GFP:
@@ -946,6 +957,7 @@ Obj *rp;
 	GF2N rg,sg;
 	GFPN rpn,spn;
 	GFS rs;
+	GFSPN rspn,sspn;
 	P t;
 	Obj obj;
 
@@ -971,6 +983,10 @@ Obj *rp;
 					*rp = (Obj)rs;
 				} 
 				break;
+			case FF_GFSPN:
+				ntogfspn((Obj)p,&rspn); simpgfspn((GFSPN)rspn,&sspn);
+				*rp = (Obj)sspn;
+				break;
 			default:
 				*rp = (Obj)p;
 				break;
@@ -1208,6 +1224,18 @@ P *rp;
 	k = CONT((GFS)ARG1(arg));
 	pm = QTOS((Q)ARG2(arg));
 	sf_embed((P)ARG0(arg),k,pm,rp);
+}
+
+void Psf_log(arg,rp)
+NODE arg;
+Q *rp;
+{
+	int k;
+
+	if ( !ARG0(arg) )
+		error("sf_log : invalid armument");
+	k = CONT((GFS)ARG0(arg));
+	STOQ(k,*rp);
 }
 
 void Psf_find_root(arg,rp)