===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/engine/gfs.c,v
retrieving revision 1.12
retrieving revision 1.18
diff -u -p -r1.12 -r1.18
--- OpenXM_contrib2/asir2000/engine/gfs.c	2002/09/27 08:40:49	1.12
+++ OpenXM_contrib2/asir2000/engine/gfs.c	2017/02/27 05:14:54	1.18
@@ -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/gfs.c,v 1.11 2002/09/27 04:24:04 noro Exp $
+ * $OpenXM: OpenXM_contrib2/asir2000/engine/gfs.c,v 1.17 2003/05/07 06:26:49 noro Exp $
 */
 #include "ca.h"
 #include "inline.h"
@@ -511,6 +511,7 @@ void setmod_sf(int p,int n)
 
 	for ( i = 0, q = 1; i < n; i++ )
 		q *= p;
+    if ( p == current_gfs_p && q == current_gfs_q ) return;
 	dp = UMALLOC(n);
 	r = search_defpoly_and_primitive_root(p,n,dp);
 	if ( !r ) {
@@ -661,15 +662,15 @@ int mulremum_enc(int p,int n,UM dp,int a,int b)
 
 void gfs_galois_action(GFS a,Q e,GFS *c)
 {
-	Q q;
+	Q p;
 	int i,k;
 	GFS t,s;
 
 	t = a;
 	k = QTOS(e);
-	STOQ(current_gfs_q,q);
+	STOQ(current_gfs_p,p);
 	for ( i = 0; i < k; i++ ) {
-		pwrgfs(t,q,&s); t = s;
+		pwrgfs(t,p,&s); t = s;
 	}
 	*c = t;
 }
@@ -727,6 +728,8 @@ void qtogfs(Q a,GFS *c)
 {
 	int s;
 
+	if ( a && (SGN(a) < 1) )
+		error("qtogfs : invalid argument");
 	s = QTOS(a)%current_gfs_q;
 	itogfs(s,c);
 }
@@ -750,6 +753,21 @@ void gfstomq(GFS a,MQ *c)
 	}
 }
 
+void gfstopgfs(GFS a,V v,P *c)
+{
+	MQ t;
+	Q q;
+
+	if ( !a )
+		*c = 0;
+	else if ( !current_gfs_ntoi ) {
+		UTOMQ(CONT(a),t);
+		STOQ(CONT(t),q);
+		*c = (P)q;
+	} else
+		enc_to_p(current_gfs_p,current_gfs_iton[CONT(a)],v,c);
+}
+
 void ntogfs(Obj a,GFS *b)
 {
 	P t;
@@ -944,6 +962,21 @@ int cmpgfs(GFS a,GFS b)
 		}
 }
 
+void pthrootgfs(GFS a,GFS *b)
+{
+	Q p;
+	int e,i;
+	GFS t,s;
+
+	STOQ(characteristic_sf(),p);
+	e = extdeg_sf()-1;
+	t = a;
+	for ( i = 0; i < e; i++ ) {
+		pwrgfs(t,p,&s); t = s;
+	}
+	*b = t;
+}
+
 void randomgfs(GFS *r)
 {
 	unsigned int t;
@@ -1117,7 +1150,12 @@ int _itosf(int n)
 {
 	int i;
 
+	/* XXX */
+#if 0
 	n %= current_gfs_p;
+#else
+	n %= current_gfs_q;
+#endif
 	if ( !n )
 		return 0;
 	i = !current_gfs_ntoi ? n : current_gfs_ntoi[n];