===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/poly.c,v
retrieving revision 1.2
retrieving revision 1.22
diff -u -p -r1.2 -r1.22
--- OpenXM_contrib2/asir2000/builtin/poly.c	1999/12/27 04:16:30	1.2
+++ OpenXM_contrib2/asir2000/builtin/poly.c	2011/03/30 02:43:18	1.22
@@ -1,13 +1,63 @@
-/* $OpenXM: OpenXM_contrib2/asir2000/builtin/poly.c,v 1.1.1.1 1999/12/03 07:39:07 noro Exp $ */
+/*
+ * Copyright (c) 1994-2000 FUJITSU LABORATORIES LIMITED 
+ * All rights reserved.
+ * 
+ * FUJITSU LABORATORIES LIMITED ("FLL") hereby grants you a limited,
+ * non-exclusive and royalty-free license to use, copy, modify and
+ * redistribute, solely for non-commercial and non-profit purposes, the
+ * computer program, "Risa/Asir" ("SOFTWARE"), subject to the terms and
+ * conditions of this Agreement. For the avoidance of doubt, you acquire
+ * only a limited right to use the SOFTWARE hereunder, and FLL or any
+ * third party developer retains all rights, including but not limited to
+ * copyrights, in and to the SOFTWARE.
+ * 
+ * (1) FLL does not grant you a license in any way for commercial
+ * purposes. You may use the SOFTWARE only for non-commercial and
+ * non-profit purposes only, such as academic, research and internal
+ * business use.
+ * (2) The SOFTWARE is protected by the Copyright Law of Japan and
+ * international copyright treaties. If you make copies of the SOFTWARE,
+ * with or without modification, as permitted hereunder, you shall affix
+ * to all such copies of the SOFTWARE the above copyright notice.
+ * (3) An explicit reference to this SOFTWARE and its copyright owner
+ * 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@sec.flab.fujitsu.co.jp of the detailed specification
+ * for such modification or the source code of the modified part of the
+ * SOFTWARE.
+ * 
+ * THE SOFTWARE IS PROVIDED AS IS WITHOUT ANY WARRANTY OF ANY KIND. FLL
+ * MAKES ABSOLUTELY NO WARRANTIES, EXPRESSED, IMPLIED OR STATUTORY, AND
+ * EXPRESSLY DISCLAIMS ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT OF THIRD PARTIES'
+ * RIGHTS. NO FLL DEALER, AGENT, EMPLOYEES IS AUTHORIZED TO MAKE ANY
+ * MODIFICATIONS, EXTENSIONS, OR ADDITIONS TO THIS WARRANTY.
+ * UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, TORT, CONTRACT,
+ * OR OTHERWISE, SHALL FLL BE LIABLE TO YOU OR ANY OTHER PERSON FOR ANY
+ * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+ * DAMAGES OF ANY CHARACTER, INCLUDING, WITHOUT LIMITATION, DAMAGES
+ * ARISING OUT OF OR RELATING TO THE SOFTWARE OR THIS AGREEMENT, DAMAGES
+ * FOR LOSS OF GOODWILL, WORK STOPPAGE, OR LOSS OF DATA, OR FOR ANY
+ * DAMAGES, EVEN IF FLL SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF
+ * SUCH DAMAGES, OR FOR ANY CLAIM BY ANY OTHER PARTY. EVEN IF A PART
+ * OF THE SOFTWARE HAS BEEN DEVELOPED BY A THIRD PARTY, THE THIRD PARTY
+ * 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.21 2003/06/24 09:49:35 noro Exp $ 
+*/
 #include "ca.h"
 #include "parse.h"
 #include "base.h"
 
 void Pranp();
 
+void Pheadsgn();
+void Pmul_trunc(),Pquo_trunc();
 void Pumul(),Pumul_ff(),Pusquare(),Pusquare_ff(),Putmul(),Putmul_ff();
 void Pkmul(),Pksquare(),Pktmul();
-void Pord(), Pcoef0(), Pcoef(), Pdeg(), Pmindeg(), Psetmod();
+void Pord(), Premove_vars(), Pcoef0(), Pcoef(), Pdeg(), Pmindeg(), Psetmod();
 void Pcoef_gf2n();
 void getcoef(), getdeglist(), mergedeglist(), change_mvar(), restore_mvar();
 
@@ -15,6 +65,8 @@ void Pp_mag(),Pmaxblen();
 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(),Psf_log(),Psfptopsfp();
 void Pptogf2n(),Pgf2ntop(),Pgf2ntovect();
 void Pptogfpn(),Pgfpntop();
 void Pfind_root_gf2n();
@@ -50,22 +102,29 @@ void Prinvtest_gf2n();
 void Pis_irred_gf2();
 void Pis_irred_ddd_gf2();
 void Pget_next_fft_prime();
-
+void Puadj_coef();
+void Preorder();
+void Phomogeneous_part();
+void Phomogeneous_deg();
 void simp_ff(Obj,Obj *);
 void ranp(int,UP *);
 void field_order_ff(N *);
 
