Fix generalize-small template adding missed CAS-based fetch_and_add

* src/atomic_ops/generalize-small.template (AO_XSIZE_fetch_and_add):
Add missed definition based on CAS.
* src/atomic_ops/generalize-small.h: Regenerate.

diff --git a/src/atomic_ops/generalize-small.h b/src/atomic_ops/generalize-small.h
index 3b23fa0ba5df69841ca36f2f1c28318f2a8554c3..de94843b3dcc68a8fad5f32a19b52ba4ae35c847 100644 (file)
--- a/src/atomic_ops/generalize-small.h
+++ b/src/atomic_ops/generalize-small.h
@@ -206,6 +206,23 @@
 # define AO_HAVE_char_fetch_and_add_release
 #endif
 
+#if defined(AO_HAVE_char_compare_and_swap) \
+    && !defined(AO_HAVE_char_fetch_and_add)
+  AO_INLINE unsigned char
+  AO_char_fetch_and_add(volatile unsigned char *addr, unsigned char incr)
+  {
+    unsigned char old;
+    do
+      {
+        old = *addr;
+      }
+    while (AO_EXPECT_FALSE(!AO_char_compare_and_swap(addr, old,
+                                                      old + incr)));
+    return old;
+  }
+# define AO_HAVE_char_fetch_and_add
+#endif
+
 #if defined(AO_HAVE_char_fetch_and_add_full)
 # if !defined(AO_HAVE_char_fetch_and_add_release)
 #   define AO_char_fetch_and_add_release(addr, val) \
@@ -789,6 +806,23 @@
 # define AO_HAVE_short_fetch_and_add_release
 #endif
 
+#if defined(AO_HAVE_short_compare_and_swap) \
+    && !defined(AO_HAVE_short_fetch_and_add)
+  AO_INLINE unsigned short
+  AO_short_fetch_and_add(volatile unsigned short *addr, unsigned short incr)
+  {
+    unsigned short old;
+    do
+      {
+        old = *addr;
+      }
+    while (AO_EXPECT_FALSE(!AO_short_compare_and_swap(addr, old,
+                                                      old + incr)));
+    return old;
+  }
+# define AO_HAVE_short_fetch_and_add
+#endif
+
 #if defined(AO_HAVE_short_fetch_and_add_full)
 # if !defined(AO_HAVE_short_fetch_and_add_release)
 #   define AO_short_fetch_and_add_release(addr, val) \
@@ -1372,6 +1406,23 @@
 # define AO_HAVE_int_fetch_and_add_release
 #endif
 
+#if defined(AO_HAVE_int_compare_and_swap) \
+    && !defined(AO_HAVE_int_fetch_and_add)
+  AO_INLINE unsigned int
+  AO_int_fetch_and_add(volatile unsigned int *addr, unsigned int incr)
+  {
+    unsigned int old;
+    do
+      {
+        old = *addr;
+      }
+    while (AO_EXPECT_FALSE(!AO_int_compare_and_swap(addr, old,
+                                                      old + incr)));
+    return old;
+  }
+# define AO_HAVE_int_fetch_and_add
+#endif
+
 #if defined(AO_HAVE_int_fetch_and_add_full)
 # if !defined(AO_HAVE_int_fetch_and_add_release)
 #   define AO_int_fetch_and_add_release(addr, val) \

diff --git a/src/atomic_ops/generalize-small.template b/src/atomic_ops/generalize-small.template
index 0e504fa6bbf0f03c25da69049ddc04f24279cce7..b9c05db0a7d4078ace4b419c7ce1450f99146a1c 100644 (file)
--- a/src/atomic_ops/generalize-small.template
+++ b/src/atomic_ops/generalize-small.template
@@ -206,6 +206,23 @@
 # define AO_HAVE_XSIZE_fetch_and_add_release
 #endif
 
+#if defined(AO_HAVE_XSIZE_compare_and_swap) \
+    && !defined(AO_HAVE_XSIZE_fetch_and_add)
+  AO_INLINE unsigned XCTYPE
+  AO_XSIZE_fetch_and_add(volatile unsigned XCTYPE *addr, unsigned XCTYPE incr)
+  {
+    unsigned XCTYPE old;
+    do
+      {
+        old = *addr;
+      }
+    while (AO_EXPECT_FALSE(!AO_XSIZE_compare_and_swap(addr, old,
+                                                      old + incr)));
+    return old;
+  }
+# define AO_HAVE_XSIZE_fetch_and_add
+#endif
+
 #if defined(AO_HAVE_XSIZE_fetch_and_add_full)
 # if !defined(AO_HAVE_XSIZE_fetch_and_add_release)
 #   define AO_XSIZE_fetch_and_add_release(addr, val) \