2003-03-21 Roland McGrath <roland@redhat.com>

	* sysdeps/i386/i486/bits/atomic.h (atomic_bit_set): Use "ir"
	constraint to permit non-constant BIT argument.
	(atomic_bit_test_set): Likewise.
	* sysdeps/x86_64/bits/atomic.h (atomic_bit_test_set): Likewise.
	(atomic_bit_set): Likewise.  Use 1UL in case that BIT might be >= 32.
	For quadword case, use "i" constraint if __builtin_constant_p and < 32
	or "r" constraint otherwise.

diff --git a/sysdeps/i386/i486/bits/atomic.h b/sysdeps/i386/i486/bits/atomic.h
index 502d392..33c47dc 100644 (file)
--- a/sysdeps/i386/i486/bits/atomic.h
+++ b/sysdeps/i386/i486/bits/atomic.h
@@ -326,15 +326,15 @@ typedef uintmax_t uatomic_max_t;
   (void) ({ if (sizeof (*mem) == 1)                                          \
              __asm __volatile (LOCK "orb %b2, %0"                            \
                                : "=m" (*mem)                                 \
-                               : "m" (*mem), "i" (1 << (bit)));              \
+                               : "m" (*mem), "ir" (1 << (bit)));             \
            else if (sizeof (*mem) == 2)                                      \
              __asm __volatile (LOCK "orw %w2, %0"                            \
                                : "=m" (*mem)                                 \
-                               : "m" (*mem), "i" (1 << (bit)));              \
+                               : "m" (*mem), "ir" (1 << (bit)));             \
            else if (sizeof (*mem) == 4)                                      \
              __asm __volatile (LOCK "orl %2, %0"                             \
                                : "=m" (*mem)                                 \
-                               : "m" (*mem), "i" (1 << (bit)));              \
+                               : "m" (*mem), "ir" (1 << (bit)));             \
            else                                                              \
              abort ();                                                       \
            })
@@ -345,15 +345,15 @@ typedef uintmax_t uatomic_max_t;
      if (sizeof (*mem) == 1)                                                 \
        __asm __volatile (LOCK "btsb %3, %1; setc %0"                         \
                         : "=q" (__result), "=m" (*mem)                       \
-                        : "m" (*mem), "i" (bit));                            \
+                        : "m" (*mem), "ir" (bit));                           \
      else if (sizeof (*mem) == 2)                                            \
        __asm __volatile (LOCK "btsw %3, %1; setc %0"                         \
                         : "=q" (__result), "=m" (*mem)                       \
-                        : "m" (*mem), "i" (bit));                            \
+                        : "m" (*mem), "ir" (bit));                           \
      else if (sizeof (*mem) == 4)                                            \
        __asm __volatile (LOCK "btsl %3, %1; setc %0"                         \
                         : "=q" (__result), "=m" (*mem)                       \
-                        : "m" (*mem), "i" (bit));                            \
+                        : "m" (*mem), "ir" (bit));                           \
      else                                                                    \
        abort ();                                                             \
      __result; })

diff --git a/sysdeps/x86_64/bits/atomic.h b/sysdeps/x86_64/bits/atomic.h
index 00f5586..1d41e77 100644 (file)
--- a/sysdeps/x86_64/bits/atomic.h
+++ b/sysdeps/x86_64/bits/atomic.h
@@ -279,19 +279,23 @@ typedef uintmax_t uatomic_max_t;
   (void) ({ if (sizeof (*mem) == 1)                                          \
              __asm __volatile (LOCK "orb %b2, %0"                            \
                                : "=m" (*mem)                                 \
-                               : "m" (*mem), "i" (1 << (bit)));              \
+                               : "m" (*mem), "ir" (1 << (bit)));             \
            else if (sizeof (*mem) == 2)                                      \
              __asm __volatile (LOCK "orw %w2, %0"                            \
                                : "=m" (*mem)                                 \
-                               : "m" (*mem), "i" (1 << (bit)));              \
+                               : "m" (*mem), "ir" (1 << (bit)));             \
            else if (sizeof (*mem) == 4)                                      \
              __asm __volatile (LOCK "orl %2, %0"                             \
                                : "=m" (*mem)                                 \
+                               : "m" (*mem), "ir" (1 << (bit)));             \
+           else if (__builtin_constant_p (bit) && (bit) < 32)                \
+             __asm __volatile (LOCK "orq %2, %0"                             \
+                               : "=m" (*mem)                                 \
                                : "m" (*mem), "i" (1 << (bit)));              \
            else                                                              \
              __asm __volatile (LOCK "orq %q2, %0"                            \
                                : "=m" (*mem)                                 \
-                               : "m" (*mem), "i" (1 << (bit)));              \
+                               : "m" (*mem), "r" (1UL << (bit)));            \
            })
 
 
@@ -300,17 +304,17 @@ typedef uintmax_t uatomic_max_t;
      if (sizeof (*mem) == 1)                                                 \
        __asm __volatile (LOCK "btsb %3, %1; setc %0"                         \
                         : "=q" (__result), "=m" (*mem)                       \
-                        : "m" (*mem), "i" (bit));                            \
+                        : "m" (*mem), "ir" (bit));                           \
      else if (sizeof (*mem) == 2)                                            \
        __asm __volatile (LOCK "btsw %3, %1; setc %0"                         \
                         : "=q" (__result), "=m" (*mem)                       \
-                        : "m" (*mem), "i" (bit));                            \
+                        : "m" (*mem), "ir" (bit));                           \
      else if (sizeof (*mem) == 4)                                            \
        __asm __volatile (LOCK "btsl %3, %1; setc %0"                         \
                         : "=q" (__result), "=m" (*mem)                       \
-                        : "m" (*mem), "i" (bit));                            \
+                        : "m" (*mem), "ir" (bit));                           \
      else                                                                    \
        __asm __volatile (LOCK "btsq %3, %1; setc %0"                         \
                         : "=q" (__result), "=m" (*mem)                       \
-                        : "m" (*mem), "i" (bit));                            \
+                        : "m" (*mem), "ir" (bit));                           \
      __result; })