===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/asm/ddN.c,v
retrieving revision 1.2
retrieving revision 1.13
diff -u -p -r1.2 -r1.13
--- OpenXM_contrib2/asir2000/asm/ddN.c	2000/08/21 08:31:17	1.2
+++ OpenXM_contrib2/asir2000/asm/ddN.c	2015/08/29 04:15:04	1.13
@@ -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/asm/ddN.c,v 1.1.1.1 1999/12/03 07:39:06 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/asm/ddN.c,v 1.12 2014/03/29 18:53:57 ohara Exp $
 */
 #ifndef FBASE
 #define FBASE
@@ -55,12 +55,12 @@
 #include "base.h"
 #include "inline.h"
 
-void bxprintn(N),bprintn(N);
-void divnmain_special(int,int,unsigned int *,unsigned int *,unsigned int *);
-void dupn(N,N);
+#if defined(__GNUC__)
+unsigned int divn_1(unsigned int *p,int s,unsigned int d,unsigned int *r)  __attribute__ ((noinline));
+void muln_1(unsigned int *p,int s,unsigned int d,unsigned int *r)  __attribute__ ((noinline));
+#endif
 
-void divn(n1,n2,nq,nr)
-N n1,n2,*nq,*nr;
+void divn(N n1,N n2,N *nq,N *nr)
 {
 	int tmp,b;
 	int i,j,d1,d2,dd;
@@ -122,8 +122,7 @@ N n1,n2,*nq,*nr;
 	}
 }
 
-void divsn(n1,n2,nq)
-N n1,n2,*nq;
+void divsn(N n1,N n2,N *nq)
 {
 	int d1,d2,dd,i,b;
 	unsigned int *m1,*m2;
@@ -162,8 +161,7 @@ N n1,n2,*nq;
 	}
 }
 
-void remn(n1,n2,nr)
-N n1,n2,*nr;
+void remn(N n1,N n2,N *nr)
 {
 	int d1,d2,tmp;
 	unsigned int uq,ur;
@@ -195,11 +193,7 @@ N n1,n2,*nr;
 
 /* d = 2^(32*words)-lower */
 
-void remn_special(a,d,bits,lower,b)
-N a,d;
-int bits;
-unsigned int lower;
-N *b;
+void remn_special(N a,N d,int bits,unsigned int lower,N *b)
 {
 	int words;
 	N r;
@@ -237,10 +231,7 @@ N *b;
 	} else
 		*b = r;
 }
-void mulin(n,d,p)
-N n;
-unsigned int d;
-unsigned int *p;
+void mulin(N n,unsigned int d,unsigned int *p)
 {
 	unsigned int carry;
 	unsigned int *m,*me;
@@ -252,10 +243,7 @@ unsigned int *p;
 	*p = carry;
 }
 
-unsigned int divin(n,dvr,q)
-N n;
-unsigned int dvr;
-N *q;
+unsigned int divin(N n,unsigned int dvr,N *q)
 {
 	int d;
 	unsigned int up;
@@ -277,8 +265,7 @@ N *q;
 	return ( up );
 }
 
-void bprintn(n)
-N n;
+void bprintn(N n)
 {
 	int l,i;
 	unsigned int *b;
@@ -292,8 +279,7 @@ N n;
 	}
 }
 
-void bxprintn(n)
-N n;
+void bxprintn(N n)
 {
 	int l,i;
 	unsigned int *b;
@@ -307,9 +293,8 @@ N n;
 	}
 }
 
-#if defined(VISUAL) || defined(i386)
-void muln(n1,n2,nr)
-N n1,n2,*nr;
+#if (defined(_M_IX86) || defined(i386)) && !defined(__MINGW32__)
+void muln(N n1,N n2,N *nr)
 {
 	unsigned int tmp,carry,mul;
 	unsigned int *p1,*m1,*m2;
@@ -341,8 +326,7 @@ N n1,n2,*nr;
 	}
 }
 
-void _muln(n1,n2,nr)
-N n1,n2,nr;
+void _muln(N n1,N n2,N nr)
 {
 	unsigned int mul;
 	unsigned int *m1,*m2;
@@ -365,14 +349,10 @@ N n1,n2,nr;
 	}
 }
 
-void muln_1(p,s,d,r)
-unsigned int *p;
-int s;
-unsigned int d;
-unsigned int *r;
+void muln_1(unsigned int *p,int s,unsigned int d,unsigned int *r)
 {
 	/* esi : p, edi : r, carry : ebx, s : ecx */
-#if defined(VISUAL)
+#if defined(_M_IX86)
 	__asm {
 	push esi
 	push edi
@@ -399,6 +379,7 @@ unsigned int *r;
 	}
 #else
 	asm volatile("\
+	pushl	%%ebx;\
 	movl	%0,%%esi;\
 	movl	%1,%%edi;\
 	movl	$0,%%ebx;\
@@ -415,16 +396,15 @@ unsigned int *r;
 	leal	4(%%edi),%%edi;\
 	decl	%3;\
 	jnz		Lstart_muln;\
-	movl	%%ebx,(%%edi)"\
+	movl	%%ebx,(%%edi);\
+	popl	%%ebx"\
 	:\
 	:"m"(p),"m"(r),"m"(d),"m"(s)\
-	:"eax","ebx","edx","esi","edi");
+	:"eax","edx","esi","edi");
 #endif
 }
 
