Some cleanups and tweaks to some of the atomic.h files in preparation for

further changes and fixes in the future:
- Use aliases via macros rather than duplicated inlines wherever possible.
- Move all the aliases to the bottom of these files and the inline
  functions to the top.
- Add various comments.
- On alpha, drop atomic_{load_acq,store_rel}_{8,char,16,short}().
- On i386 and amd64, don't duplicate the extern declarations for functions
  in the two non-inline cases (KLD_MODULE and compiler doesn't do inlines),
  instead, consolidate those two cases.
- Some whitespace fixes.

Approved by:	re (scottl)

1 files changed, 99 insertions, 91 deletions

diff --git a/sys/alpha/include/atomic.h b/sys/alpha/include/atomic.h
index cc2dbb4..ba384be 100644
--- a/sys/alpha/include/atomic.h
+++ b/sys/alpha/include/atomic.h
@@ -27,7 +27,7 @@
  */
 
 #ifndef _MACHINE_ATOMIC_H_
-#define _MACHINE_ATOMIC_H_
+#define	_MACHINE_ATOMIC_H_
 
 #ifndef _SYS_CDEFS_H_
 #error this file needs sys/cdefs.h as a prerequisite
@@ -216,29 +216,7 @@ static __inline u_int64_t atomic_readandclear_64(volatile u_int64_t *addr)
 	return result;
 }
 