-extern int current_mod;
-extern GEN_UP2 current_mod_gf2n;
-extern int lm_lazy;
-
 int current_ff;
 
 struct ftab poly_tab[] = {
+	{"headsgn",Pheadsgn,1},
+	{"quo_trunc",Pquo_trunc,2},
+	{"mul_trunc",Pmul_trunc,3},
+	{"homogeneous_deg",Phomogeneous_deg,-2},
+	{"homogeneous_part",Phomogeneous_part,-3},
+	{"reorder",Preorder,3},
+	{"uadj_coef",Puadj_coef,3},
 	{"ranp",Pranp,2},
 	{"p_mag",Pp_mag,1},
 	{"maxblen",Pmaxblen,1},
 	{"ord",Pord,-1},
+	{"remove_vars",Premove_vars,1},
 	{"coef0",Pcoef0,-3},
 	{"coef",Pcoef,-3},
 	{"coef_gf2n",Pcoef_gf2n,2},
@@ -75,7 +134,7 @@ struct ftab poly_tab[] = {
 
 	{"sparsemod_gf2n",Psparsemod_gf2n,-1},
 
-	{"setmod_ff",Psetmod_ff,-2},
+	{"setmod_ff",Psetmod_ff,-3},
 	{"simp_ff",Psimp_ff,1},
 	{"extdeg_ff",Pextdeg_ff,0},
 	{"characteristic_ff",Pcharacteristic_ff,0},
@@ -94,6 +153,15 @@ struct ftab poly_tab[] = {
 	{"ptolmp",Pptolmp,1},
 	{"lmptop",Plmptop,1},
 
+	{"sf_galois_action",Psf_galois_action,2},
+	{"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},
+	{"sfptopsfp",Psfptopsfp,2},
 	{"ptogf2n",Pptogf2n,1},
 	{"gf2ntop",Pgf2ntop,-2},
 	{"gf2ntovect",Pgf2ntovect,1},
@@ -125,7 +193,7 @@ struct ftab poly_tab[] = {
 
 	{"utrunc",Putrunc,2},
 	{"udecomp",Pudecomp,2},
-	{"ureverse",Pureverse,1},
+	{"ureverse",Pureverse,-2},
 	{"urembymul",Purembymul,2},
 	{"urembymul_precomp",Purembymul_precomp,3},
 
@@ -161,17 +229,149 @@ struct ftab poly_tab[] = {
 	{0,0,0},
 };
 
-extern V up_var;
+void Pheadsgn(NODE arg,Q *rp)
+{
+	int s;
+
+	s = headsgn((P)ARG0(arg));
+	STOQ(s,*rp);
+}
+
+void Pmul_trunc(NODE arg,P *rp)
+{
+	P p1,p2,p,h;
+	VL vl0,vl1,vl2,tvl,vl;
+	VN vn;
+	int i,n;
+
+	p1 = (P)ARG0(arg);
+	p2 = (P)ARG1(arg);
+	get_vars((Obj)p1,&vl1); get_vars((Obj)p2,&vl2); mergev(CO,vl1,vl2,&tvl);
+	p = (P)ARG2(arg);
+	get_vars((Obj)p,&vl0); mergev(CO,tvl,vl0,&vl);
+	for ( tvl = vl, n = 0; tvl; tvl = NEXT(tvl), n++ );
+	vn = (VN) ALLOCA((n+1)*sizeof(struct oVN));
+	for ( i = 0, tvl = vl; i < n; tvl = NEXT(tvl), i++ ) {
+		vn[i].v = tvl->v;
+		vn[i].n = 0;
+	}
+	vn[i].v = 0;
+	vn[i].n = 0;
+	for ( h = p, i = 0; OID(h) == O_P; h = COEF(DC(h)) ) {
+		for ( ; vn[i].v != VR(h); i++ );
+		vn[i].n = QTOS(DEG(DC(h)));
+	}
+	mulp_trunc(vl,p1,p2,vn,rp);
+}
+
+void Pquo_trunc(NODE arg,P *rp)
+{
+	P p1,p2,p,h;
+	VL vl0,vl1,vl2,tvl,vl;
+	VN vn;
+	int i,n;
+
+	p1 = (P)ARG0(arg);
+	p2 = (P)ARG1(arg);
+	if ( !p1 )
+		*rp = 0;
+	else if ( NUM(p2) )
+		divsp(CO,p1,p2,rp);
+	else {
+		get_vars((Obj)p1,&vl1); get_vars((Obj)p2,&vl2); mergev(CO,vl1,vl2,&vl);
+		for ( tvl = vl, n = 0; tvl; tvl = NEXT(tvl), n++ );
+		vn = (VN) ALLOCA((n+1)*sizeof(struct oVN));
+		for ( i = 0, tvl = vl; i < n; tvl = NEXT(tvl), i++ ) {
+			vn[i].v = tvl->v;
+			vn[i].n = 0;
+		}
+		vn[i].v = 0;
+		vn[i].n = 0;
+		for ( h = p2, i = 0; OID(h) == O_P; h = COEF(DC(h)) ) {
+			for ( ; vn[i].v != VR(h); i++ );
+			vn[i].n = QTOS(DEG(DC(h)));
+		}
+		quop_trunc(vl,p1,p2,vn,rp);
+	}
+}
+
+void Phomogeneous_part(NODE arg,P *rp)
+{
+	if ( argc(arg) == 2 )
+		exthp(CO,(P)ARG0(arg),QTOS((Q)ARG1(arg)),rp);
+	else
+		exthpc_generic(CO,(P)ARG0(arg),QTOS((Q)ARG2(arg)),
+			VR((P)ARG1(arg)),rp);
+}
+
+void Phomogeneous_deg(NODE arg,Q *rp)
+{
+	int d;
+
+	if ( argc(arg) == 1 )
+		d = homdeg((P)ARG0(arg));
+	else
+		d = getchomdeg(VR((P)ARG1(arg)),(P)ARG0(arg));
+	STOQ(d,*rp);
+}
+
+/* 
+	p1 = reorder(p,ovl,nvl) => p1 is 'sorted accoding to nvl.
+*/
+
+void Preorder(NODE arg,P *rp)
+{
+	VL ovl,nvl,tvl;
+	NODE n;
+
+	for ( ovl = 0, n = BDY((LIST)ARG1(arg)); n; n = NEXT(n) ) {
+		if ( !ovl ) {
+			NEWVL(ovl); tvl = ovl;
+		} else {
+			NEWVL(NEXT(tvl)); tvl = NEXT(tvl);
+		}
+			VR(tvl) = VR((P)BDY(n));
+	}
+	for ( nvl = 0, n = BDY((LIST)ARG2(arg)); n; n = NEXT(n) ) {
+		if ( !nvl ) {
+			NEWVL(nvl); tvl = nvl;
+		} else {
+			NEWVL(NEXT(tvl)); tvl = NEXT(tvl);
+		}
+			VR(tvl) = VR((P)BDY(n));
+	}
+	reorderp(nvl,ovl,(P)ARG0(arg),rp);
+}
+
 /*
+	uadj_coef(F,M,M2)
+	if ( F is a non-negative integer )
+		return F > M2 ? F-M : M2;
+	else
+		F = CN*V^N+...+C0
+		return uadj_coef(CN,M,M2)*V^N+...+uadj_coef(C0,M,M2);
+*/
+
+void Puadj_coef(NODE arg,P *rp)
+{
+	UP f,r;
+	N m,m2;
+
+	ptoup((P)ARG0(arg),&f);
+	m = NM((Q)ARG1(arg));
+	m2 = NM((Q)ARG2(arg));
+	adj_coefup(f,m,m2,&r);
+	uptop(r,rp);
+}
+
+/*
 	get_next_fft_prime(StartIndex,Bits)
 	tries to find smallest Index >= StartIndex s.t.
 		2^(Bits-1)|FFTprime[Index]-1
 	return [Index,Mod] or 0 (not exist)
 */
 
-void Pget_next_fft_prime(arg,rp)
-NODE arg;
-LIST *rp;
+void Pget_next_fft_prime(NODE arg,LIST *rp)
 {
 	unsigned int mod,d;
 	int start,bits,i;
@@ -185,7 +385,7 @@ LIST *rp;
 		if ( !mod ) {
 			*rp = 0; return;
 		}
-		if ( bits <= d ) {
+		if ( bits <= (int)d ) {
 			UTOQ(mod,q);
 			UTOQ(i,ind);
 			n = mknode(2,ind,q);
@@ -195,9 +395,7 @@ LIST *rp;
 	}
 }
 
-void Pranp(arg,rp)
-NODE arg;
-P *rp;
+void Pranp(NODE arg,P *rp)
 {
 	int n;
 	UP c;
@@ -211,9 +409,7 @@ P *rp;
 		*rp = 0;
 }
 
-void ranp(n,nr)
-int n;
-UP *nr;
+void ranp(int n,UP *nr)
 {
 	int i;
 	unsigned int r;
@@ -233,27 +429,21 @@ UP *nr;
 		*nr = 0;
 }
 
-void Pmaxblen(arg,rp)
-NODE arg;
-Q *rp;
+void Pmaxblen(NODE arg,Q *rp)
 {
 	int l;
 	l = maxblenp(ARG0(arg));
 	STOQ(l,*rp);
 }
 
-void Pp_mag(arg,rp)
-NODE arg;
-Q *rp;
+void Pp_mag(NODE arg,Q *rp)
 {
 	int l;
 	l = p_mag(ARG0(arg));
 	STOQ(l,*rp);
 }
 
-void Pord(arg,listp)
-NODE arg;
-LIST *listp;
+void Pord(NODE arg,LIST *listp)
 {
 	NODE n,tn;
 	LIST l;
@@ -303,10 +493,42 @@ LIST *listp;
 	NEXT(tn) = 0; MKLIST(l,n); *listp = l;
 }
 
-void Pcoef0(arg,rp)
-NODE arg;
-Obj *rp;
+void Premove_vars(NODE arg,LIST *listp)
 {
+	NODE l,nd,tnd;
+	V *v,*va;
+	int n,na,i,j;
+	VL vl,vl1;
+	P t;
+	LIST list;
+
+	asir_assert(ARG0(arg),O_LIST,"remove_vars");
+	l = BDY((LIST)ARG0(arg)); n = length(l);
+	v = (V *)ALLOCA(n*sizeof(V));
+	for ( i = 0; i < n; i++, l = NEXT(l) ) 
+		if ( !(t = (P)BDY(l)) || (OID(t) != O_P) )
+			error("ord : invalid argument");
+		else v[i] = VR(t);
+
+	for ( na = 0, vl = CO; vl; vl = NEXT(vl), na++ );
+	va = (V *)ALLOCA(na*sizeof(V));
+	for ( i = 0, vl = CO; i < na; i++, vl = NEXT(vl) ) va[i] = VR(vl);
+	for ( i = 0; i < na; i++ )
+		for ( j = 0; j < n; j++ ) if ( va[i] == v[j] ) va[i] = 0;
+	for ( vl = 0, i = na-1; i >= 0; i-- )
+		if ( va[i] ) {
+			NEWVL(vl1); VR(vl1) = va[i]; NEXT(vl1) = vl; vl = vl1;
+		}
+	CO = vl;
+	for ( nd = 0, vl = CO; vl; vl = NEXT(vl) ) {
+		NEXTNODE(nd,tnd); MKV(VR(vl),t); BDY(tnd) = (pointer)t;
+	}
+	if ( nd ) NEXT(tnd) = 0;
+	MKLIST(list,nd); *listp = list;
+}
+
+void Pcoef0(NODE arg,Obj *rp)
+{
 	Obj t,n;
 	P s;
 	DCP dc;
@@ -346,9 +568,7 @@ Obj *rp;
 	}
 }
 
-void Pcoef(arg,rp)
-NODE arg;
-Obj *rp;
+void Pcoef(NODE arg,Obj *rp)
 {
 	Obj t,n;
 	P s;
@@ -388,9 +608,7 @@ Obj *rp;
 	}
 }
 
-void Pcoef_gf2n(arg,rp)
-NODE arg;
-Obj *rp;
+void Pcoef_gf2n(NODE arg,Obj *rp)
 {
 	Obj t,n;
 	int id,d;
@@ -411,9 +629,7 @@ Obj *rp;
 		*rp = 0;
 }
 
-void Pdeg(arg,rp)
-NODE arg;
-Q *rp;
+void Pdeg(NODE arg,Q *rp)
 {
 	Obj t,v;
 	int d;
@@ -439,9 +655,7 @@ Q *rp;
 		degp(VR((P)ARG1(arg)),(P)ARG0(arg),rp);
 }
 
-void Pmindeg(arg,rp)
-NODE arg;
-Q *rp;
+void Pmindeg(NODE arg,Q *rp)
 {
 	Obj t;
 
@@ -451,9 +665,7 @@ Q *rp;
 		getmindeg(VR((P)ARG1(arg)),(P)ARG0(arg),rp);
 }
 
-void Psetmod(arg,rp)
-NODE arg;
-Q *rp;
+void Psetmod(NODE arg,Q *rp)
 {
 	if ( arg ) {
 		asir_assert(ARG0(arg),O_N,"setmod");
@@ -462,9 +674,7 @@ Q *rp;
 	STOQ(current_mod,*rp);
 }
 
-void Psparsemod_gf2n(arg,rp)
-NODE arg;
-Q *rp;
+void Psparsemod_gf2n(NODE arg,Q *rp)
 {
 	int id;
 
@@ -477,9 +687,7 @@ Q *rp;
 	STOQ(id,*rp);
 }
 
-void Pmultest_gf2n(arg,rp)
-NODE arg;
-GF2N *rp;
+void Pmultest_gf2n(NODE arg,GF2N *rp)
 {
 	GF2N a,b,c;
 	int i;
@@ -490,9 +698,7 @@ GF2N *rp;
 	*rp = c;
 }
 
-void Psquaretest_gf2n(arg,rp)
-NODE arg;
-GF2N *rp;
+void Psquaretest_gf2n(NODE arg,GF2N *rp)
 {
 	GF2N a,c;
 	int i;
@@ -503,9 +709,7 @@ GF2N *rp;
 	*rp = c;
 }
 
-void Pinvtest_gf2n(arg,rp)
-NODE arg;
-GF2N *rp;
+void Pinvtest_gf2n(NODE arg,GF2N *rp)
 {
 	GF2N a,c;
 	int i;
@@ -516,9 +720,7 @@ GF2N *rp;
 	*rp = c;
 }
 
-void Pbininv_gf2n(arg,rp)
-NODE arg;
-GF2N *rp;
+void Pbininv_gf2n(NODE arg,GF2N *rp)
 {
 	UP2 a,inv;
 	int n;
@@ -529,8 +731,7 @@ GF2N *rp;
 	MKGF2N(inv,*rp);
 }
 
-void Prinvtest_gf2n(rp)
-Real *rp;
+void Prinvtest_gf2n(Real *rp)
 {
 	GF2N *a;
 	GF2N c;
@@ -550,9 +751,7 @@ Real *rp;
 	MKReal(r,*rp);
 }
 
-void Pfind_root_gf2n(arg,rp)
-NODE arg;
-GF2N *rp;
+void Pfind_root_gf2n(NODE arg,GF2N *rp)
 {
 
 #if 0
@@ -568,9 +767,7 @@ GF2N *rp;
 #endif
 }
 
-void Pis_irred_gf2(arg,rp)
-NODE arg;
-Q *rp;
+void Pis_irred_gf2(NODE arg,Q *rp)
 {
 	UP2 t;
 
@@ -578,9 +775,7 @@ Q *rp;
 	*rp = irredcheckup2(t) ? ONE : 0;
 }
 
-void Pis_irred_ddd_gf2(arg,rp)
-NODE arg;
-Q *rp;
+void Pis_irred_ddd_gf2(NODE arg,Q *rp)
 {
 	UP2 t;
 	int ret;
@@ -590,17 +785,17 @@ Q *rp;
 	STOQ(ret,*rp);
 }
 
-void Psetmod_ff(arg,rp)
-NODE arg;
-Obj *rp;
+void Psetmod_ff(NODE arg,Obj *rp)
 {
 	int ac;
+	int d;
 	Obj mod,defpoly;
 	N n;
 	UP up;
 	UP2 up2;
-	Q q;
-	P p;
+	UM dp;
+	Q q,r;
+	P p,p1,y;
 	NODE n0,n1;
 	LIST list;
 
@@ -612,7 +807,8 @@ Obj *rp;
 		switch ( OID(mod) ) {
 			case O_N:
 				current_ff = FF_GFP;
-				setmod_lm(NM((Q)mod)); break;
+				setmod_lm(NM((Q)mod));
+				break;
 			case O_P:
 				current_ff = FF_GF2N;
 				setmod_gf2n((P)mod); break;
@@ -620,13 +816,27 @@ Obj *rp;
 				error("setmod_ff : invalid argument");
 		}
 	} else if ( ac == 2 ) {
-		current_ff = FF_GFPN;
-		defpoly = (Obj)ARG0(arg);
-		mod = (Obj)ARG1(arg);
-		if ( !mod || !defpoly )
-			error("setmod_ff : invalid argument");
-		setmod_lm(NM((Q)mod));
-		setmod_gfpn((P)defpoly);
+		if ( OID(ARG0(arg)) == O_N ) {
+			/* small finite field; primitive root representation */
+			current_ff = FF_GFS;
+			setmod_sf(QTOS((Q)ARG0(arg)),QTOS((Q)ARG1(arg)));
+		} else {
+			mod = (Obj)ARG1(arg);
+			current_ff = FF_GFPN;
+			defpoly = (Obj)ARG0(arg);
+			if ( !mod || !defpoly )
+				error("setmod_ff : invalid argument");
+			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_gfsn(dp);
+		current_ff = FF_GFSN;
 	}
 	switch ( current_ff ) {
 		case FF_GFP:
@@ -639,17 +849,45 @@ Obj *rp;
 			MKNODE(n1,q,0); MKNODE(n0,p,n1);
 			MKLIST(list,n0);
 			*rp = (Obj)list; break;
+		case FF_GFS:
+		case FF_GFSN:
+			STOQ(current_gfs_p,q);
+			if ( current_gfs_ext )
+				enc_to_p(current_gfs_p,current_gfs_iton[1],
+					VR(current_gfs_ext),&p);
+			else {
+				if ( current_gfs_p == 2 )
+					r = ONE;
+				else if ( !current_gfs_ntoi )
+					r = 0;
+				else
+					STOQ(current_gfs_iton[1],r);
+				p = (P)r;
+			}
+			switch ( current_ff ) {
+				case FF_GFS:
+					n0 = mknode(3,q,current_gfs_ext,p);
+					break;
+				case FF_GFSN:
+					getmod_gfsn(&dp);
+					makevar("y",&y);
+					sfumtop(VR(y),dp,&p1);
+					n0 = mknode(4,q,current_gfs_ext,p,p1);
+					break;
+			}
+			MKLIST(list,n0);
+			*rp = (Obj)list; break;
 		default:
 			*rp = 0; break;
 	}
 }
 
-void Pextdeg_ff(rp)
-Q *rp;
+void Pextdeg_ff(Q *rp)
 {
 	int d;
 	UP2 up2;
 	UP up;
+	UM dp;
 
 	switch ( current_ff ) {
 		case FF_GFP:
@@ -658,13 +896,22 @@ Q *rp;
 			getmod_gf2n(&up2); d = degup2(up2); STOQ(d,*rp); break;
 		case FF_GFPN:
 			getmod_gfpn(&up); STOQ(up->d,*rp); break;
+		case FF_GFS:
+			if ( !current_gfs_ext )
+				*rp = ONE;
+			else
+				*rp = DEG(DC(current_gfs_ext));
+			break;
+		case FF_GFSN:
+			getmod_gfsn(&dp);
+			STOQ(DEG(dp),*rp);
+			break;
 		default:
 			error("extdeg_ff : current_ff is not set");
 	}
 }
 
-void Pcharacteristic_ff(rp)
-Q *rp;
+void Pcharacteristic_ff(Q *rp)
 {
 	N lm;
 
@@ -674,19 +921,20 @@ Q *rp;
 			getmod_lm(&lm); NTOQ(lm,1,*rp); break;
 		case FF_GF2N:
 			STOQ(2,*rp); break;
+		case FF_GFS:
+		case FF_GFSN:
+			STOQ(current_gfs_p,*rp); break;
 		default:
 			error("characteristic_ff : current_ff is not set");
 	}
 }
 
-void Pfield_type_ff(rp)
-Q *rp;
+void Pfield_type_ff(Q *rp)
 {
 	STOQ(current_ff,*rp);
 }
 
-void Pfield_order_ff(rp)
-Q *rp;
+void Pfield_order_ff(Q *rp)
 {
 	N n;
 
@@ -694,39 +942,13 @@ Q *rp;
 	NTOQ(n,1,*rp);
 }
 
-void field_order_ff(order)
-N *order;
+void Prandom_ff(Obj *rp)
 {
-	UP2 up2;
-	UP up;
-	N m;
-	int d,w;
-
-	switch ( current_ff ) {
-		case FF_GFP:
-			getmod_lm(order); break;
-		case FF_GF2N:
-			getmod_gf2n(&up2); d = degup2(up2);
-			w = (d>>5)+1;
-			*order = m = NALLOC(w);
-			PL(m)=w;
-			bzero((char *)BD(m),w*sizeof(unsigned int));
-			BD(m)[d>>5] |= 1<<(d&31);
-			break;
-		case FF_GFPN:
-			getmod_lm(&m);
-			getmod_gfpn(&up); pwrn(m,up->d,order); break;
-		default:
-			error("field_order_ff : current_ff is not set");
-	}
-}
-
-void Prandom_ff(rp)
-Obj *rp;
-{
 	LM l;
 	GF2N g;
 	GFPN p;
+	GFS s;
+	GFSN spn;
 
 	switch ( current_ff ) {
 		case FF_GFP:
@@ -735,75 +957,22 @@ Obj *rp;
 			randomgf2n(&g); *rp = (Obj)g; break;
 		case FF_GFPN:
 			randomgfpn(&p); *rp = (Obj)p; break;
+		case FF_GFS:
+			randomgfs(&s); *rp = (Obj)s; break;
+		case FF_GFSN:
+			randomgfsn(&spn); *rp = (Obj)spn; break;
 		default:
 			error("random_ff : current_ff is not set");
 	}
 }
 
-void Psimp_ff(arg,rp)
-NODE arg;
-Obj *rp;
+void Psimp_ff(NODE arg,Obj *rp)
 {
-	LM r;
-	GF2N rg;
-	extern lm_lazy;
-
 	simp_ff((Obj)ARG0(arg),rp);
 }
 
-void simp_ff(p,rp)
-Obj p;
-Obj *rp;
+void getcoef(VL vl,P p,V v,Q d,P *r)
 {
-	Num n;
-	LM r,s;
-	DCP dc,dcr0,dcr;
-	GF2N rg,sg;
-	GFPN rpn,spn;
-	P t;
-	Obj obj;
-
-	lm_lazy = 0;
-	if ( !p )
-		*rp = 0;
-	else if ( OID(p) == O_N ) {
-		switch ( current_ff ) {
-			case FF_GFP:
-				ptolmp((P)p,&t); simplm((LM)t,&s); *rp = (Obj)s;
-				break;
-			case FF_GF2N:
-				ptogf2n((Obj)p,&rg); simpgf2n((GF2N)rg,&sg); *rp = (Obj)sg;
-				break;
-			case FF_GFPN:
-				ntogfpn((Obj)p,&rpn); simpgfpn((GFPN)rpn,&spn); *rp = (Obj)spn;
-				break;
-			default:
-				*rp = (Obj)p;
-				break;
-		}
-	} else if ( OID(p) == O_P ) {
-		for ( dc = DC((P)p), dcr0 = 0; dc; dc = NEXT(dc) ) {
-			simp_ff((Obj)COEF(dc),&obj);
-			if ( obj ) {
-				NEXTDC(dcr0,dcr); DEG(dcr) = DEG(dc); COEF(dcr) = (P)obj;
-			}
-		}
-		if ( !dcr0 ) 
-			*rp = 0;
-		else {
-			NEXT(dcr) = 0; MKP(VR((P)p),dcr0,t); *rp = (Obj)t;
-		}
-	} else
-		error("simp_ff : not implemented yet");
-}
-
-void getcoef(vl,p,v,d,r)
-VL vl;
-P p;
-V v;
-Q d;
-P *r;
-{
 	P s,t,u,a,b,x;
 	DCP dc;
 	V w;
@@ -828,9 +997,7 @@ P *r;
 	}
 }
 
-void Pdeglist(arg,rp)
-NODE arg;
-LIST *rp;
+void Pdeglist(NODE arg,LIST *rp)
 {
 	NODE d;
 
@@ -838,25 +1005,17 @@ LIST *rp;
 	MKLIST(*rp,d);
 }
 
-void Pch_mv(arg,rp)
-NODE arg;
-P *rp;
+void Pch_mv(NODE arg,P *rp)
 {
 	change_mvar(CO,(P)ARG0(arg),VR((P)ARG1(arg)),rp);
 }
 
-void Pre_mv(arg,rp)
-NODE arg;
-P *rp;
+void Pre_mv(NODE arg,P *rp)
 {
 	restore_mvar(CO,(P)ARG0(arg),VR((P)ARG1(arg)),rp);
 }
 
-void change_mvar(vl,p,v,r)
-VL vl;
-P p;
-V v;
-P *r;
+void change_mvar(VL vl,P p,V v,P *r)
 {
 	Q d;
 	DCP dc,dc0;
@@ -874,11 +1033,7 @@ P *r;
 	}
 }
 
-void restore_mvar(vl,p,v,r)
-VL vl;
-P p;
-V v;
-P *r;
+void restore_mvar(VL vl,P p,V v,P *r)
 {
 	P s,u,a,b,x;
 	DCP dc;
@@ -895,10 +1050,7 @@ P *r;
 	}
 }
 
-void getdeglist(p,v,d)
-P p;
-V v;
-NODE *d;
+void getdeglist(P p,V v,NODE *d)
 {
 	NODE n,n0,d0,d1,d2;
 	DCP dc;
@@ -917,9 +1069,8 @@ NODE *d;
 		*d = d0;
 	}
 }
