Page MenuHomeFreeBSD

D23019.id66291.diff
No OneTemporary

D23019.id66291.diff

Index: sys/arm64/include/atomic.h
===================================================================
--- sys/arm64/include/atomic.h
+++ sys/arm64/include/atomic.h
@@ -548,6 +548,86 @@
: "memory");
}
+static __inline int
+atomic_testandclear_32(volatile uint32_t *p, u_int val)
+{
+ uint32_t mask, old, tmp;
+ int res;
+
+ mask = 1u << (val & 0x1f);
+ __asm __volatile(
+ "1: ldxr %w2, [%3] \n"
+ " bic %w0, %w2, %w4 \n"
+ " stxr %w1, %w0, [%3] \n"
+ " cbnz %w1, 1b \n"
+ : "=&r"(tmp), "=&r"(res), "=&r"(old)
+ : "r" (p), "r" (mask)
+ : "memory"
+ );
+
+ return ((old & mask) != 0);
+}
+
+static __inline int
+atomic_testandclear_64(volatile uint64_t *p, u_int val)
+{
+ uint64_t mask, old, tmp;
+ int res;
+
+ mask = 1ul << (val & 0x1f);
+ __asm __volatile(
+ "1: ldxr %2, [%3] \n"
+ " bic %0, %2, %4 \n"
+ " stxr %w1, %0, [%3] \n"
+ " cbnz %w1, 1b \n"
+ : "=&r"(tmp), "=&r"(res), "=&r"(old)
+ : "r" (p), "r" (mask)
+ : "memory"
+ );
+
+ return ((old & mask) != 0);
+}
+
+static __inline int
+atomic_testandset_32(volatile uint32_t *p, u_int val)
+{
+ uint32_t mask, old, tmp;
+ int res;
+
+ mask = 1u << (val & 0x1f);
+ __asm __volatile(
+ "1: ldxr %w2, [%3] \n"
+ " orr %w0, %w2, %w4 \n"
+ " stxr %w1, %w0, [%3] \n"
+ " cbnz %w1, 1b \n"
+ : "=&r"(tmp), "=&r"(res), "=&r"(old)
+ : "r" (p), "r" (mask)
+ : "memory"
+ );
+
+ return ((old & mask) != 0);
+}
+
+static __inline int
+atomic_testandset_64(volatile uint64_t *p, u_int val)
+{
+ uint64_t mask, old, tmp;
+ int res;
+
+ mask = 1ul << (val & 0x1f);
+ __asm __volatile(
+ "1: ldxr %2, [%3] \n"
+ " orr %0, %2, %4 \n"
+ " stxr %w1, %0, [%3] \n"
+ " cbnz %w1, 1b \n"
+ : "=&r"(tmp), "=&r"(res), "=&r"(old)
+ : "r" (p), "r" (mask)
+ : "memory"
+ );
+
+ return ((old & mask) != 0);
+}
+
#define atomic_add_int atomic_add_32
#define atomic_fcmpset_int atomic_fcmpset_32
@@ -558,6 +638,8 @@
#define atomic_set_int atomic_set_32
#define atomic_swap_int atomic_swap_32
#define atomic_subtract_int atomic_subtract_32
+#define atomic_testandclear_int atomic_testandclear_32
+#define atomic_testandset_int atomic_testandset_32
#define atomic_add_acq_int atomic_add_acq_32
#define atomic_fcmpset_acq_int atomic_fcmpset_acq_32
@@ -584,6 +666,8 @@
#define atomic_set_long atomic_set_64
#define atomic_swap_long atomic_swap_64
#define atomic_subtract_long atomic_subtract_64
+#define atomic_testandclear_long atomic_testandclear_64
+#define atomic_testandset_long atomic_testandset_64
#define atomic_add_ptr atomic_add_64
#define atomic_fcmpset_ptr atomic_fcmpset_64

File Metadata

Mime Type
text/plain
Expires
Fri, Feb 13, 4:28 AM (3 h, 14 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
28673618
Default Alt Text
D23019.id66291.diff (2 KB)

Event Timeline