__asm__ constraint "xm"

Author: bilam

jsrc/avxintrin-emu.h

@@ -1171,15 +1171,6 @@ __emu_mm256_test_impl( __emu_mm, nzc, ps, ps, __emu__m256 );
 
 #endif
 
-#if defined(__clang__)
-#define XM "xm"
-#elif defined( __GNUC__ )
-#define XM "x"
-#else
-#define XM "x"
-#endif
-
-
 #if defined(_WIN32) || ( !defined(__clang__) && defined( __GNUC__ ) && ( __GNUC__ == 4 ) && (__GNUC_MINOR__ < 4 ) ) || defined(OPTMO0)
 /* use macro implementation instead of inline functions to allow -O0 for GCC pre 4.4 */
 
@@ -1189,46 +1180,46 @@ __emu_mm256_test_impl( __emu_mm, nzc, ps, ps, __emu__m256 );
 ({ \
     __m128 res_ = (m1), m2_ = (m2); \
     if ( 7 < (unsigned)predicate ) __asm__ __volatile__ ( "ud2" : : : "memory" ); \
-    __asm__ ( "cmpps %[pred_], %[m2_], %[res_]" : [res_] "+x" (res_) : [m2_] XM (m2_), [pred_] "i" (predicate) ); \
+    __asm__ ( "cmpps %[pred_], %[m2_], %[res_]" : [res_] "+x" (res_) : [m2_] "x" (m2_), [pred_] "i" (predicate) ); \
     res_; })
 
 #define __emu_mm256_cmp_ps(m1, m2, predicate) \
 ({ \
     __emu__m256 res_ = (m1), m2_ = (m2); \
     if ( 7 < (unsigned)predicate ) __asm__ __volatile__ ( "ud2" : : : "memory" ); /* not supported yet */ \
-    __asm__ ( "cmpps %[pred_], %[m2_], %[res_]" : [res_] "+x" (res_.__emu_m128[0]) : [m2_] XM (m2_.__emu_m128[0]), [pred_] "i" (predicate) ); \
-    __asm__ ( "cmpps %[pred_], %[m2_], %[res_]" : [res_] "+x" (res_.__emu_m128[1]) : [m2_] XM (m2_.__emu_m128[1]), [pred_] "i" (predicate) ); \
+    __asm__ ( "cmpps %[pred_], %[m2_], %[res_]" : [res_] "+x" (res_.__emu_m128[0]) : [m2_] "x" (m2_.__emu_m128[0]), [pred_] "i" (predicate) ); \
+    __asm__ ( "cmpps %[pred_], %[m2_], %[res_]" : [res_] "+x" (res_.__emu_m128[1]) : [m2_] "x" (m2_.__emu_m128[1]), [pred_] "i" (predicate) ); \
     res_; })
 
 
 #define __emu_mm_cmp_pd(m1, m2, predicate) \
 ({ \
     __m128d res_ = (m1), m2_ = (m2); \
     if ( 7 < (unsigned)predicate ) __asm__ __volatile__ ( "ud2" : : : "memory" ); /* not supported yet */ \
-    __asm__ ( "cmppd %[pred_], %[m2_], %[res_]" : [res_] "+x" (res_) : [m2_] XM (m2_), [pred_] "i" (predicate) ); \
+    __asm__ ( "cmppd %[pred_], %[m2_], %[res_]" : [res_] "+x" (res_) : [m2_] "x" (m2_), [pred_] "i" (predicate) ); \
     res_; })
 
 #define __emu_mm256_cmp_pd(m1, m2, predicate) \
 ({ \
     __emu__m256d res_ = (m1), m2_ = (m2); \
     if ( 7 < (unsigned)predicate ) __asm__ __volatile__ ( "ud2" : : : "memory" ); /* not supported yet */ \
-    __asm__ ( "cmppd %[pred_], %[m2_], %[res_]" : [res_] "+x" (res_.__emu_m128[0]) : [m2_] XM (m2_.__emu_m128[0]), [pred_] "i" (predicate) ); \
-    __asm__ ( "cmppd %[pred_], %[m2_], %[res_]" : [res_] "+x" (res_.__emu_m128[1]) : [m2_] XM (m2_.__emu_m128[1]), [pred_] "i" (predicate) ); \
+    __asm__ ( "cmppd %[pred_], %[m2_], %[res_]" : [res_] "+x" (res_.__emu_m128[0]) : [m2_] "x" (m2_.__emu_m128[0]), [pred_] "i" (predicate) ); \
+    __asm__ ( "cmppd %[pred_], %[m2_], %[res_]" : [res_] "+x" (res_.__emu_m128[1]) : [m2_] "x" (m2_.__emu_m128[1]), [pred_] "i" (predicate) ); \
     res_; })
 
 
 #define __emu_mm_cmp_ss(m1, m2, predicate) \
 ({ \
     __m128 res_ = (m1), m2_ = (m2); \
     if ( 7 < (unsigned)predicate ) __asm__ __volatile__ ( "ud2" : : : "memory" ); /* not supported yet */ \
-    __asm__ ( "cmpss %[pred_], %[m2_], %[res_]" : [res_] "+x" (res_) : [m2_] XM (m2_), [pred_] "i" (predicate) ); \
+    __asm__ ( "cmpss %[pred_], %[m2_], %[res_]" : [res_] "+x" (res_) : [m2_] "x" (m2_), [pred_] "i" (predicate) ); \
     res_; })
 
 #define __emu_mm_cmp_sd(m1, m2, predicate) \
 ({ \
     __m128 res_ = (m1), m2_ = (m2); \
     if ( 7 < (unsigned)predicate ) __asm__ __volatile__ ( "ud2" : : : "memory" ); /* not supported yet */ \
-    __asm__ ( "cmpsd %[pred_], %[m2_], %[res_]" : [res_] "+x" (res_) : [m2_] XM (m2_), [pred_] "i" (predicate) ); \
+    __asm__ ( "cmpsd %[pred_], %[m2_], %[res_]" : [res_] "+x" (res_) : [m2_] "x" (m2_), [pred_] "i" (predicate) ); \
     res_; })
 
 