-void Pmergelist(arg,rp)
-NODE arg;
-LIST *rp;
+
+void Pmergelist(NODE arg,LIST *rp)
 {
     NODE n;
 
@@ -929,8 +1080,7 @@ LIST *rp;
 	MKLIST(*rp,n);
 }
 
-void mergedeglist(d0,d1,dr)
-NODE d0,d1,*dr;
+void mergedeglist(NODE d0,NODE d1,NODE *dr)
 {
 	NODE t0,t,dt;
 	Q d;
@@ -962,91 +1112,150 @@ NODE d0,d1,*dr;
 	}
 }
 
-void Pptomp(arg,rp)
-NODE arg;
-P *rp;
+void Pptomp(NODE arg,P *rp)
 {
 	ptomp(QTOS((Q)ARG1(arg)),(P)ARG0(arg),rp);
 }
 
-void Pmptop(arg,rp)
-NODE arg;
-P *rp;
+void Pmptop(NODE arg,P *rp)
 {
 	mptop((P)ARG0(arg),rp);
 }
 
-void Pptolmp(arg,rp)
-NODE arg;
-P *rp;
+void Pptolmp(NODE arg,P *rp)
 {
 	ptolmp((P)ARG0(arg),rp);
 }
 
-void Plmptop(arg,rp)
-NODE arg;
-P *rp;
+void Plmptop(NODE arg,P *rp)
 {
 	lmptop((P)ARG0(arg),rp);
 }
 
