===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/engine/up_lm.c,v
retrieving revision 1.1.1.1
retrieving revision 1.4
diff -u -p -r1.1.1.1 -r1.4
--- OpenXM_contrib2/asir2000/engine/up_lm.c	1999/12/03 07:39:08	1.1.1.1
+++ OpenXM_contrib2/asir2000/engine/up_lm.c	2001/05/09 01:41:42	1.4
@@ -1,4 +1,52 @@
-/* $OpenXM: OpenXM/src/asir99/engine/up_lm.c,v 1.2 1999/11/18 05:42:02 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/engine/up_lm.c,v 1.3 2000/08/22 05:04:07 noro Exp $ 
+*/
 #include "ca.h"
 #include <math.h>
 
@@ -6,6 +54,7 @@ extern GC_dont_gc;
 extern struct oEGT eg_chrem,eg_fore,eg_back;
 extern int debug_up;
 extern int up_lazy;
+extern int current_ff;
 
 void crup_lm(ModNum **,int,int *,int,N,N,UP *);
 
@@ -360,17 +409,42 @@ UP *xp;
 	UP x,y,t,invf,s;
 	int k;
 	LM lm;
+	GFS fs;
+	Num c;
 	struct oEGT eg_sq,eg_rem,eg_mul,eg_inv,eg0,eg1,eg2,eg3;
 
+	if ( !current_ff )
+		error("powermodup : current_ff is not set");
 	field_order_ff(&n);
-	if ( !n )
-		error("powermodup : current_mod_lm is not set");
-	MKLM(ONEN,lm); 
-	x = UPALLOC(1); x->d = 1; x->c[1] = (Num)lm;
-	y = UPALLOC(0); y->d = 0; y->c[0] = (Num)lm;
+	switch ( current_ff ) {
+		case FF_GFP:
+		case FF_GFPN:
+			MKLM(ONEN,lm);
+			c = (Num)lm;
+			break;
+		case FF_GFS:
+			mqtogfs(ONEM,&fs);
+			c = (Num)fs;
+			break;
+		default:
+			error("powermodup : not implemented yet");
+	}
+	x = UPALLOC(1); x->d = 1; x->c[1] = c;
+	y = UPALLOC(0); y->d = 0; y->c[0] = c;
 
 	reverseup(f,f->d,&t);
-	invmodup(t,f->d,&s); uptolmup(s,&invf);
+	invmodup(t,f->d,&s); 
+	switch ( current_ff ) {
+		case FF_GFP:
+		case FF_GFPN:
+			uptolmup(s,&invf);
+			break;
+		case FF_GFS:
+			invf = s; /* XXX */
+			break;
+		default:
+			error("powermodup : not implemented yet");
+	}
 	for ( k = n_bits(n)-1; k >= 0; k-- ) {
 		ksquareup(y,&t);
 		rembymulup_special(t,f,invf,&s);
@@ -432,11 +506,25 @@ UP *xp;
 	UP x,y,t,invf,s;
 	int k;
 	LM lm;
+	GFS fs;
+	Num c;
 	struct oEGT eg_sq,eg_rem,eg_mul,eg_inv,eg0,eg1,eg2,eg3;
 
 	e = NM(d);
-	MKLM(ONEN,lm); 
-	y = UPALLOC(0); y->d = 0; y->c[0] = (Num)lm;
+	switch ( current_ff ) {
+		case FF_GFP:
+		case FF_GFPN:
+			MKLM(ONEN,lm);
+			c = (Num)lm;
+			break;
+		case FF_GFS:
+			mqtogfs(ONEM,&fs);
+			c = (Num)fs;
+			break;
+		default:
+			error("generic_powermodup : not implemented yet");
+	}
+	y = UPALLOC(0); y->d = 0; y->c[0] = c;
 	remup(g,f,&x);
 	if ( !x ) {
 		*xp = !d ? y : 0;
@@ -495,11 +583,25 @@ UP *tab;
 	UP y,t,invf;
 	int i,d;
 	LM lm;
+	GFS fs;
+	Num c;
 	struct oEGT eg_rem,eg_mul,eg0,eg1,eg2;
 
 	d = f->d;
-	MKLM(ONEN,lm); 
-	y = UPALLOC(0); y->d = 0; y->c[0] = (Num)lm;
+	switch ( current_ff ) {
+		case FF_GFP:
+		case FF_GFPN:
+			MKLM(ONEN,lm);
+			c = (Num)lm;
+			break;
+		case FF_GFS:
+			mqtogfs(ONEM,&fs);
+			c = (Num)fs;
+			break;
+		default:
+			error("powertabup : not implemented yet");
+	}
+	y = UPALLOC(0); y->d = 0; y->c[0] = c;
 	tab[0] = y;
 	tab[1] = xp;