-#define atomic_set_char		atomic_set_8
-#define atomic_clear_char	atomic_clear_8
-#define atomic_add_char		atomic_add_8
-#define atomic_subtract_char	atomic_subtract_8
-
-#define atomic_set_short	atomic_set_16
-#define atomic_clear_short	atomic_clear_16
-#define atomic_add_short	atomic_add_16
-#define atomic_subtract_short	atomic_subtract_16
-
-#define atomic_set_int		atomic_set_32
-#define atomic_clear_int	atomic_clear_32
-#define atomic_add_int		atomic_add_32
-#define atomic_subtract_int	atomic_subtract_32
-#define atomic_readandclear_int	atomic_readandclear_32
-
-#define atomic_set_long		atomic_set_64
-#define atomic_clear_long	atomic_clear_64
-#define atomic_add_long		atomic_add_64
-#define atomic_subtract_long	atomic_subtract_64
-#define atomic_readandclear_long	atomic_readandclear_64
-
-#define ATOMIC_ACQ_REL(NAME, WIDTH, TYPE)				\
+#define	ATOMIC_ACQ_REL(NAME, WIDTH)					\
 static __inline void							\
 atomic_##NAME##_acq_##WIDTH(volatile u_int##WIDTH##_t *p, u_int##WIDTH##_t v)\
 {									\
@@ -251,49 +229,36 @@ atomic_##NAME##_rel_##WIDTH(volatile u_int##WIDTH##_t *p, u_int##WIDTH##_t v)\
 {									\
 	alpha_mb();							\
 	atomic_##NAME##_##WIDTH(p, v);					\
-}									\
-									\
-static __inline void							\
-atomic_##NAME##_acq_##TYPE(volatile u_int##WIDTH##_t *p, u_int##WIDTH##_t v)\
-{									\
-	atomic_##NAME##_##WIDTH(p, v);					\
-	alpha_mb();							\
-}									\
-									\
-static __inline void							\
-atomic_##NAME##_rel_##TYPE(volatile u_int##WIDTH##_t *p, u_int##WIDTH##_t v)\
-{									\
-	alpha_mb();							\
-	atomic_##NAME##_##WIDTH(p, v);					\
 }
 
-ATOMIC_ACQ_REL(set, 8, char)
-ATOMIC_ACQ_REL(clear, 8, char)
-ATOMIC_ACQ_REL(add, 8, char)
-ATOMIC_ACQ_REL(subtract, 8, char)
-ATOMIC_ACQ_REL(set, 16, short)
-ATOMIC_ACQ_REL(clear, 16, short)
-ATOMIC_ACQ_REL(add, 16, short)
-ATOMIC_ACQ_REL(subtract, 16, short)
-ATOMIC_ACQ_REL(set, 32, int)
-ATOMIC_ACQ_REL(clear, 32, int)
-ATOMIC_ACQ_REL(add, 32, int)
-ATOMIC_ACQ_REL(subtract, 32, int)
-ATOMIC_ACQ_REL(set, 64, long)
-ATOMIC_ACQ_REL(clear, 64, long)
-ATOMIC_ACQ_REL(add, 64, long)
-ATOMIC_ACQ_REL(subtract, 64, long)
+/* Variants of simple arithmetic with memory barriers. */
+ATOMIC_ACQ_REL(set, 8)
+ATOMIC_ACQ_REL(clear, 8)
+ATOMIC_ACQ_REL(add, 8)
+ATOMIC_ACQ_REL(subtract, 8)
+ATOMIC_ACQ_REL(set, 16)
+ATOMIC_ACQ_REL(clear, 16)
+ATOMIC_ACQ_REL(add, 16)
+ATOMIC_ACQ_REL(subtract, 16)
+ATOMIC_ACQ_REL(set, 32)
+ATOMIC_ACQ_REL(clear, 32)
+ATOMIC_ACQ_REL(add, 32)
+ATOMIC_ACQ_REL(subtract, 32)
+ATOMIC_ACQ_REL(set, 64)
+ATOMIC_ACQ_REL(clear, 64)
+ATOMIC_ACQ_REL(add, 64)
+ATOMIC_ACQ_REL(subtract, 64)
 
 #undef ATOMIC_ACQ_REL
 
 /*
  * We assume that a = b will do atomic loads and stores.
  */
-#define ATOMIC_STORE_LOAD(TYPE, WIDTH)			\
-static __inline u_##TYPE				\
-atomic_load_acq_##WIDTH(volatile u_##TYPE *p)		\
+#define	ATOMIC_STORE_LOAD(WIDTH)			\
+static __inline u_int##WIDTH##_t			\
+atomic_load_acq_##WIDTH(volatile u_int##WIDTH##_t *p)	\
 {							\
-	u_##TYPE v;					\
+	u_int##WIDTH##_t v;				\
 							\
 	v = *p;						\
 	alpha_mb();					\
@@ -301,32 +266,14 @@ atomic_load_acq_##WIDTH(volatile u_##TYPE *p)		\
 }							\
 							\
 static __inline void					\
-atomic_store_rel_##WIDTH(volatile u_##TYPE *p, u_##TYPE v)\
-{							\
-	alpha_mb();					\
-	*p = v;						\
-}							\
-static __inline u_##TYPE				\
-atomic_load_acq_##TYPE(volatile u_##TYPE *p)		\
-{							\
-	u_##TYPE v;					\
-							\
-	v = *p;						\
-	alpha_mb();					\
-	return (v);					\
-}							\
-							\
-static __inline void					\
-atomic_store_rel_##TYPE(volatile u_##TYPE *p, u_##TYPE v)\
+atomic_store_rel_##WIDTH(volatile u_int##WIDTH##_t *p, u_int##WIDTH##_t v)\
 {							\
 	alpha_mb();					\
 	*p = v;						\
 }
 
-ATOMIC_STORE_LOAD(char,		8)
-ATOMIC_STORE_LOAD(short,	16)
-ATOMIC_STORE_LOAD(int,		32)
-ATOMIC_STORE_LOAD(long,		64)
+ATOMIC_STORE_LOAD(32)
+ATOMIC_STORE_LOAD(64)
 
 #undef ATOMIC_STORE_LOAD
 
@@ -384,17 +331,6 @@ atomic_cmpset_64(volatile u_int64_t* p, u_int64_t cmpval, u_int64_t newval)
 	return ret;
 }
 
-#define	atomic_cmpset_int	atomic_cmpset_32
-#define	atomic_cmpset_long	atomic_cmpset_64
-
-static __inline int
-atomic_cmpset_ptr(volatile void *dst, void *exp, void *src)
-{
-
-        return (atomic_cmpset_long((volatile u_long *)dst, (u_long)exp,
-            (u_long)src));
-}
-
 static __inline u_int32_t
 atomic_cmpset_acq_32(volatile u_int32_t *p, u_int32_t cmpval, u_int32_t newval)
 {
@@ -429,10 +365,82 @@ atomic_cmpset_rel_64(volatile u_int64_t *p, u_int64_t cmpval, u_int64_t newval)
 	return (atomic_cmpset_64(p, cmpval, newval));
 }
 