-void Pptogf2n(arg,rp)
-NODE arg;
-GF2N *rp;
+void Psf_galois_action(NODE arg,P *rp)
 {
-	ptogf2n((Obj)ARG0(arg),rp);
+	sf_galois_action(ARG0(arg),ARG1(arg),rp);
 }
 
-void Pgf2ntop(arg,rp)
-NODE arg;
-P *rp;
+/*
+  sf_embed(F,B,PM)
+  F : an element of GF(pn)
+  B : the image of the primitive root of GF(pn)
+  PM : order of GF(pm)
+*/
+
+void Psf_embed(NODE arg,P *rp)
 {
-	extern V up2_var;
+	int k,pm;
 
+	/* GF(pn)={0,1,a,a^2,...}->GF(pm)={0,1,b,b^2,...}; a->b^k */
+	k = CONT((GFS)ARG1(arg));
+	pm = QTOS((Q)ARG2(arg));
+	sf_embed((P)ARG0(arg),k,pm,rp);
+}
+
+void Psf_log(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(NODE arg,GFS *rp)
+{
+	P p;
+	Obj t;
+	int d;
+	UM u;
+	int *root;
+
+	p = (P)ARG0(arg);
+	simp_ff((Obj)p,&t); p = (P)t;
+	d = getdeg(VR(p),p);
+	u = W_UMALLOC(d);
+	ptosfum(p,u);
+	root = (int *)ALLOCA(d*sizeof(int));
+	find_rootsf(u,root);
+	MKGFS(IFTOF(root[0]),*rp);
+}
+
+void Psf_minipoly(NODE arg,P *rp)
+{
+	Obj t;
+	P p1,p2;
+	int d1,d2;
+	UM up1,up2,m;
+
+	p1 = (P)ARG0(arg); simp_ff((Obj)p1,&t); p1 = (P)t;
+	p2 = (P)ARG1(arg); simp_ff((Obj)p2,&t); p2 = (P)t;
+	d1 = getdeg(VR(p1),p1); up1 = W_UMALLOC(d1); ptosfum(p1,up1);
+	d2 = getdeg(VR(p2),p2); up2 = W_UMALLOC(d2); ptosfum(p2,up2);
+	m = W_UMALLOC(d2);
+	minipolysf(up1,up2,m);
+	sfumtop(VR(p2),m,&p1);
+	sfptop(p1,rp);
+}
+
+void Pptosfp(NODE arg,P *rp)
+{
+	ptosfp(ARG0(arg),rp);
+}
+
+void Psfptop(NODE arg,P *rp)
+{
+	sfptop((P)ARG0(arg),rp);
+}
+
+void Psfptopsfp(NODE arg,P *rp)
+{
+	sfptopsfp((P)ARG0(arg),VR((P)ARG1(arg)),rp);
+}
+
+void Pptogf2n(NODE arg,GF2N *rp)
+{
+	ptogf2n((Obj)ARG0(arg),rp);
+}
+
+void Pgf2ntop(NODE arg,P *rp)
+{
 	if ( argc(arg) == 2 )
 		up2_var = VR((P)ARG1(arg));
 	gf2ntop((GF2N)ARG0(arg),rp);
 }
 
-void Pgf2ntovect(arg,rp)
-NODE arg;
-VECT *rp;
+void Pgf2ntovect(NODE arg,VECT *rp)
 {
 	gf2ntovect((GF2N)ARG0(arg),rp);
 }
 
-void Pptogfpn(arg,rp)
-NODE arg;
-GF2N *rp;
+void Pptogfpn(NODE arg,GFPN *rp)
 {
 	ptogfpn((Obj)ARG0(arg),rp);
 }
 
-void Pgfpntop(arg,rp)
-NODE arg;
-P *rp;
+void Pgfpntop(NODE arg,P *rp)
 {
-	extern V up_var;
-
 	if ( argc(arg) == 2 )
 		up_var = VR((P)ARG1(arg));
 	gfpntop((GFPN)ARG0(arg),rp);
 }
 
-void Pureverse(arg,rp)
-NODE arg;
-P *rp;
+void Pureverse(NODE arg,P *rp)
 {
 	UP p,r;
 
 	ptoup((P)ARG0(arg),&p);
-	reverseup(p,p->d,&r);
+	if ( argc(arg) == 1 )
+		reverseup(p,p->d,&r);
+	else 
+		reverseup(p,QTOS((Q)ARG1(arg)),&r);
 	uptop(r,rp);
 }
 
-void Putrunc(arg,rp)
-NODE arg;
-P *rp;
+void Putrunc(NODE arg,P *rp)
 {
 	UP p,r;
 
@@ -1055,9 +1264,7 @@ P *rp;
 	uptop(r,rp);
 }
 
-void Pudecomp(arg,rp)
-NODE arg;
-LIST *rp;
+void Pudecomp(NODE arg,LIST *rp)
 {
 	P u,l;
 	UP p,up,low;
@@ -1071,9 +1278,7 @@ LIST *rp;
 	MKLIST(*rp,n0);
 }
 
-void Purembymul(arg,rp)
-NODE arg;
-P *rp;
+void Purembymul(NODE arg,P *rp)
 {
 	UP p1,p2,r;
 
@@ -1093,9 +1298,7 @@ P *rp;
  * p2*inv = 1 mod x^d2
  */
 
-void Purembymul_precomp(arg,rp)
-NODE arg;
-P *rp;
+void Purembymul_precomp(NODE arg,P *rp)
 {
 	UP p1,p2,inv,r;
 
@@ -1115,9 +1318,7 @@ P *rp;
 	}
 }
 
-void Puinvmod(arg,rp)
-NODE arg;
-P *rp;
+void Puinvmod(NODE arg,P *rp)
 {
 	UP p,r;
 
@@ -1126,9 +1327,7 @@ P *rp;
 	uptop(r,rp);
 }
 
-void Purevinvmod(arg,rp)
-NODE arg;
-P *rp;
+void Purevinvmod(NODE arg,P *rp)
 {
 	UP p,pr,r;
 
@@ -1138,9 +1337,7 @@ P *rp;
 	uptop(r,rp);
 }
 
-void Ppwrmod_ff(arg,rp)
-NODE arg;
-P *rp;
+void Ppwrmod_ff(NODE arg,P *rp)
 {
 	UP p1,p2;
 
@@ -1151,6 +1348,8 @@ P *rp;
 		case FF_GF2N:
 			powermodup_gf2n(p1,&p2); break;
 		case FF_GFPN:
+		case FF_GFS:
+		case FF_GFSN:
 			powermodup(p1,&p2); break;
 		default:
 			error("pwrmod_ff : current_ff is not set");
@@ -1158,9 +1357,7 @@ P *rp;
 	uptop(p2,rp);
 }
 
-void Pgeneric_pwrmod_ff(arg,rp)
-NODE arg;
-P *rp;
+void Pgeneric_pwrmod_ff(NODE arg,P *rp)
 {
 	UP g,f,r;
 
@@ -1172,6 +1369,8 @@ P *rp;
 		case FF_GF2N:
 			generic_powermodup_gf2n(g,f,(Q)ARG2(arg),&r); break;
 		case FF_GFPN:
+		case FF_GFS:
+		case FF_GFSN:
 			generic_powermodup(g,f,(Q)ARG2(arg),&r); break;
 		default:
 			error("generic_pwrmod_ff : current_ff is not set");
@@ -1179,9 +1378,7 @@ P *rp;
 	uptop(r,rp);
 }
 
-void Ppwrtab_ff(arg,rp)
-NODE arg;
-VECT *rp;
+void Ppwrtab_ff(NODE arg,VECT *rp)
 {
 	UP f,xp;
 	UP *tab;
@@ -1199,6 +1396,8 @@ VECT *rp;
 		case FF_GF2N:
 			powertabup_gf2n(f,xp,tab); break;
 		case FF_GFPN:
+		case FF_GFS:
+		case FF_GFSN:
 			powertabup(f,xp,tab); break;
 		default:
 			error("pwrtab_ff : current_ff is not set");
@@ -1208,9 +1407,7 @@ VECT *rp;
 		uptop(tab[i],(P *)&BDY(r)[i]);
 }
 
-void Pkpwrmod_lm(arg,rp)
-NODE arg;
-P *rp;
+void Pkpwrmod_lm(NODE arg,P *rp)
 {
 	UP p1,p2;
 
@@ -1219,9 +1416,7 @@ P *rp;
 	uptop(p2,rp);
 }
 
-void Pkgeneric_pwrmod_lm(arg,rp)
-NODE arg;
-P *rp;
+void Pkgeneric_pwrmod_lm(NODE arg,P *rp)
 {
 	UP g,f,r;
 
@@ -1231,9 +1426,7 @@ P *rp;
 	uptop(r,rp);
 }
 
-void Pkpwrtab_lm(arg,rp)
-NODE arg;
-VECT *rp;
+void Pkpwrtab_lm(NODE arg,VECT *rp)
 {
 	UP f,xp;
 	UP *tab;
@@ -1251,17 +1444,13 @@ VECT *rp;
 		uptop(tab[i],(P *)&BDY(r)[i]);
 }
 
-void Plazy_lm(arg,rp)
-NODE arg;
-Q *rp;
+void Plazy_lm(NODE arg,Q *rp)
 {
 	lm_lazy = QTOS((Q)ARG0(arg));
 	*rp = 0;
 }
 
-void Pkmul(arg,rp)
-NODE arg;
-P *rp;
+void Pkmul(NODE arg,P *rp)
 {
 	P n1,n2;
 	
@@ -1271,9 +1460,7 @@ P *rp;
 	kmulp(CO,n1,n2,rp);
 }
 
-void Pksquare(arg,rp)
-NODE arg;
-P *rp;
+void Pksquare(NODE arg,P *rp)
 {
 	P n1;
 	
@@ -1282,9 +1469,7 @@ P *rp;
 	ksquarep(CO,n1,rp);
 }
 
-void Pktmul(arg,rp)
-NODE arg;
-P *rp;
+void Pktmul(NODE arg,P *rp)
 {
 	UP p1,p2,r;
 
@@ -1294,9 +1479,7 @@ P *rp;
 	uptop(r,rp);
 }
 
-void Pumul(arg,rp)
-NODE arg;
-P *rp;
+void Pumul(NODE arg,P *rp)
 {
 	P a1,a2;
 	UP p1,p2,r;
@@ -1305,7 +1488,7 @@ P *rp;
 	if ( !a1 || !a2 || NUM(a1) || NUM(a2) )
 		mulp(CO,a1,a2,rp);
 	else {
-		if ( !uzpcheck(a1) || !uzpcheck(a2) || VR(a1) != VR(a2) )
+		if ( !uzpcheck((Obj)a1) || !uzpcheck((Obj)a2) || VR(a1) != VR(a2) )
 			error("umul : invalid argument");
 		ptoup(a1,&p1);
 		ptoup(a2,&p2);
@@ -1314,20 +1497,16 @@ P *rp;
 	}
 }
 
-void Pusquare(arg,rp)
-NODE arg;
-P *rp;
+void Pusquare(NODE arg,P *rp)
 {
-	UP p1,p2,r;
+	UP p1,r;
 
 	ptoup((P)ARG0(arg),&p1);
 	hybrid_squareup(0,p1,&r);
 	uptop(r,rp);
 }
 
-void Putmul(arg,rp)
-NODE arg;
-P *rp;
+void Putmul(NODE arg,P *rp)
 {
 	UP p1,p2,r;
 
@@ -1337,9 +1516,7 @@ P *rp;
 	uptop(r,rp);
 }
 
-void Pumul_ff(arg,rp)
-NODE arg;
-Obj *rp;
+void Pumul_ff(NODE arg,Obj *rp)
 {
 	P a1,a2;
 	UP p1,p2,r;
@@ -1353,11 +1530,9 @@ Obj *rp;
 	simp_ff((Obj)p,rp);
 }
 
-void Pusquare_ff(arg,rp)
-NODE arg;
-Obj *rp;
+void Pusquare_ff(NODE arg,Obj *rp)
 {
-	UP p1,p2,r;
+	UP p1,r;
 	P p;
 
 	ptoup((P)ARG0(arg),&p1);
@@ -1366,9 +1541,7 @@ Obj *rp;
 	simp_ff((Obj)p,rp);
 }
 
-void Putmul_ff(arg,rp)
-NODE arg;
-Obj *rp;
+void Putmul_ff(NODE arg,Obj *rp)
 {
 	UP p1,p2,r;
 	P p;
@@ -1380,9 +1553,7 @@ Obj *rp;
 	simp_ff((Obj)p,rp);
 }
 
-void Phfmul_lm(arg,rp)
-NODE arg;
-P *rp;
+void Phfmul_lm(NODE arg,P *rp)
 {
 	UP p1,p2,r;
 	UP hi,lo,mid,t,s,p10,p11,p20,p21;
@@ -1423,9 +1594,7 @@ P *rp;
 	uptop(r,rp);
 }
 
-void Pfmultest(arg,rp)
-NODE arg;
-LIST *rp;
+void Pfmultest(NODE arg,LIST *rp)
 {
 	P p1,p2,r;
 	int d1,d2;
@@ -1470,9 +1639,7 @@ LIST *rp;
 	}
 }
 
