===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/include/inline.h,v
retrieving revision 1.6
retrieving revision 1.12
diff -u -p -r1.6 -r1.12
--- OpenXM_contrib2/asir2000/include/inline.h	2001/08/24 07:42:44	1.6
+++ OpenXM_contrib2/asir2000/include/inline.h	2009/03/02 16:28:30	1.12
@@ -45,17 +45,16 @@
  * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,
  * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.
  *
- * $OpenXM: OpenXM_contrib2/asir2000/include/inline.h,v 1.5 2000/09/21 09:19:26 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/include/inline.h,v 1.11 2007/09/15 10:17:08 noro Exp $ 
 */
 #define DMB(base,a1,a2,u,l) (l)=dmb(base,a1,a2,&(u));
 #define DMAB(base,a1,a2,a3,u,l) (l)=dmab(base,a1,a2,a3,&(u));
 #define DMAR(a1,a2,a3,d,r) (r)=dmar(a1,a2,a3,d);
-
 #define DM27(a1,a2,u,l) (l)=dm_27(a1,a2,&(u));
 #define DMA27(a1,a2,a3,u,l) (l)=dma_27(a1,a2,a3,&(u));
 #define DSAB27(base,a1,a2,u,l) (l)=dmab(base,a1,BASE27,a2,&(u));
 
-#if defined(__GNUC__) || defined(__alpha) || defined(mips) || defined(_IBMR2)
+#if defined(__GNUC__) || defined(__INTEL_COMPILER) || defined(__alpha) || defined(mips) || defined(_IBMR2)
 #define DM(a1,a2,u,l)\
 {UL _t;\
 _t=(UL)(a1)*(UL)(a2);\
@@ -104,7 +103,7 @@ asm volatile("udiv %1,%2,%0"    :"=r"(_t): "r"(a2),"r"
 #define DSAB27(base,a1,a2,u,l) (l)=dsab_27(base,a1,a2,&(u));
 #endif
 
-#if defined(VISUAL)
+#if defined(_M_IX86)
 
 #undef DM
 #undef DMA
@@ -288,7 +287,7 @@ asm volatile("udiv %1,%2,%0"    :"=r"(_t): "r"(a2),"r"
 }
 #endif
 
-#if !defined(VISUAL) && defined(i386) && (defined(linux) || defined(__FreeBSD__) || defined(__NetBSD__))
+#if !defined(VISUAL) && defined(i386) && (defined(linux) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__CYGWIN__) || defined(__DARWIN__))
 
 #if 0
 #undef DMA
@@ -302,6 +301,7 @@ asm volatile("movl	%%eax,%0"	: "=g" (l)	:		: "ax"	);
 #endif
 
 #undef DM
+#undef DMA
 #undef DMB
 #undef DMAB
 #undef DMAR
@@ -320,6 +320,9 @@ asm volatile(" movl	%2,%%edx; movl	%3,%%eax; divl	%4; 
 
 #define DM(a1,a2,u,l)\
 asm volatile(" movl	%2,%%eax; mull	%3; movl	%%edx,%0; movl	%%eax,%1" :"=g"(u),"=g"(l) :"g"(a1),"g"(a2) :"ax","dx");
+
+#define DMA(a1,a2,a3,u,l)\
+asm volatile("movl  %2,%%eax; mull  %3; addl    %4,%%eax; adcl  $0,%%edx; movl    %%edx,%0; movl %%eax,%1" :"=g"(u), "=g"(l) :"g"(a1),"g"(a2),"g"(a3) :"ax","dx");
 
 #define DMB(base,a1,a2,u,l)\
 asm volatile(" movl	%2,%%eax;" mull	%3;" divl	%4;" movl	%%edx,%0;" movl	%%eax,%0" :"=g"(l),"=g"(u) :"g"(a1),"g"(a2),"g"(base) :"ax","dx");