===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/engine/lmi.c,v
retrieving revision 1.2
retrieving revision 1.5
diff -u -p -r1.2 -r1.5
--- OpenXM_contrib2/asir2000/engine/lmi.c	2000/08/21 08:31:27	1.2
+++ OpenXM_contrib2/asir2000/engine/lmi.c	2017/01/08 03:05:39	1.5
@@ -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/lmi.c,v 1.1.1.1 1999/12/03 07:39:08 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/engine/lmi.c,v 1.4 2001/10/09 01:36:13 noro Exp $ 
 */
 #include "ca.h"
 #include "base.h"
@@ -67,8 +67,7 @@ int lm_lazy;
 
 static GEN_LM current_mod_lm;
 
-void random_lm(r)
-LM *r;
+void random_lm(LM *r)
 {
 	N n,t;
 
@@ -79,9 +78,7 @@ LM *r;
 	MKLM(t,*r);
 }
 
-void ntosparsen(p,bits)
-N p;
-N *bits;
+void ntosparsen(N p,N *bits)
 {
 	int l,i,j,nz;
 	N r;
@@ -101,10 +98,10 @@ N *bits;
 	}
 }
 
-void setmod_lm(p)
-N p;
+void setmod_lm(N p)
 {
 	int i;
+    Q q;
 
 	if ( !current_mod_lm )
 		current_mod_lm = (GEN_LM)MALLOC(sizeof(struct oGEN_LM));
@@ -122,10 +119,10 @@ N p;
 			current_mod_lm->id = UP2_SPARSE; /* XXX */
 		}
 	}
+    setmod_lf(p);
 }
 
-void getmod_lm(p)
-N *p;
+void getmod_lm(N *p)
 {
 	if ( !current_mod_lm )
 		*p = 0;
@@ -133,9 +130,7 @@ N *p;
 		*p = current_mod_lm->dense;
 }
 
-void simplm(n,r)
-LM n;
-LM *r;
+void simplm(LM n,LM *r)
 {
 	N rem;
 
@@ -149,10 +144,23 @@ LM *r;
 	}
 }
 
-void qtolm(q,l)
-Q q;
-LM *l;
+void simplm_force(LM n,LM *r)
 {
+	N rem;
+
+	if ( !n )
+		*r = 0;
+	else if ( NID(n) != N_LM )
+		*r = n;
+	else {
+		gen_simpn_force(n->body,&rem);
+		MKLM(rem,*r);
+	}
+}
+
+
+void qtolm(Q q,LM *l)
+{
 	N rn;
 	LM a,b,c;
 
@@ -176,11 +184,8 @@ LM *l;
 
 #define NZLM(a) ((a)&&(NID(a)==N_LM))
 
-void addlm(a,b,c)
-LM a,b;
-LM *c;
+void addlm(LM a,LM b,LM *c)
 {
-	int s;
 	N t,t1;
 	LM z;
 
@@ -196,12 +201,10 @@ LM *c;
 	}
 }
 
-void sublm(a,b,c)
-LM a,b;
-LM *c;
+void sublm(LM a,LM b,LM *c)
 {
 	int s;
-	N t,t1,mod;
+	N t;
 	LM z;
 
 	qtolm((Q)a,&z); a = z; qtolm((Q)b,&z); b = z;
@@ -223,11 +226,9 @@ LM *c;
 	}
 }
 
-void mullm(a,b,c)
-LM a,b;
-LM *c;
+void mullm(LM a,LM b,LM *c)
 {
-	N t,q,r;
+	N t,r;
 	LM z;
 
 	qtolm((Q)a,&z); a = z; qtolm((Q)b,&z); b = z;
@@ -240,9 +241,7 @@ LM *c;
 	}
 }
 
-void divlm(a,b,c)
-LM a,b;
-LM *c;
+void divlm(LM a,LM b,LM *c)
 {
 	LM r;
 	Q t,m,i;
@@ -261,8 +260,7 @@ LM *c;
 	}
 }
 
-void chsgnlm(a,c)
-LM a,*c;
+void chsgnlm(LM a,LM *c)
 {
 	LM t;
 	N s,u;
@@ -277,10 +275,7 @@ LM a,*c;
 	}
 }
 
-void pwrlm(a,b,c)
-LM a;
-Q b;
-LM *c;
+void pwrlm(LM a,Q b,LM *c)
 {
 	LM t;
 	N s;
@@ -296,9 +291,7 @@ LM *c;
 	}
 }
 
-void pwrlm0(a,n,c)
-N a,n;
-N *c;
+void pwrlm0(N a,N n,N *c)
 {
 	N n1,t,t1,t2,r1;
 	int r;
@@ -318,8 +311,7 @@ N *c;
 	}
 }
 
-int cmplm(a,b)
-LM a,b;
+int cmplm(LM a,LM b)
 {
 	LM z;
 
@@ -337,9 +329,7 @@ LM a,b;
 
 void remn_special(N,N,int,unsigned int ,N *);
 
-void gen_simpn(a,b)
-N a;
-N *b;
+void gen_simpn(N a,N *b)
 {
 	if ( !current_mod_lm )
 		error("gen_simpn: current_mod_lm is not set");
@@ -351,9 +341,7 @@ N *b;
 		remn(a,current_mod_lm->dense,b);	
 }
 
-void gen_simpn_force(a,b)
-N a;
-N *b;
+void gen_simpn_force(N a,N *b)
 {
 	if ( !current_mod_lm )
 		error("gen_simpn_force: current_mod_lm is not set");