===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/pdiv.c,v
retrieving revision 1.1
retrieving revision 1.5
diff -u -p -r1.1 -r1.5
--- OpenXM_contrib2/asir2000/builtin/pdiv.c	1999/12/03 07:39:07	1.1
+++ OpenXM_contrib2/asir2000/builtin/pdiv.c	2001/02/21 07:10:17	1.5
@@ -1,4 +1,52 @@
-/* $OpenXM: OpenXM/src/asir99/builtin/pdiv.c,v 1.1.1.1 1999/11/10 08:12:26 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/builtin/pdiv.c,v 1.4 2000/08/22 05:03:59 noro Exp $ 
+*/
 #include "ca.h"
 #include "parse.h"
 
@@ -16,7 +64,7 @@ struct ftab pdiv_tab[] = {
 	{"sdiv_gf2n",Psdiv_gf2n,2},
 	{"srem_gf2n",Psrem_gf2n,2},
 	{"sqr",Psqr,-3},
-	{"tdiv",Ptdiv,2},
+	{"tdiv",Ptdiv,-3},
 	{"udiv",Pudiv,2},
 	{"sdivm",Psdivm,-4},
 	{"sremm",Psremm,-4},
@@ -134,6 +182,7 @@ 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");
@@ -142,7 +191,14 @@ 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 {
 		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);
@@ -236,11 +292,11 @@ LIST *rp;
 		change_mvar(CO,dnd,v,&dnd1); change_mvar(CO,dvr,v,&dvr1);
 		reordvar(CO,v,&vl);
 		ptomp(m,dnd1,&dndm); ptomp(m,dvr1,&dvrm);
-		divsrp(vl,dndm,dvrm,&q,&r); mptop(q,&q1); mptop(r,&r1);
+		divsrmp(vl,m,dndm,dvrm,&q,&r); mptop(q,&q1); mptop(r,&r1);
 		restore_mvar(CO,q1,v,&q); restore_mvar(CO,r1,v,&r);
 	} else {
 		ptomp(m,dnd,&dndm); ptomp(m,dvr,&dvrm);
-		divsrp(CO,dnd,dvr,&q1,&r1); mptop(q1,&q); mptop(r1,&r);
+		divsrmp(CO,m,dndm,dvrm,&q1,&r1); mptop(q1,&q); mptop(r1,&r);
 	}
 	MKNODE(tn,r,0); MKNODE(n,q,tn); MKLIST(*rp,n);
 }