X-Git-Url: https://git.lttng.org/?p=urcu.git;a=blobdiff_plain;f=urcu%2Fuatomic_generic.h;h=cef58f382180ba1061b1bb2e37c7cc87c0b7f354;hp=556846ff7260dc34c0753c1b3c310f8362f9bb1f;hb=bf33aaea06cbf8257cc49c38abca6d26c0c31c78;hpb=985b35b18796edab591775098fef83a50a1e55ce

diff --git a/urcu/uatomic_generic.h b/urcu/uatomic_generic.h
index 556846f..cef58f3 100644
--- a/urcu/uatomic_generic.h
+++ b/urcu/uatomic_generic.h
@@ -87,6 +87,39 @@ unsigned long _uatomic_cmpxchg(void *addr, unsigned long old,
 						sizeof(*(addr))))
 
 
+/* uatomic_and */
+
+#ifndef uatomic_and
+static inline __attribute__((always_inline))
+void _uatomic_and(void *addr, unsigned long val,
+		  int len)
+{
+	switch (len) {
+#ifdef UATOMIC_HAS_ATOMIC_BYTE
+	case 1:
+		__sync_and_and_fetch_1(addr, val);
+#endif
+#ifdef UATOMIC_HAS_ATOMIC_SHORT
+	case 2:
+		__sync_and_and_fetch_2(addr, val);
+#endif
+	case 4:
+		__sync_and_and_fetch_4(addr, val);
+#if (CAA_BITS_PER_LONG == 64)
+	case 8:
+		__sync_and_and_fetch_8(addr, val);
+#endif
+	}
+	_uatomic_link_error();
+	return 0;
+}
+
+#define uatomic_and(addr, v)			\
+	(_uatomic_and((addr),			\
+		      (unsigned long)(v),	\
+		      sizeof(*(addr))))
+#endif
+
 /* uatomic_or */
 
 #ifndef uatomic_or
@@ -219,6 +252,70 @@ unsigned long _uatomic_exchange(void *addr, unsigned long val, int len)
 
 #else /* #ifndef uatomic_cmpxchg */
 
+#ifndef uatomic_and
+/* uatomic_and */
+
+static inline __attribute__((always_inline))
+void _uatomic_and(void *addr, unsigned long val, int len)
+{
+	switch (len) {
+#ifdef UATOMIC_HAS_ATOMIC_BYTE
+	case 1:
+	{
+		unsigned char old, oldt;
+
+		oldt = uatomic_read((unsigned char *)addr);
+		do {
+			old = oldt;
+			oldt = _uatomic_cmpxchg(addr, old, old & val, 1);
+		} while (oldt != old);
+	}
+#endif
+#ifdef UATOMIC_HAS_ATOMIC_SHORT
+	case 2:
+	{
+		unsigned short old, oldt;
+
+		oldt = uatomic_read((unsigned short *)addr);
+		do {
+			old = oldt;
+			oldt = _uatomic_cmpxchg(addr, old, old & val, 2);
+		} while (oldt != old);
+	}
+#endif
+	case 4:
+	{
+		unsigned int old, oldt;
+
+		oldt = uatomic_read((unsigned int *)addr);
+		do {
+			old = oldt;
+			oldt = _uatomic_cmpxchg(addr, old, old & val, 4);
+		} while (oldt != old);
+	}
+#if (CAA_BITS_PER_LONG == 64)
+	case 8:
+	{
+		unsigned long old, oldt;
+
+		oldt = uatomic_read((unsigned long *)addr);
+		do {
+			old = oldt;
+			oldt = _uatomic_cmpxchg(addr, old, old & val, 8);
+		} while (oldt != old);
+	}
+#endif
+	}
+	_uatomic_link_error();
+	return 0;
+}
+
+#define uatomic_and(addr, v)		\
+	(uatomic_and((addr),		\
+		    (unsigned long)(v),	\
+		    sizeof(*(addr))))
+#endif /* #ifndef uatomic_and */
+
 #ifndef uatomic_or
 /* uatomic_or */