===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/int.c,v
retrieving revision 1.5
retrieving revision 1.9
diff -u -p -r1.5 -r1.9
--- OpenXM_contrib2/asir2000/builtin/int.c	2000/08/22 05:03:58	1.5
+++ OpenXM_contrib2/asir2000/builtin/int.c	2001/06/07 04:54:38	1.9
@@ -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/int.c,v 1.4 2000/08/21 08:31:20 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/builtin/int.c,v 1.8 2000/12/21 02:45:16 murao Exp $ 
 */
 #include "ca.h"
 #include "parse.h"
@@ -66,15 +66,12 @@ void Psmall_jacobi();
 void Pdp_set_mpi();
 void Pntoint32(),Pint32ton();
 
-#ifdef HMEXT
 void Pigcdbin(), Pigcdbmod(), PigcdEuc(), Pigcdacc(), Pigcdcntl();
 
 void Pihex();
 void Pimaxrsh(), Pilen();
 void Ptype_t_NB();
 
-#endif /* HMEXT */
-
 struct ftab int_tab[] = {
 	{"dp_set_mpi",Pdp_set_mpi,-1},
 	{"isqrt",Pisqrt,1},
@@ -105,16 +102,13 @@ struct ftab int_tab[] = {
 	{"ixor",Pixor,2},
 	{"ishift",Pishift,2},
 	{"small_jacobi",Psmall_jacobi,2},
-#ifdef HMEXT
+
 	{"igcdbin",Pigcdbin,2},		/* HM@CCUT extension */
 	{"igcdbmod",Pigcdbmod,2},	/* HM@CCUT extension */
 	{"igcdeuc",PigcdEuc,2},		/* HM@CCUT extension */
 	{"igcdacc",Pigcdacc,2},		/* HM@CCUT extension */
 	{"igcdcntl",Pigcdcntl,-1},	/* HM@CCUT extension */
-	{"ihex",Pihex,1},	/* HM@CCUT extension */
-	{"imaxrsh",Pimaxrsh,1},	/* HM@CCUT extension */
-	{"ilen",Pilen,1},	/* HM@CCUT extension */
-#endif /* HMEXT */
+
 	{"mt_save",Pmt_save,1},
 	{"mt_load",Pmt_load,1},
 	{"ntoint32",Pntoint32,1},
@@ -501,6 +495,35 @@ LIST *rp;
 	MKNODE(n1,r,0); MKNODE(n0,q,n1); MKLIST(*rp,n0);
 }
 
+/*
+ * gcd = GCD(a,b), ca = a/g, cb = b/g
+ */
+
+void igcd_cofactor(a,b,gcd,ca,cb)
+Q a,b;
+Q *gcd,*ca,*cb;
+{
+	N gn,tn;
+	
+	if ( !a ) {
+		if ( !b )
+			error("igcd_cofactor : invalid input");
+		else {
+			*ca = 0;
+			*cb = ONE;
+			*gcd = b;
+		}
+	} else if ( !b ) {
+		*ca = ONE;
+		*cb = 0;
+		*gcd = a;
+	} else {
+		gcdn(NM(a),NM(b),&gn); NTOQ(gn,1,*gcd);
+		divsn(NM(a),gn,&tn); NTOQ(tn,SGN(a),*ca);
+		divsn(NM(b),gn,&tn); NTOQ(tn,SGN(b),*cb);
+	}
+}
+
 void igcdv(a,rp)
 VECT a;
 Q *rp;
@@ -868,7 +891,7 @@ Q *rp;
 	UTOQ(r,*rp);
 }
 
-#if defined(VISUAL) || defined(THINK_C)
+#if defined(VISUAL)
 void srandom(unsigned int);
 
 static unsigned int R_Next;
@@ -907,14 +930,15 @@ void Plprime(arg,rp)
 NODE arg;
 Q *rp;
 {
-	int i;
+	int i,p;
 
 	asir_assert(ARG0(arg),O_N,"lprime");
 	i = QTOS((Q)ARG0(arg));
-	if ( i < 0 || i >= 1000 )
+	if ( i < 0 )
 		*rp = 0;
-	else
-		STOQ(lprime[i],*rp);
+	else 
+		p = get_lprime(i);
+	STOQ(p,*rp);
 }
 
 extern int up_kara_mag, up_tkara_mag, up_fft_mag;
@@ -965,7 +989,6 @@ Q *rp;
 	STOQ(up2_kara_mag,*rp);
 }
 
-#ifdef HMEXT
 void Pigcdbin(arg,rp)
 NODE arg;
 Obj *rp;
@@ -1116,60 +1139,3 @@ Obj *rp;
 	*rp = (Obj)a;
 	return;
 }
-
-
-void Pimaxrsh(arg,rp)
-NODE arg;
-LIST *rp;
-{
-	N n1, n2;
-	Q q;
-	NODE node1, node2;
-	int bits;
-	N maxrshn();
-	
-	q = (Q)ARG0(arg);
-	asir_assert(q,O_N,"imaxrsh");
-	if ( !q ) n1 = n2 = 0;
-	else {
-		n1 = maxrshn( NM(q), &bits );
-		STON( bits, n2 );
-	}
-	NTOQ( n2, 1, q );
-	MKNODE( node2, q, 0 );
-	NTOQ( n1, 1, q );
-	MKNODE( node1, q, node2 );
-	MKLIST( *rp, node1 );
-}
-void Pilen(arg,rp)
-NODE arg;
-Obj *rp;
-{
-	Q q;
-	int l;
-	
-	q = (Q)ARG0(arg);
-	asir_assert(q,O_N,"ilenh");
-	if ( !q ) l = 0;
-	else l = PL(NM(q));
-	STOQ(l,q);
-	*rp = (Obj)q;
-}
-
-void Pihex(arg,rp)
-NODE arg;
-Obj *rp;
-{
-	Q n1;
-	
-	n1 = (Q)ARG0(arg);
-	asir_assert(n1,O_N,"ihex");
-	if ( n1 ) {
-		int i, l = PL(NM(n1)), *p = BD(NM(n1));
-
-		for ( i = 0; i < l; i++ ) printf( " 0x%08x", p[i] );
-		printf( "\n" );
-	} else printf( " 0x%08x\n", 0 );
-	*rp = (Obj)n1;
-}
-#endif /* HMEXT */