X-Git-Url: https://git.saurik.com/apple/libc.git/blobdiff_plain/34e8f8296870d0e8695f90e1a54240a589d41312..065eae9f38780a3602538caa52399f41f061a88e:/arm/sys/gcc_atomic.c?ds=sidebyside diff --git a/arm/sys/gcc_atomic.c b/arm/sys/gcc_atomic.c index fd8c8c1..c96820a 100644 --- a/arm/sys/gcc_atomic.c +++ b/arm/sys/gcc_atomic.c @@ -20,6 +20,9 @@ * * @APPLE_LICENSE_HEADER_END@ */ + +#ifndef __clang__ + #include #include #include @@ -30,80 +33,88 @@ * since the ARM GCC target does not currently support them */ -int32_t __sync_fetch_and_add_4 (int32_t *ptr, int32_t value) +int32_t __sync_fetch_and_add_4 (int32_t *ptr, int32_t value, ...) { - return OSAtomicAdd32(value, ptr) - value; + return OSAtomicAdd32Barrier(value, ptr) - value; } -int32_t __sync_fetch_and_sub_4 (int32_t *ptr, int32_t value) +int32_t __sync_fetch_and_sub_4 (int32_t *ptr, int32_t value, ...) { - return OSAtomicAdd32(-value, ptr) + value; + return OSAtomicAdd32Barrier(-value, ptr) + value; } -uint32_t __sync_fetch_and_or_4(uint32_t *ptr, uint32_t value) +uint32_t __sync_fetch_and_or_4(uint32_t *ptr, uint32_t value, ...) { - return OSAtomicOr32Orig(value, ptr); + return OSAtomicOr32OrigBarrier(value, ptr); } -uint32_t __sync_fetch_and_and_4(uint32_t *ptr, uint32_t value) +uint32_t __sync_fetch_and_and_4(uint32_t *ptr, uint32_t value, ...) { - return OSAtomicAnd32Orig(value, ptr); + return OSAtomicAnd32OrigBarrier(value, ptr); } -uint32_t __sync_fetch_and_xor_4(uint32_t *ptr, uint32_t value) +uint32_t __sync_fetch_and_xor_4(uint32_t *ptr, uint32_t value, ...) { - OSAtomicXor32Orig(value, ptr); + return OSAtomicXor32OrigBarrier(value, ptr); } -int32_t __sync_add_and_fetch_4 (int32_t *ptr, int32_t value) +int32_t __sync_add_and_fetch_4 (int32_t *ptr, int32_t value, ...) { - return OSAtomicAdd32(value, ptr); + return OSAtomicAdd32Barrier(value, ptr); } -int32_t __sync_sub_and_fetch_4 (int32_t *ptr, int32_t value) +int32_t __sync_sub_and_fetch_4 (int32_t *ptr, int32_t value, ...) { - return OSAtomicAdd32(-value, ptr); + return OSAtomicAdd32Barrier(-value, ptr); } -uint32_t __sync_or_and_fetch_4 (uint32_t *ptr, int32_t value) +uint32_t __sync_or_and_fetch_4 (uint32_t *ptr, int32_t value, ...) { - return OSAtomicOr32(value, ptr); + return OSAtomicOr32Barrier(value, ptr); } -uint32_t __sync_and_and_fetch_4 (uint32_t *ptr, int32_t value) +uint32_t __sync_and_and_fetch_4 (uint32_t *ptr, int32_t value, ...) { - return OSAtomicAnd32(value, ptr); + return OSAtomicAnd32Barrier(value, ptr); } -uint32_t __sync_xor_and_fetch_4 (uint32_t *ptr, int32_t value) +uint32_t __sync_xor_and_fetch_4 (uint32_t *ptr, int32_t value, ...) { - return OSAtomicXor32(value, ptr); + return OSAtomicXor32Barrier(value, ptr); } -bool __sync_bool_compare_and_swap_4(int32_t *ptr, int32_t oldval, int32_t newval) +bool __sync_bool_compare_and_swap_4(int32_t *ptr, int32_t oldval, int32_t newval, ...) { - return OSAtomicCompareAndSwap32(oldval, newval, ptr); + return OSAtomicCompareAndSwap32Barrier(oldval, newval, ptr); } -int32_t __sync_val_compare_and_swap_4(int32_t *ptr, int32_t oldval, int32_t newval) +int32_t __sync_val_compare_and_swap_4(int32_t *ptr, int32_t oldval, int32_t newval, ...) { int32_t old = *ptr; - OSAtomicCompareAndSwap32(oldval, newval, ptr); + OSAtomicCompareAndSwap32Barrier(oldval, newval, ptr); return old; } -int32_t __sync_lock_test_and_set_4(int32_t *ptr, int32_t value) +int32_t __sync_lock_test_and_set_4(int32_t *ptr, int32_t value, ...) { int32_t old; do { old = *ptr; - } while (!OSAtomicCompareAndSwap32(old, value, ptr)); + } while (!OSAtomicCompareAndSwap32Barrier(old, value, ptr)); return old; } -void __sync_lock_release_4(int32_t *ptr) +void __sync_lock_release_4(int32_t *ptr, ...) { *ptr = 0; } + +__private_extern__ +void __sync_synchronize(void) +{ + OSMemoryBarrier(); +} + +#endif