Module Name: src
Committed By: martin
Date: Fri Feb 21 10:52:50 UTC 2014
Added Files:
src/common/lib/libc/atomic: atomic_cas_32_cas.c atomic_nand_32_cas.c
atomic_sub_32_cas.c atomic_xor_32_cas.c
Log Message:
Provide 32bit __sync ops based on atomic_cas_32.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/common/lib/libc/atomic/atomic_cas_32_cas.c \
src/common/lib/libc/atomic/atomic_nand_32_cas.c \
src/common/lib/libc/atomic/atomic_sub_32_cas.c \
src/common/lib/libc/atomic/atomic_xor_32_cas.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/common/lib/libc/atomic/atomic_cas_32_cas.c
diff -u /dev/null src/common/lib/libc/atomic/atomic_cas_32_cas.c:1.1
--- /dev/null Fri Feb 21 10:52:50 2014
+++ src/common/lib/libc/atomic/atomic_cas_32_cas.c Fri Feb 21 10:52:50 2014
@@ -0,0 +1,45 @@
+/* $NetBSD: atomic_cas_32_cas.c,v 1.1 2014/02/21 10:52:50 martin Exp $ */
+
+/*-
+ * Copyright (c) 2014 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jason R. Thorpe.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#if !defined(_KERNEL) && !defined(_STANDALONE)
+#include <stdbool.h>
+#endif
+#include <sys/atomic.h>
+
+bool bool_compare_and_swap_4(volatile uint32_t *, uint32_t, uint32_t, ...)
+ asm("__sync_bool_compare_and_swap_4");
+
+bool
+bool_compare_and_swap_4(volatile uint32_t *addr, uint32_t oldval,
+ uint32_t newval, ...)
+{
+ return atomic_cas_32(addr, oldval, newval) == oldval;
+}
Index: src/common/lib/libc/atomic/atomic_nand_32_cas.c
diff -u /dev/null src/common/lib/libc/atomic/atomic_nand_32_cas.c:1.1
--- /dev/null Fri Feb 21 10:52:50 2014
+++ src/common/lib/libc/atomic/atomic_nand_32_cas.c Fri Feb 21 10:52:50 2014
@@ -0,0 +1,61 @@
+/* $NetBSD: atomic_nand_32_cas.c,v 1.1 2014/02/21 10:52:50 martin Exp $ */
+
+/*-
+ * Copyright (c) 2014 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jason R. Thorpe.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <sys/atomic.h>
+
+uint32_t fetch_and_nand_4(volatile uint32_t *, uint32_t, ...)
+ asm("__sync_fetch_and_nand_4");
+uint32_t nand_and_fetch_4(volatile uint32_t *, uint32_t, ...)
+ asm("__sync_nand_and_fetch_4");
+
+uint32_t
+fetch_and_nand_4(volatile uint32_t *addr, uint32_t val, ...)
+{
+ uint32_t old, new;
+
+ do {
+ old = *addr;
+ new = ~(old & val);
+ } while (atomic_cas_32(addr, old, new) != old);
+ return old;
+}
+
+uint32_t
+nand_and_fetch_4(volatile uint32_t *addr, uint32_t val, ...)
+{
+ uint32_t old, new;
+
+ do {
+ old = *addr;
+ new = ~(old & val);
+ } while (atomic_cas_32(addr, old, new) != old);
+ return new;
+}
Index: src/common/lib/libc/atomic/atomic_sub_32_cas.c
diff -u /dev/null src/common/lib/libc/atomic/atomic_sub_32_cas.c:1.1
--- /dev/null Fri Feb 21 10:52:50 2014
+++ src/common/lib/libc/atomic/atomic_sub_32_cas.c Fri Feb 21 10:52:50 2014
@@ -0,0 +1,61 @@
+/* $NetBSD: atomic_sub_32_cas.c,v 1.1 2014/02/21 10:52:50 martin Exp $ */
+
+/*-
+ * Copyright (c) 2014 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jason R. Thorpe.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <sys/atomic.h>
+
+uint32_t fetch_and_sub_4(volatile uint32_t *, uint32_t, ...)
+ asm("__sync_fetch_and_sub_4");
+uint32_t sub_and_fetch_4(volatile uint32_t *, uint32_t, ...)
+ asm("__sync_sub_and_fetch_4");
+
+uint32_t
+fetch_and_sub_4(volatile uint32_t *addr, uint32_t val, ...)
+{
+ uint32_t old, new;
+
+ do {
+ old = *addr;
+ new = old - val;
+ } while (atomic_cas_32(addr, old, new) != old);
+ return old;
+}
+
+uint32_t
+sub_and_fetch_4(volatile uint32_t *addr, uint32_t val, ...)
+{
+ uint32_t old, new;
+
+ do {
+ old = *addr;
+ new = old - val;
+ } while (atomic_cas_32(addr, old, new) != old);
+ return new;
+}
Index: src/common/lib/libc/atomic/atomic_xor_32_cas.c
diff -u /dev/null src/common/lib/libc/atomic/atomic_xor_32_cas.c:1.1
--- /dev/null Fri Feb 21 10:52:50 2014
+++ src/common/lib/libc/atomic/atomic_xor_32_cas.c Fri Feb 21 10:52:50 2014
@@ -0,0 +1,61 @@
+/* $NetBSD: atomic_xor_32_cas.c,v 1.1 2014/02/21 10:52:50 martin Exp $ */
+
+/*-
+ * Copyright (c) 2014 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jason R. Thorpe.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <sys/atomic.h>
+
+uint32_t fetch_and_xor_4(volatile uint32_t *, uint32_t, ...)
+ asm("__sync_fetch_and_xor_4");
+uint32_t xor_and_fetch_4(volatile uint32_t *, uint32_t, ...)
+ asm("__sync_xor_and_fetch_4");
+
+uint32_t
+fetch_and_xor_4(volatile uint32_t *addr, uint32_t val, ...)
+{
+ uint32_t old, new;
+
+ do {
+ old = *addr;
+ new = old ^ val;
+ } while (atomic_cas_32(addr, old, new) != old);
+ return old;
+}
+
+uint32_t
+xor_and_fetch_4(volatile uint32_t *addr, uint32_t val, ...)
+{
+ uint32_t old, new;
+
+ do {
+ old = *addr;
+ new = old ^ val;
+ } while (atomic_cas_32(addr, old, new) != old);
+ return new;
+}
