===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/pdiv.c,v
retrieving revision 1.3
retrieving revision 1.9
diff -u -p -r1.3 -r1.9
--- OpenXM_contrib2/asir2000/builtin/pdiv.c	2000/08/21 08:31:20	1.3
+++ OpenXM_contrib2/asir2000/builtin/pdiv.c	2006/11/08 07:34:33	1.9
@@ -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,13 +45,13 @@
  * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,
  * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.
  *
- * $OpenXM: OpenXM_contrib2/asir2000/builtin/pdiv.c,v 1.2 2000/01/26 01:36:12 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/builtin/pdiv.c,v 1.8 2004/06/30 04:29:38 noro Exp $ 
 */
 #include "ca.h"
 #include "parse.h"
 
-void Psdiv(), Psrem(), Ptdiv(), Psqr(), Pinva_mod();
-void Psdiv_gf2n(), Psrem_gf2n();
+void Psdiv(), Psrem(), Ptdiv(), Psqr(), Pinva_mod(), Pprem();
+void Psdiv_gf2n(), Psrem_gf2n(), Pgcd_gf2n();
 void Psdivm(), Psremm(), Psqrm();
 void Psrem_mod();
 void Pugcd();
@@ -61,10 +61,12 @@ void Pudiv();
 struct ftab pdiv_tab[] = {
 	{"sdiv",Psdiv,-3},
 	{"srem",Psrem,-3},
+	{"prem",Pprem,-3},
 	{"sdiv_gf2n",Psdiv_gf2n,2},
 	{"srem_gf2n",Psrem_gf2n,2},
+	{"gcd_gf2n",Pgcd_gf2n,2},
 	{"sqr",Psqr,-3},
-	{"tdiv",Ptdiv,2},
+	{"tdiv",Ptdiv,-3},
 	{"udiv",Pudiv,2},
 	{"sdivm",Psdivm,-4},
 	{"sremm",Psremm,-4},
@@ -118,6 +120,31 @@ Obj *rp;
 		divsrp(CO,dnd,dvr,&q,(P *)rp);
 }
 
+void Pprem(arg,rp)
+NODE arg;
+P *rp;
+{
+	P q,r,dnd,dnd1,dvr,dvr1;
+	V v;
+	VL vl;
+
+	asir_assert(ARG0(arg),O_P,"prem");
+	asir_assert(ARG1(arg),O_P,"prem");
+	dnd = (P)ARG0(arg); dvr = (P)ARG1(arg);
+	if ( !dvr ) error("prem : division by 0");
+	if ( !dnd ) {
+		*rp = 0; return;
+	}
+	if ( argc(arg) == 3 ) {
+		v = VR((P)ARG2(arg));
+		change_mvar(CO,dnd,v,&dnd1); change_mvar(CO,dvr,v,&dvr1);
+		reordvar(CO,v,&vl);
+		premp(vl,dnd1,dvr1,&r);
+		restore_mvar(CO,r,v,rp);
+	} else
+		premp(CO,dnd,dvr,rp);
+}
+
 void Psqr(arg,rp)
 NODE arg;
 LIST *rp;
@@ -177,11 +204,30 @@ GF2N *rp;
 	}
 }
 
+void Pgcd_gf2n(arg,rp)
+NODE arg;
+GF2N *rp;
+{
+	GF2N p1,p2;
+	UP2 gcd;
+
+	p1 = (GF2N)ARG0(arg); p2 = (GF2N)ARG1(arg);
+	if ( !p1 )
+		*rp = p2;
+	else if ( !p2 )
+		*rp = p1;
+	else {
+		gcdup2(p1->body,p2->body,&gcd);
+		MKGF2N(gcd,*rp);		
+	}
+}
+
 void Ptdiv(arg,rp)
 NODE arg;
 P *rp;
 {
 	P p1,p2,q1,q2,q,c1,c2,c;
+	int m;
 
 	p1 = (P)ARG0(arg); p2 = (P)ARG1(arg);
 	asir_assert(p1,O_P,"tdiv");
@@ -190,11 +236,21 @@ P *rp;
 		*rp = 0;
 	else if ( (OID(p1) > O_P) || (OID(p2) > O_P ) )
 		*rp = 0;
-	else {
+	else if ( argc(arg) == 3 ) {
+		m = QTOS((Q)ARG2(arg));
+		ptomp(m,p1,&q1); ptomp(m,p2,&q2);
+		if ( divtmp(CO,m,q1,q2,&q) )
+			mptop(q,rp);
+		else
+			*rp = 0;
+	} else if ( qpcheck((Obj)p1) && qpcheck((Obj)p2) ) {
 		ptozp(p1,1,(Q *)&c1,&q1); ptozp(p2,1,(Q *)&c2,&q2);
 		if ( divtpz(CO,q1,q2,&q) ) {
 			divq((Q)c1,(Q)c2,(Q *)&c); mulp(CO,q,c,rp);
 		} else
+			*rp = 0;
+	} else {
+		if ( !divtp(CO,p1,p2,rp) )
 			*rp = 0;
 	}
 }