This is the mail archive of the libc-hacker@sources.redhat.com mailing list for the glibc project.
Note that libc-hacker is a closed list. You may look at the archives of this list, but subscription and posting are not open.
Index Nav: | [Date Index] [Subject Index] [Author Index] [Thread Index] | |
---|---|---|
Message Nav: | [Date Prev] [Date Next] | [Thread Prev] [Thread Next] |
Other format: | [Raw text] |
Hi! Tested on {i386,i686,s390,s390x,ppc32,ia64,x86_64} {-O0,-O2} tst-atomic{,-long}.c. The newly added tests revealed bugs on tst-atomic-long.c on s390x and x86_64 and on tst-atomic.c on ia64 (well, I knew about the ia64 ones and fixed them in the compiler already). The ppc change is needed, since with the intermediate variables in various macros it doesn't match "I" constraint. I tried to use __builtin_constant_p, but it didn't help - asm constraints were being checked too early. 2003-03-26 Jakub Jelinek <jakub at redhat dot com> * csu/tst-atomic.c (do_test): Add some new atomic_compare_and_exchange_val_acq, atomic_add_zero, atomic_compare_and_exchange_bool_acq and atomic_add_negative tests. * include/atomic.h (atomic_add_negative, atomic_add_zero): Prefix local variable so that it doesn't clash with the one in atomic_exchange_and_add. * sysdeps/ia64/bits/atomic.h (atomic_exchange): Fix for long/void * pointers. (atomic_exchange_and_add): Implement using __sync_fetch_and_add_?i. * sysdeps/powerpc/bits/atomic.h (atomic_exchange_and_add): Force value into register. * sysdeps/s390/bits/atomic.h (__arch_compare_and_exchange_val_64_acq): Cast newval to long. * sysdeps/x86_64/bits/atomic.h (__arch_compare_and_exchange_val_64_acq): Cast newval and oldval to long. (atomic_exchange): Cast newvalue to long if sizeof == 8. (atomic_exchange_and_add): Cast value to long if sizeof == 8. (atomic_add, atomic_add_negative, atomic_add_zero): Likewise. (atomic_bit_set): Shift 1L up in all cases to shut up warnings. --- libc/csu/tst-atomic.c.jj 2003-03-25 16:41:47.000000000 -0500 +++ libc/csu/tst-atomic.c 2003-03-25 19:05:36.000000000 -0500 @@ -48,6 +48,22 @@ do_test (void) puts ("atomic_compare_and_exchange_val_acq test 2 failed"); ret = 1; } + + mem = -15; + if (atomic_compare_and_exchange_val_acq (&mem, -56, -15) != -15 + || mem != -56) + { + puts ("atomic_compare_and_exchange_val_acq test 3 failed"); + ret = 1; + } + + mem = -1; + if (atomic_compare_and_exchange_val_acq (&mem, 17, 0) != -1 + || mem != -1) + { + puts ("atomic_compare_and_exchange_val_acq test 4 failed"); + ret = 1; + } #endif mem = 24; @@ -66,6 +82,22 @@ do_test (void) ret = 1; } + mem = -15; + if (atomic_compare_and_exchange_bool_acq (&mem, -56, -15) + || mem != -56) + { + puts ("atomic_compare_and_exchange_bool_acq test 3 failed"); + ret = 1; + } + + mem = -1; + if (! atomic_compare_and_exchange_bool_acq (&mem, 17, 0) + || mem != -1) + { + puts ("atomic_compare_and_exchange_bool_acq test 4 failed"); + ret = 1; + } + mem = 64; if (atomic_exchange (&mem, 31) != 64 || mem != 31) @@ -150,7 +182,7 @@ do_test (void) if (! atomic_decrement_and_test (&mem) || mem != 0) { - puts ("atomic_decrement_and_test test 1 failed"); + puts ("atomic_decrement_and_test test 3 failed"); ret = 1; } @@ -202,6 +234,30 @@ do_test (void) ret = 1; } + mem = -12; + if (atomic_add_negative (&mem, 14) + || mem != 2) + { + puts ("atomic_add_negative test 4 failed"); + ret = 1; + } + + mem = 0; + if (! atomic_add_negative (&mem, -1) + || mem != -1) + { + puts ("atomic_add_negative test 5 failed"); + ret = 1; + } + + mem = -31; + if (atomic_add_negative (&mem, 31) + || mem != 0) + { + puts ("atomic_add_negative test 6 failed"); + ret = 1; + } + mem = -34; if (atomic_add_zero (&mem, 31) || mem != -3) @@ -226,6 +282,30 @@ do_test (void) ret = 1; } + mem = -18; + if (atomic_add_zero (&mem, 20) + || mem != 2) + { + puts ("atomic_add_zero test 4 failed"); + ret = 1; + } + + mem = 10; + if (atomic_add_zero (&mem, -20) + || mem != -10) + { + puts ("atomic_add_zero test 5 failed"); + ret = 1; + } + + mem = 10; + if (! atomic_add_zero (&mem, -10) + || mem != 0) + { + puts ("atomic_add_zero test 6 failed"); + ret = 1; + } + mem = 0; atomic_bit_set (&mem, 1); if (mem != 2) --- libc/include/atomic.h.jj 2003-03-25 16:41:47.000000000 -0500 +++ libc/include/atomic.h 2003-03-25 18:11:09.000000000 -0500 @@ -189,15 +189,15 @@ #ifndef atomic_add_negative # define atomic_add_negative(mem, value) \ - ({ __typeof (value) __value = (value); \ - atomic_exchange_and_add ((mem), __value) < -__value); }) + ({ __typeof (value) __aan_value = (value); \ + atomic_exchange_and_add ((mem), __aan_value) < -__aan_value; }) #endif #ifndef atomic_add_zero # define atomic_add_zero(mem, value) \ - ({ __typeof (value) __value = (value); \ - atomic_exchange_and_add ((mem), __value) == -__value; }) + ({ __typeof (value) __aaz_value = (value); \ + atomic_exchange_and_add ((mem), __aaz_value) == -__aaz_value; }) #endif --- libc/sysdeps/ia64/bits/atomic.h.jj 2003-03-22 18:32:36.000000000 -0500 +++ libc/sysdeps/ia64/bits/atomic.h 2003-03-25 18:38:42.000000000 -0500 @@ -75,23 +75,26 @@ typedef uintmax_t uatomic_max_t; /* Atomically store newval and return the old value. */ #define atomic_exchange(mem, value) \ - __sync_lock_test_and_set_si (mem, value) + ({ __typeof (*mem) __result; \ + if (sizeof (*mem) == 4) \ + __result = __sync_lock_test_and_set_si ((int *) (mem), (int) (value)); \ + else if (sizeof (*mem) == 8) \ + __result = __sync_lock_test_and_set_di ((long *) (mem), \ + (long) (value)); \ + else \ + abort (); \ + __result; }) + #define atomic_exchange_and_add(mem, value) \ - ({ __typeof (*mem) __oldval, __val; \ - __typeof (mem) __memp = (mem); \ - __typeof (*mem) __value = (value); \ - \ - __val = (*__memp); \ - do \ - { \ - __oldval = __val; \ - __val = atomic_compare_and_exchange_val_acq (__memp, \ - __oldval + __value, \ - __oldval); \ - } \ - while (__builtin_expect (__val != __oldval, 0)); \ - __oldval; }) + ({ __typeof (*mem) __result; \ + if (sizeof (*mem) == 4) \ + __result = __sync_fetch_and_add_si ((int *) (mem), (int) (value)); \ + else if (sizeof (*mem) == 8) \ + __result = __sync_fetch_and_add_di ((long *) (mem), (long) (value)); \ + else \ + abort (); \ + __result; }) #define atomic_decrement_if_positive(mem) \ ({ __typeof (*mem) __oldval, __val; \ --- libc/sysdeps/powerpc/bits/atomic.h.jj 2003-03-21 05:17:34.000000000 -0500 +++ libc/sysdeps/powerpc/bits/atomic.h 2003-03-25 18:28:41.000000000 -0500 @@ -127,11 +127,11 @@ typedef uintmax_t uatomic_max_t; abort (); \ int __val, __tmp; \ __asm __volatile ("1: lwarx %0,0,%3\n" \ - " addi %1,%0,%4\n" \ + " add %1,%0,%4\n" \ " stwcx. %1,0,%3\n" \ " bne- 1b" \ : "=&b" (__val), "=&r" (__tmp), "=m" (*mem) \ - : "r" (mem), "I" (value), "2" (*mem) \ + : "r" (mem), "r" (value), "2" (*mem) \ : "cr0"); \ __val; \ }) --- libc/sysdeps/s390/bits/atomic.h.jj 2003-03-22 18:32:37.000000000 -0500 +++ libc/sysdeps/s390/bits/atomic.h 2003-03-25 19:19:38.000000000 -0500 @@ -65,7 +65,7 @@ typedef uintmax_t uatomic_max_t; __typeof (*mem) __archold = (oldval); \ __asm __volatile ("csg %0,%2,%1" \ : "+d" (__archold), "=Q" (*__archmem) \ - : "d" (newval), "m" (*__archmem) : "cc" ); \ + : "d" ((long) (newval)), "m" (*__archmem) : "cc" ); \ __archold; }) #else /* For 31 bit we do not really need 64-bit compare-and-exchange. We can --- libc/sysdeps/x86_64/bits/atomic.h.jj 2003-03-25 16:43:52.000000000 -0500 +++ libc/sysdeps/x86_64/bits/atomic.h 2003-03-25 19:20:53.000000000 -0500 @@ -80,7 +80,8 @@ typedef uintmax_t uatomic_max_t; ({ __typeof (*mem) ret; \ __asm __volatile (LOCK "cmpxchgq %q2, %1" \ : "=a" (ret), "=m" (*mem) \ - : "r" (newval), "m" (*mem), "0" (oldval)); \ + : "r" ((long) (newval)), "m" (*mem), \ + "0" ((long) (oldval))); \ ret; }) @@ -102,7 +103,7 @@ typedef uintmax_t uatomic_max_t; else \ __asm __volatile ("xchgq %q0, %1" \ : "=r" (result), "=m" (*mem) \ - : "0" (newvalue), "m" (*mem)); \ + : "0" ((long) (newvalue)), "m" (*mem)); \ result; }) @@ -123,7 +124,7 @@ typedef uintmax_t uatomic_max_t; else \ __asm __volatile (LOCK "xaddq %q0, %1" \ : "=r" (result), "=m" (*mem) \ - : "0" (value), "m" (*mem)); \ + : "0" ((long) (value)), "m" (*mem)); \ result; }) @@ -147,7 +148,7 @@ typedef uintmax_t uatomic_max_t; else \ __asm __volatile (LOCK "addq %q1, %0" \ : "=m" (*mem) \ - : "ir" (value), "m" (*mem)); \ + : "ir" ((long) (value)), "m" (*mem)); \ }) @@ -168,7 +169,7 @@ typedef uintmax_t uatomic_max_t; else \ __asm __volatile (LOCK "addq %q2, %0; sets %1" \ : "=m" (*mem), "=qm" (__result) \ - : "ir" (value), "m" (*mem)); \ + : "ir" ((long) (value)), "m" (*mem)); \ __result; }) @@ -189,7 +190,7 @@ typedef uintmax_t uatomic_max_t; else \ __asm __volatile (LOCK "addq %q2, %0; setz %1" \ : "=m" (*mem), "=qm" (__result) \ - : "ir" (value), "m" (*mem)); \ + : "ir" ((long) (value)), "m" (*mem)); \ __result; }) @@ -279,19 +280,19 @@ typedef uintmax_t uatomic_max_t; (void) ({ if (sizeof (*mem) == 1) \ __asm __volatile (LOCK "orb %b2, %0" \ : "=m" (*mem) \ - : "m" (*mem), "ir" (1 << (bit))); \ + : "m" (*mem), "ir" (1L << (bit))); \ else if (sizeof (*mem) == 2) \ __asm __volatile (LOCK "orw %w2, %0" \ : "=m" (*mem) \ - : "m" (*mem), "ir" (1 << (bit))); \ + : "m" (*mem), "ir" (1L << (bit))); \ else if (sizeof (*mem) == 4) \ __asm __volatile (LOCK "orl %2, %0" \ : "=m" (*mem) \ - : "m" (*mem), "ir" (1 << (bit))); \ + : "m" (*mem), "ir" (1L << (bit))); \ else if (__builtin_constant_p (bit) && (bit) < 32) \ __asm __volatile (LOCK "orq %2, %0" \ : "=m" (*mem) \ - : "m" (*mem), "i" (1 << (bit))); \ + : "m" (*mem), "i" (1L << (bit))); \ else \ __asm __volatile (LOCK "orq %q2, %0" \ : "=m" (*mem) \ Jakub
Index Nav: | [Date Index] [Subject Index] [Author Index] [Thread Index] | |
---|---|---|
Message Nav: | [Date Prev] [Date Next] | [Thread Prev] [Thread Next] |