diff options
author | cognet <cognet@FreeBSD.org> | 2009-03-31 23:47:18 +0000 |
---|---|---|
committer | cognet <cognet@FreeBSD.org> | 2009-03-31 23:47:18 +0000 |
commit | 4fa02c7d5786d5b8e6aa50aa7350d04d9ff3daa5 (patch) | |
tree | 217a1a03fe30baad82ab3fc05bffbe66d65d7a37 /sys/arm/include | |
parent | a51108502aed4b85359bc7085bb2d4755bc15dab (diff) | |
download | FreeBSD-src-4fa02c7d5786d5b8e6aa50aa7350d04d9ff3daa5.zip FreeBSD-src-4fa02c7d5786d5b8e6aa50aa7350d04d9ff3daa5.tar.gz |
Fix the userland, RAS, version of atomic_fetchadd_32 :
return the correct value, and do not store the wrong one in the supplied
pointer.
Submitted by: Mark Tinguely <tinguely casselton net>
Diffstat (limited to 'sys/arm/include')
-rw-r--r-- | sys/arm/include/atomic.h | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/sys/arm/include/atomic.h b/sys/arm/include/atomic.h index 71e31c3..9f16220 100644 --- a/sys/arm/include/atomic.h +++ b/sys/arm/include/atomic.h @@ -264,22 +264,23 @@ atomic_clear_32(volatile uint32_t *address, uint32_t clearmask) static __inline uint32_t atomic_fetchadd_32(volatile uint32_t *p, uint32_t v) { - uint32_t start, ras_start = ARM_RAS_START; + uint32_t start, tmp, ras_start = ARM_RAS_START; __asm __volatile("1:\n" "adr %1, 1b\n" "str %1, [%0]\n" "adr %1, 2f\n" "str %1, [%0, #4]\n" - "ldr %1, [%2]\n" - "add %1, %1, %3\n" - "str %0, [%2]\n" + "ldr %1, [%3]\n" + "mov %2, %1\n" + "add %2, %2, %4\n" + "str %2, [%3]\n" "2:\n" - "mov %3, #0\n" - "str %3, [%0]\n" - "mov %3, #0xffffffff\n" - "str %3, [%0, #4]\n" - : "+r" (ras_start), "=r" (start), "+r" (p), "+r" (v) + "mov %2, #0\n" + "str %2, [%0]\n" + "mov %2, #0xffffffff\n" + "str %2, [%0, #4]\n" + : "+r" (ras_start), "=r" (start), "=r" (tmp), "+r" (p), "+r" (v) : : "memory"); return (start); } |