-void Pkmulum(arg,rp)
-NODE arg;
-P *rp;
+void Pkmulum(NODE arg,P *rp)
 {
 	P p1,p2;
 	int d1,d2,mod;
@@ -1487,9 +1654,7 @@ P *rp;
 	umtop(VR(p1),wr,rp);
 }
 
-void Pksquareum(arg,rp)
-NODE arg;
-P *rp;
+void Pksquareum(NODE arg,P *rp)
 {
 	P p1;
 	int d1,mod;
@@ -1504,9 +1669,7 @@ P *rp;
 	umtop(VR(p1),wr,rp);
 }
 
-void Ptracemod_gf2n(arg,rp)
-NODE arg;
-P *rp;
+void Ptracemod_gf2n(NODE arg,P *rp)
 {
 	UP g,f,r;
 
@@ -1516,9 +1679,7 @@ P *rp;
 	uptop(r,rp);
 }
 
-void Pumul_specialmod(arg,rp)
-NODE arg;
-P *rp;
+void Pumul_specialmod(NODE arg,P *rp)
 {
 	P a1,a2;
 	UP p1,p2,r;
@@ -1530,7 +1691,7 @@ P *rp;
 	if ( !a1 || !a2 || NUM(a1) || NUM(a2) )
 		mulp(CO,a1,a2,rp);
 	else {
-		if ( !uzpcheck(a1) || !uzpcheck(a2) || VR(a1) != VR(a2) )
+		if ( !uzpcheck((Obj)a1) || !uzpcheck((Obj)a2) || VR(a1) != VR(a2) )
 			error("umul_specialmod : invalid argument");
 		ptoup(a1,&p1);
 		ptoup(a2,&p2);
@@ -1544,9 +1705,7 @@ P *rp;
 	}
 }
 
