===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/include/inline.h,v
retrieving revision 1.8
retrieving revision 1.13
diff -u -p -r1.8 -r1.13
--- OpenXM_contrib2/asir2000/include/inline.h	2001/09/17 03:33:58	1.8
+++ OpenXM_contrib2/asir2000/include/inline.h	2010/09/01 08:01:09	1.13
@@ -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/include/inline.h,v 1.7 2001/09/17 02:47:08 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/include/inline.h,v 1.12 2009/03/02 16:28:30 ohara 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));
@@ -54,7 +54,7 @@
 #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);\
@@ -103,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
@@ -287,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
@@ -334,3 +334,7 @@ asm volatile("movl	%2,%%eax; mull	%3; addl	%4,%%eax; a
 asm volatile("movl	%1,%%eax; mull	%2; addl	%3,%%eax; adcl	$0,%%edx; divl	%4; movl	%%edx,%0" :"=g"(r) :"g"(a1),"g"(a2),"g"(a3),"g"(d) :"ax","dx");
 #endif
 
+#if defined(i386) && defined(__DARWIN__) && defined(__GNUC__) && defined(__GNUC_MINOR__) && __GNUC__ == 4 && __GNUC_MINOR__ == 4
+#undef DMAR
+#define DMAR(a1,a2,a3,d,r) (r)=dmar(a1,a2,a3,d);
+#endif