@@ -1242,7 +1233,11 @@ static __emu_inline __m128 __emu_mm_cmp_ps(__m128 m1, __m128 m2, const int predi
 
     if (__builtin_constant_p(predicate) && predicate >= 0 && predicate <= 7 ) {
         res = m1;
-        __asm__ ( "cmpps %[pred_], %[m2_], %[res_]" : [res_] "+x" (res) : [m2_] XM (m2), [pred_] "i" (predicate) );
+#if defined(__clang__)
+        __asm__ ( "cmpps %[pred_], %[m2_], %[res_]" : [res_] "+x" (res) : [m2_] "xm" (m2), [pred_] "i" (predicate) );
+#else
+        __asm__ ( "cmpps %[pred_], %[m2_], %[res_]" : [res_] "+x" (res) : [m2_] "x" (m2), [pred_] "i" (predicate) );
+#endif
     } else {
         res = _mm_setzero_ps();
         __asm__ __volatile__ ( "ud2" : : : "memory" ); /* not supported yet */
@@ -1258,7 +1253,11 @@ static __emu_inline __m128d __emu_mm_cmp_pd(__m128d m1, __m128d m2, const int pr
 
     if ( predicate >= 0 && predicate <= 7 ) {
         res = m1;
-        __asm__ ( "cmppd %[pred_], %[m2_], %[res_]" : [res_] "+x" (res) : [m2_] XM (m2), [pred_] "i" (predicate) );
+#if defined(__clang__)
+        __asm__ ( "cmppd %[pred_], %[m2_], %[res_]" : [res_] "+x" (res) : [m2_] "xm" (m2), [pred_] "i" (predicate) );
+#else
+        __asm__ ( "cmppd %[pred_], %[m2_], %[res_]" : [res_] "+x" (res) : [m2_] "x" (m2), [pred_] "i" (predicate) );
+#endif
     } else {
         __asm__ __volatile__ ( "ud2" : : : "memory" ); /* not supported yet */
     }
@@ -1274,7 +1273,11 @@ static __emu_inline __m128d __emu_mm_cmp_sd(__m128d m1, __m128d m2, const int pr
 
     if ( predicate >= 0 && predicate <= 7 ) {
         res = m1;
-        __asm__ ( "cmpsd %[pred_], %[m2_], %[res_]" : [res_] "+x" (res) : [m2_] XM (m2), [pred_] "i" (predicate) );
+#if defined(__clang__)
+        __asm__ ( "cmpsd %[pred_], %[m2_], %[res_]" : [res_] "+x" (res) : [m2_] "xm" (m2), [pred_] "i" (predicate) );
+#else
+        __asm__ ( "cmpsd %[pred_], %[m2_], %[res_]" : [res_] "+x" (res) : [m2_] "x" (m2), [pred_] "i" (predicate) );
+#endif
     } else {
         __asm__ __volatile__ ( "ud2" : : : "memory" ); /* not supported yet */
     }
@@ -1288,7 +1291,11 @@ static __emu_inline __m128 __emu_mm_cmp_ss(__m128 m1, __m128 m2, const int predi
 
     if ( predicate >= 0 && predicate <= 7 ) {
         res = m1;
-        __asm__ ( "cmpss %[pred_], %[m2_], %[res_]" : [res_] "+x" (res) : [m2_] XM (m2), [pred_] "i" (predicate) );
+#if defined(__clang__)
+        __asm__ ( "cmpss %[pred_], %[m2_], %[res_]" : [res_] "+x" (res) : [m2_] "xm" (m2), [pred_] "i" (predicate) );
+#else
+        __asm__ ( "cmpss %[pred_], %[m2_], %[res_]" : [res_] "+x" (res) : [m2_] "x" (m2), [pred_] "i" (predicate) );
+#endif
     } else {
         __asm__ __volatile__ ( "ud2" : : : "memory" ); /* not supported yet */
     }
@@ -2422,6 +2429,4 @@ static __emu_inline __emu__m256i __emu_mm256_sllv_epi64(__emu__m256i a, __emu__m
 
 #endif /* __EMU_M256_NOMAP */
 
-#undef XM
-
 #endif /* __EMU_M256_AVXIMMINTRIN_EMU_H__ */