===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/engine/Z.c,v
retrieving revision 1.9
retrieving revision 1.12
diff -u -p -r1.9 -r1.12
--- OpenXM_contrib2/asir2000/engine/Z.c	2007/02/18 05:36:27	1.9
+++ OpenXM_contrib2/asir2000/engine/Z.c	2013/11/05 11:36:58	1.12
@@ -3,7 +3,7 @@
 #include "inline.h"
 
 #if defined(__GNUC__)
-#define INLINE inline
+#define INLINE static inline
 #elif defined(VISUAL)
 #define INLINE __inline
 #else
@@ -677,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
@@ -702,8 +702,9 @@ int _addz_main(unsigned int *m1,int d1,unsigned int *m
 	adc eax,eax
 	mov c,eax
 	}
-#elif ( defined(i386) && !defined(__DARWIN__) )
+#elif defined(i386)
 	asm volatile("\
+	pushl	%%ebx;\
 	movl	%1,%%esi;\
 	movl	%2,%%edi;\
 	movl	%3,%%ebx;\
@@ -721,10 +722,11 @@ 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; i < d2; i++, m1++, m2++, mr++ ) {
 		tmp = *m1 + *m2;
@@ -767,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
@@ -792,8 +794,9 @@ int _subz_main(unsigned int *m1,int d1,unsigned int *m
 	adc eax,eax
 	mov br,eax
 	}
-#elif ( defined(i386) && !defined(__DARWIN__) )
+#elif defined(i386)
 	asm volatile("\
+	pushl	%%ebx;\
 	movl	%1,%%esi;\
 	movl	%2,%%edi;\
 	movl	%3,%%ebx;\
@@ -811,10 +814,11 @@ 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; i < d2; i++, mr++ ) {
 		t = *m1++;