OpenE2K
/
glibc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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.
This commit is contained in:
Roland McGrath 2003-03-22 00:05:02 +00:00
parent 8f9fb0000e
commit 002ff85305
2 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sysdeps/i386/i486/bits/atomic.h
View File

@ -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; })

18
sysdeps/x86_64/bits/atomic.h
View File

@ -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; })