diff options
| -rw-r--r-- | sys/amd64/include/atomic.h | 24 | ||||
| -rw-r--r-- | sys/i386/include/atomic.h | 20 |
2 files changed, 22 insertions, 22 deletions
diff --git a/sys/amd64/include/atomic.h b/sys/amd64/include/atomic.h index 91c33e6..d0d8ecb 100644 --- a/sys/amd64/include/atomic.h +++ b/sys/amd64/include/atomic.h @@ -183,9 +183,9 @@ atomic_fetchadd_int(volatile u_int *p, u_int v) __asm __volatile( " " MPLOCKED " " - " xaddl %0, %1 ; " + " xaddl %0,%1 ; " "# atomic_fetchadd_int" - : "+r" (v), /* 0 (result) */ + : "+r" (v), /* 0 */ "=m" (*p) /* 1 */ : "m" (*p) /* 2 */ : "cc"); @@ -202,9 +202,9 @@ atomic_fetchadd_long(volatile u_long *p, u_long v) __asm __volatile( " " MPLOCKED " " - " xaddq %0, %1 ; " + " xaddq %0,%1 ; " "# atomic_fetchadd_long" - : "+r" (v), /* 0 (result) */ + : "+r" (v), /* 0 */ "=m" (*p) /* 1 */ : "m" (*p) /* 2 */ : "cc"); @@ -307,7 +307,7 @@ ATOMIC_STORE(long); #ifdef __GNUCLIKE_ASM static __inline u_int -atomic_readandclear_int(volatile u_int *addr) +atomic_readandclear_int(volatile u_int *p) { u_int res; @@ -316,14 +316,14 @@ atomic_readandclear_int(volatile u_int *addr) " xchgl %1,%0 ; " "# atomic_readandclear_int" : "+r" (res), /* 0 */ - "=m" (*addr) /* 1 */ - : "m" (*addr)); + "=m" (*p) /* 1 */ + : "m" (*p)); return (res); } static __inline u_long -atomic_readandclear_long(volatile u_long *addr) +atomic_readandclear_long(volatile u_long *p) { u_long res; @@ -332,16 +332,16 @@ atomic_readandclear_long(volatile u_long *addr) " xchgq %1,%0 ; " "# atomic_readandclear_long" : "+r" (res), /* 0 */ - "=m" (*addr) /* 1 */ - : "m" (*addr)); + "=m" (*p) /* 1 */ + : "m" (*p)); return (res); } #else /* !__GNUCLIKE_ASM */ -u_int atomic_readandclear_int(volatile u_int *addr); -u_long atomic_readandclear_long(volatile u_long *addr); +u_int atomic_readandclear_int(volatile u_int *p); +u_long atomic_readandclear_long(volatile u_long *p); #endif /* __GNUCLIKE_ASM */ diff --git a/sys/i386/include/atomic.h b/sys/i386/include/atomic.h index 3b9d001..8a1ae2b 100644 --- a/sys/i386/include/atomic.h +++ b/sys/i386/include/atomic.h @@ -272,9 +272,9 @@ atomic_fetchadd_int(volatile u_int *p, u_int v) __asm __volatile( " " MPLOCKED " " - " xaddl %0, %1 ; " + " xaddl %0,%1 ; " "# atomic_fetchadd_int" - : "+r" (v), /* 0 (result) */ + : "+r" (v), /* 0 */ "=m" (*p) /* 1 */ : "m" (*p) /* 2 */ : "cc"); @@ -397,7 +397,7 @@ atomic_fetchadd_long(volatile u_long *p, u_long v) #ifdef __GNUCLIKE_ASM static __inline u_int -atomic_readandclear_int(volatile u_int *addr) +atomic_readandclear_int(volatile u_int *p) { u_int res; @@ -406,14 +406,14 @@ atomic_readandclear_int(volatile u_int *addr) " xchgl %1,%0 ; " "# atomic_readandclear_int" : "+r" (res), /* 0 */ - "=m" (*addr) /* 1 */ - : "m" (*addr)); + "=m" (*p) /* 1 */ + : "m" (*p)); return (res); } static __inline u_long -atomic_readandclear_long(volatile u_long *addr) +atomic_readandclear_long(volatile u_long *p) { u_long res; @@ -422,16 +422,16 @@ atomic_readandclear_long(volatile u_long *addr) " xchgl %1,%0 ; " "# atomic_readandclear_long" : "+r" (res), /* 0 */ - "=m" (*addr) /* 1 */ - : "m" (*addr)); + "=m" (*p) /* 1 */ + : "m" (*p)); return (res); } #else /* !__GNUCLIKE_ASM */ -u_int atomic_readandclear_int(volatile u_int *addr); -u_long atomic_readandclear_long(volatile u_long *addr); +u_int atomic_readandclear_int(volatile u_int *p); +u_long atomic_readandclear_long(volatile u_long *p); #endif /* __GNUCLIKE_ASM */ |