-void divnmain(d1,d2,m1,m2,q)
-int d1,d2;
-unsigned int *m1,*m2,*q;
+void divnmain(int d1,int d2,unsigned int *m1,unsigned int *m2,unsigned int *q)
 {
 	int i,j;
 	UL r,ltmp;
@@ -476,9 +456,7 @@ unsigned int *m1,*m2,*q;
 	}
 }
 
-void divnmain_special(d1,d2,m1,m2,q)
-int d1,d2;
-unsigned int *m1,*m2,*q;
+void divnmain_special(int d1,int d2,unsigned int *m1,unsigned int *m2,unsigned int *q)
 {
 	int i,j;
 	UL ltmp;
@@ -507,11 +485,7 @@ unsigned int *m1,*m2,*q;
 	}
 }
 
-unsigned int divn_1(p,s,d,r)
-unsigned int *p;
-int s;
-unsigned int d;
-unsigned int *r;
+unsigned int divn_1(unsigned int *p,int s,unsigned int d,unsigned int *r)
 {
 /*
 	unsigned int borrow,l;
@@ -527,7 +501,7 @@ unsigned int *r;
 	return borrow;
 */
 	/* esi : p, edi : r, borrow : ebx, s : ecx */
-#if defined(VISUAL)
+#if defined(_M_IX86)
 	__asm {
 	push esi
 	push edi
@@ -556,6 +530,7 @@ unsigned int *r;
 	unsigned int borrow;
 
 	asm volatile("\
+	pushl	%%ebx;\
 	movl	%1,%%esi;\
 	movl	%2,%%edi;\
 	movl	$0,%%ebx;\
@@ -571,10 +546,11 @@ unsigned int *r;
 	leal	4(%%edi),%%edi;\
 	decl	%4;\
 	jnz		Lstart_divn;\
-	movl	%%ebx,%0"\
+	movl	%%ebx,%0;\
+	popl	%%ebx"\
 	:"=m"(borrow)\
 	:"m"(p),"m"(r),"m"(d),"m"(s)\
-	:"eax","ebx","edx","esi","edi");
+	:"eax","edx","esi","edi");
 
 	return borrow;
 #endif
@@ -582,8 +558,7 @@ unsigned int *r;
 
 #else
 
-void muln(n1,n2,nr)
-N n1,n2,*nr;
+void muln(N n1,N n2,N *nr)
 {
 	unsigned int tmp,carry,mul;
 	unsigned int *p1,*pp,*m1,*m2;
@@ -619,10 +594,9 @@ N n1,n2,*nr;
 	}
 }
 
-void _muln(n1,n2,nr)
-N n1,n2,nr;
+void _muln(N n1,N n2,N nr)
 {
-	unsigned int tmp,carry,mul;
+	unsigned int carry=0,mul;
 	unsigned int *p1,*pp,*m1,*m2;
 	int i,j,d1,d2;
 
@@ -649,11 +623,7 @@ N n1,n2,nr;
 
 /* r[0...s] = p[0...s-1]*d */
 
-void muln_1(p,s,d,r)
-unsigned int *p;
-int s;
-unsigned int d;
-unsigned int *r;
+void muln_1(unsigned int *p,int s,unsigned int d,unsigned int *r)
 {
 	unsigned int carry;
 
@@ -663,13 +633,11 @@ unsigned int *r;
 	*r = carry;
 }
 
-void divnmain(d1,d2,m1,m2,q)
-int d1,d2;
-unsigned int *m1,*m2,*q;
+void divnmain(int d1,int d2,unsigned int *m1,unsigned int *m2,unsigned int *q)
 {
 	int i,j;
 	UL r,ltmp;
-	unsigned int l,ur,tmp;
+	unsigned int l,ur;
 	unsigned int *n1,*n2;
 	unsigned int u,qhat;
 	unsigned int v1,v2;
@@ -711,11 +679,7 @@ unsigned int *m1,*m2,*q;
 	}
 }
 
-unsigned int divn_1(p,s,d,r)
-unsigned int *p;
-int s;
-unsigned int d;
-unsigned int *r;
+unsigned int divn_1(unsigned int *p,int s,unsigned int d,unsigned int *r)
 {
 	unsigned int borrow,l;