-void Pusquare_specialmod(arg,rp)
-NODE arg;
-P *rp;
+void Pusquare_specialmod(NODE arg,P *rp)
 {
 	P a1;
 	UP p1,r;
@@ -1558,7 +1717,7 @@ P *rp;
 	if ( !a1 || NUM(a1) )
 		mulp(CO,a1,a1,rp);
 	else {
-		if ( !uzpcheck(a1) )
+		if ( !uzpcheck((Obj)a1) )
 			error("usquare_specialmod : invalid argument");
 		ptoup(a1,&p1);
 		n = BDY((LIST)ARG1(arg));
@@ -1571,9 +1730,7 @@ P *rp;
 	}
 }
 
-void Putmul_specialmod(arg,rp)
-NODE arg;
-P *rp;
+void Putmul_specialmod(NODE arg,P *rp)
 {
 	P a1,a2;
 	UP p1,p2,r;
@@ -1585,7 +1742,7 @@ P *rp;
 	if ( !a1 || !a2 || NUM(a1) || NUM(a2) )
 		mulp(CO,a1,a2,rp);
 	else {
-		if ( !uzpcheck(a1) || !uzpcheck(a2) || VR(a1) != VR(a2) )
+		if ( !uzpcheck((Obj)a1) || !uzpcheck((Obj)a2) || VR(a1) != VR(a2) )
 			error("utmul_specialmod : invalid argument");
 		ptoup(a1,&p1);
 		ptoup(a2,&p2);