===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/engine/Z.c,v
retrieving revision 1.5
retrieving revision 1.14
diff -u -p -r1.5 -r1.14
--- OpenXM_contrib2/asir2000/engine/Z.c	2004/10/06 11:58:52	1.5
+++ OpenXM_contrib2/asir2000/engine/Z.c	2015/08/14 13:51:54	1.14
@@ -2,12 +2,20 @@
 #include "base.h"
 #include "inline.h"
 
-inline void _addz(Z n1,Z n2,Z nr);
-inline void _subz(Z n1,Z n2,Z nr);
-inline void _mulz(Z n1,Z n2,Z nr);
-inline int _addz_main(unsigned int *m1,int d1,unsigned int *m2,int d2,unsigned int *mr);
-inline int _subz_main(unsigned int *m1,int d1,unsigned int *m2,int d2,unsigned int *mr);
+#if defined(__GNUC__)
+#define INLINE static inline
+#elif defined(VISUAL) || defined(__MINGW32__)
+#define INLINE __inline
+#else
+#define INLINE
+#endif
 
+INLINE void _addz(Z n1,Z n2,Z nr);
+INLINE void _subz(Z n1,Z n2,Z nr);
+INLINE void _mulz(Z n1,Z n2,Z nr);
+int _addz_main(unsigned int *m1,int d1,unsigned int *m2,int d2,unsigned int *mr);
+int _subz_main(unsigned int *m1,int d1,unsigned int *m2,int d2,unsigned int *mr);
+
 /* immediate int -> Z */
 #define UTOZ(c,n) (n)=(!((unsigned int)(c))?0:(((unsigned int)(c))<=IMM_MAX?((Z)((((unsigned int)(c))<<1)|1)):utoz((unsigned int)(c))))
 #define STOZ(c,n) (n)=(!((int)(c))?0:(((int)(c))>=IMM_MIN&&((int)(c))<=IMM_MAX?((Z)((((int)(c))<<1)|1)):stoz((int)(c))))
@@ -669,7 +677,7 @@ int _addz_main(unsigned int *m1,int d1,unsigned int *m
 		t = m1; m1 = m2; m2 = t;
 		d = d1; d1 = d2; d2 = d;
 	}
-#if defined(VISUAL)
+#if defined(_M_IX86)
 	__asm {
 	push	esi
 	push	edi
@@ -696,6 +704,7 @@ int _addz_main(unsigned int *m1,int d1,unsigned int *m
 	}
 #elif defined(i386)
 	asm volatile("\
+	pushl	%%ebx;\
 	movl	%1,%%esi;\
 	movl	%2,%%edi;\
 	movl	%3,%%ebx;\
@@ -713,12 +722,13 @@ int _addz_main(unsigned int *m1,int d1,unsigned int *m
 	jnz Lstart__addz;\
 	movl	$0,%%eax;\
 	adcl	%%eax,%%eax;\
-	movl	%%eax,%0"\
+	movl	%%eax,%0;\
+	popl	%%ebx"\
 	:"=m"(c)\
 	:"m"(m1),"m"(m2),"m"(mr),"m"(d2)\
-	:"eax","ebx","ecx","edx","esi","edi");
+	:"eax","ecx","edx","esi","edi");
 #else
-	for ( i = 0, c = 0, mr = BD(nr); i < d2; i++, m1++, m2++, mr++ ) {
+	for ( i = 0, c = 0; i < d2; i++, m1++, m2++, mr++ ) {
 		tmp = *m1 + *m2;
 		if ( tmp < *m1 ) {
 			tmp += c;
@@ -759,7 +769,7 @@ int _subz_main(unsigned int *m1,int d1,unsigned int *m
 		m = m1; m1 = m2; m2 = m;
 		d = d1; d1 = d2; d2 = d;
 	}
-#if defined(VISUAL)
+#if defined(_M_IX86)
 	__asm {
 	push	esi
 	push	edi
@@ -786,6 +796,7 @@ int _subz_main(unsigned int *m1,int d1,unsigned int *m
 	}
 #elif defined(i386)
 	asm volatile("\
+	pushl	%%ebx;\
 	movl	%1,%%esi;\
 	movl	%2,%%edi;\
 	movl	%3,%%ebx;\
@@ -803,12 +814,13 @@ int _subz_main(unsigned int *m1,int d1,unsigned int *m
 	jnz Lstart__subz;\
 	movl	$0,%%eax;\
 	adcl	%%eax,%%eax;\
-	movl	%%eax,%0"\
+	movl	%%eax,%0;\
+	popl	%%ebx"\
 	:"=m"(br)\
 	:"m"(m1),"m"(m2),"m"(mr),"m"(d2)\
-	:"eax","ebx","ecx","edx","esi","edi");
+	:"eax","ecx","edx","esi","edi");
 #else
-	for ( i = 0, br = 0, mr = BD(nr); i < d2; i++, mr++ ) {
+	for ( i = 0, br = 0; i < d2; i++, mr++ ) {
 		t = *m1++;
 		tmp = *m2++ + br;
 		if ( br > 0 && !tmp ) {