+/* Operations on chars. */
+#define	atomic_set_char		atomic_set_8
+#define	atomic_set_acq_char	atomic_set_acq_8
+#define	atomic_set_rel_char	atomic_set_rel_8
+#define	atomic_clear_char	atomic_clear_8
+#define	atomic_clear_acq_char	atomic_clear_acq_8
+#define	atomic_clear_rel_char	atomic_clear_rel_8
+#define	atomic_add_char		atomic_add_8
+#define	atomic_add_acq_char	atomic_add_acq_8
+#define	atomic_add_rel_char	atomic_add_rel_8
+#define	atomic_subtract_char	atomic_subtract_8
+#define	atomic_subtract_acq_char	atomic_subtract_acq_8
+#define	atomic_subtract_rel_char	atomic_subtract_rel_8
+
+/* Operations on shorts. */
+#define	atomic_set_short	atomic_set_16
+#define	atomic_set_acq_short	atomic_set_acq_16
+#define	atomic_set_rel_short	atomic_set_rel_16
+#define	atomic_clear_short	atomic_clear_16
+#define	atomic_clear_acq_short	atomic_clear_acq_16
+#define	atomic_clear_rel_short	atomic_clear_rel_16
+#define	atomic_add_short	atomic_add_16
+#define	atomic_add_acq_short	atomic_add_acq_16
+#define	atomic_add_rel_short	atomic_add_rel_16
+#define	atomic_subtract_short	atomic_subtract_16
+#define	atomic_subtract_acq_short	atomic_subtract_acq_16
+#define	atomic_subtract_rel_short	atomic_subtract_rel_16
+
+/* Operations on ints. */
+#define	atomic_set_int		atomic_set_32
+#define	atomic_set_acq_int	atomic_set_acq_32
+#define	atomic_set_rel_int	atomic_set_rel_32
+#define	atomic_clear_int	atomic_clear_32
+#define	atomic_clear_acq_int	atomic_clear_acq_32
+#define	atomic_clear_rel_int	atomic_clear_rel_32
+#define	atomic_add_int		atomic_add_32
+#define	atomic_add_acq_int	atomic_add_acq_32
+#define	atomic_add_rel_int	atomic_add_rel_32
+#define	atomic_subtract_int	atomic_subtract_32
+#define	atomic_subtract_acq_int	atomic_subtract_acq_32
+#define	atomic_subtract_rel_int	atomic_subtract_rel_32
+#define	atomic_cmpset_int	atomic_cmpset_32
 #define	atomic_cmpset_acq_int	atomic_cmpset_acq_32
 #define	atomic_cmpset_rel_int	atomic_cmpset_rel_32
+#define	atomic_load_acq_int	atomic_load_acq_32
+#define	atomic_store_rel_int	atomic_store_rel_32
+#define	atomic_readandclear_int	atomic_readandclear_32
+
+/* Operations on longs. */
+#define	atomic_set_long		atomic_set_64
+#define	atomic_set_acq_long	atomic_set_acq_64
+#define	atomic_set_rel_long	atomic_set_rel_64
+#define	atomic_clear_long	atomic_clear_64
+#define	atomic_clear_acq_long	atomic_clear_acq_64
+#define	atomic_clear_rel_long	atomic_clear_rel_64
+#define	atomic_add_long		atomic_add_64
+#define	atomic_add_acq_long	atomic_add_acq_64
+#define	atomic_add_rel_long	atomic_add_rel_64
+#define	atomic_subtract_long	atomic_subtract_64
+#define	atomic_subtract_acq_long	atomic_subtract_acq_64
+#define	atomic_subtract_rel_long	atomic_subtract_rel_64
+#define	atomic_cmpset_long	atomic_cmpset_64
 #define	atomic_cmpset_acq_long	atomic_cmpset_acq_64
 #define	atomic_cmpset_rel_long	atomic_cmpset_rel_64
+#define	atomic_load_acq_long	atomic_load_acq_64
+#define	atomic_store_rel_long	atomic_store_rel_64
+#define	atomic_readandclear_long	atomic_readandclear_64
+
+/* Operations on pointers. */
+static __inline int
+atomic_cmpset_ptr(volatile void *dst, void *exp, void *src)
+{
+
+        return (atomic_cmpset_long((volatile u_long *)dst, (u_long)exp,
+            (u_long)src));
+}
 
 static __inline int
 atomic_cmpset_acq_ptr(volatile void *dst, void *exp, void *src)
@@ -462,7 +470,7 @@ atomic_store_rel_ptr(volatile void *p, void *v)
 	atomic_store_rel_long((volatile u_long *)p, (u_long)v);
 }
 
-#define ATOMIC_PTR(NAME)				\
+#define	ATOMIC_PTR(NAME)				\
 static __inline void					\
 atomic_##NAME##_ptr(volatile void *p, uintptr_t v)	\
 {							\