Module Name: src
Committed By: martin
Date: Fri Feb 21 15:51:07 UTC 2014
Modified Files:
src/common/lib/libc/atomic: atomic_op_namespace.h
Added Files:
src/common/lib/libc/atomic: atomic_add_16_cas.c atomic_add_8_cas.c
atomic_and_16_cas.c atomic_and_8_cas.c atomic_cas_16_cas.c
atomic_cas_8_cas.c atomic_nand_16_cas.c atomic_nand_8_cas.c
atomic_or_16_cas.c atomic_or_8_cas.c atomic_sub_16_cas.c
atomic_sub_8_cas.c atomic_swap_16_cas.c atomic_swap_8_cas.c
atomic_xor_16_cas.c atomic_xor_8_cas.c
Log Message:
Provide 8 and 16 bit sync ops (using 16 bit and 8 bit cas)
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.2 src/common/lib/libc/atomic/atomic_add_16_cas.c \
src/common/lib/libc/atomic/atomic_add_8_cas.c \
src/common/lib/libc/atomic/atomic_and_16_cas.c \
src/common/lib/libc/atomic/atomic_and_8_cas.c \
src/common/lib/libc/atomic/atomic_cas_16_cas.c \
src/common/lib/libc/atomic/atomic_cas_8_cas.c \
src/common/lib/libc/atomic/atomic_or_16_cas.c \
src/common/lib/libc/atomic/atomic_or_8_cas.c \
src/common/lib/libc/atomic/atomic_swap_16_cas.c \
src/common/lib/libc/atomic/atomic_swap_8_cas.c
cvs rdiff -u -r0 -r1.1 src/common/lib/libc/atomic/atomic_nand_16_cas.c \
src/common/lib/libc/atomic/atomic_nand_8_cas.c \
src/common/lib/libc/atomic/atomic_sub_16_cas.c \
src/common/lib/libc/atomic/atomic_sub_8_cas.c \
src/common/lib/libc/atomic/atomic_xor_16_cas.c \
src/common/lib/libc/atomic/atomic_xor_8_cas.c
cvs rdiff -u -r1.4 -r1.5 src/common/lib/libc/atomic/atomic_op_namespace.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/common/lib/libc/atomic/atomic_op_namespace.h
diff -u src/common/lib/libc/atomic/atomic_op_namespace.h:1.4 src/common/lib/libc/atomic/atomic_op_namespace.h:1.5
--- src/common/lib/libc/atomic/atomic_op_namespace.h:1.4 Mon Jun 23 10:33:52 2008
+++ src/common/lib/libc/atomic/atomic_op_namespace.h Fri Feb 21 15:51:07 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: atomic_op_namespace.h,v 1.4 2008/06/23 10:33:52 ad Exp $ */
+/* $NetBSD: atomic_op_namespace.h,v 1.5 2014/02/21 15:51:07 martin Exp $ */
/*-
* Copyright (c) 2007, 2008 The NetBSD Foundation, Inc.
@@ -73,6 +73,8 @@
#define atomic_cas_ulong _atomic_cas_ulong
#define atomic_cas_ptr _atomic_cas_ptr
#define atomic_cas_64 _atomic_cas_64
+#define atomic_cas_16 _atomic_cas_16
+#define atomic_cas_8 _atomic_cas_8
#define atomic_cas_32_ni _atomic_cas_32_ni
#define atomic_cas_uint_ni _atomic_cas_uint_ni
Added files:
Index: src/common/lib/libc/atomic/atomic_add_16_cas.c
diff -u /dev/null src/common/lib/libc/atomic/atomic_add_16_cas.c:1.2
--- /dev/null Fri Feb 21 15:51:07 2014
+++ src/common/lib/libc/atomic/atomic_add_16_cas.c Fri Feb 21 15:51:07 2014
@@ -0,0 +1,63 @@
+/* $NetBSD: atomic_add_16_cas.c,v 1.2 2014/02/21 15:51:07 martin Exp $ */
+
+/*-
+ * Copyright (c) 2007 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 "atomic_op_namespace.h"
+
+#include <sys/atomic.h>
+
+uint16_t fetch_and_add_2(volatile uint16_t *, uint16_t, ...)
+ asm("__sync_fetch_and_add_2");
+uint16_t add_and_fetch_2(volatile uint16_t *, uint16_t, ...)
+ asm("__sync_add_and_fetch_2");
+
+uint16_t
+fetch_and_add_2(volatile uint16_t *addr, uint16_t val, ...)
+{
+ uint16_t old, new;
+
+ do {
+ old = *addr;
+ new = old + val;
+ } while (atomic_cas_16(addr, old, new) != old);
+ return old;
+}
+
+uint16_t
+add_and_fetch_2(volatile uint16_t *addr, uint16_t val, ...)
+{
+ uint16_t old, new;
+
+ do {
+ old = *addr;
+ new = old + val;
+ } while (atomic_cas_16(addr, old, new) != old);
+ return new;
+}
Index: src/common/lib/libc/atomic/atomic_add_8_cas.c
diff -u /dev/null src/common/lib/libc/atomic/atomic_add_8_cas.c:1.2
--- /dev/null Fri Feb 21 15:51:07 2014
+++ src/common/lib/libc/atomic/atomic_add_8_cas.c Fri Feb 21 15:51:07 2014
@@ -0,0 +1,63 @@
+/* $NetBSD: atomic_add_8_cas.c,v 1.2 2014/02/21 15:51:07 martin Exp $ */
+
+/*-
+ * Copyright (c) 2007 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 "atomic_op_namespace.h"
+
+#include <sys/atomic.h>
+
+uint8_t fetch_and_add_1(volatile uint8_t *, uint8_t, ...)
+ asm("__sync_fetch_and_add_1");
+uint8_t add_and_fetch_1(volatile uint8_t *, uint8_t, ...)
+ asm("__sync_add_and_fetch_1");
+
+uint8_t
+fetch_and_add_1(volatile uint8_t *addr, uint8_t val, ...)
+{
+ uint8_t old, new;
+
+ do {
+ old = *addr;
+ new = old + val;
+ } while (atomic_cas_8(addr, old, new) != old);
+ return old;
+}
+
+uint8_t
+add_and_fetch_1(volatile uint8_t *addr, uint8_t val, ...)
+{
+ uint8_t old, new;
+
+ do {
+ old = *addr;
+ new = old + val;
+ } while (atomic_cas_8(addr, old, new) != old);
+ return new;
+}
Index: src/common/lib/libc/atomic/atomic_and_16_cas.c
diff -u /dev/null src/common/lib/libc/atomic/atomic_and_16_cas.c:1.2
--- /dev/null Fri Feb 21 15:51:07 2014
+++ src/common/lib/libc/atomic/atomic_and_16_cas.c Fri Feb 21 15:51:07 2014
@@ -0,0 +1,49 @@
+/* $NetBSD: atomic_and_16_cas.c,v 1.2 2014/02/21 15:51:07 martin Exp $ */
+
+/*-
+ * Copyright (c) 2007 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 "atomic_op_namespace.h"
+
+#include <sys/atomic.h>
+
+uint16_t fetch_and_and_2(volatile uint16_t *, uint16_t, ...)
+ asm("__sync_fetch_and_and_2");
+
+uint16_t
+fetch_and_and_2(volatile uint16_t *addr, uint16_t val, ...)
+{
+ uint16_t old, new;
+
+ do {
+ old = *addr;
+ new = old & val;
+ } while (atomic_cas_16(addr, old, new) != old);
+ return old;
+}
Index: src/common/lib/libc/atomic/atomic_and_8_cas.c
diff -u /dev/null src/common/lib/libc/atomic/atomic_and_8_cas.c:1.2
--- /dev/null Fri Feb 21 15:51:07 2014
+++ src/common/lib/libc/atomic/atomic_and_8_cas.c Fri Feb 21 15:51:07 2014
@@ -0,0 +1,49 @@
+/* $NetBSD: atomic_and_8_cas.c,v 1.2 2014/02/21 15:51:07 martin Exp $ */
+
+/*-
+ * Copyright (c) 2007 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 "atomic_op_namespace.h"
+
+#include <sys/atomic.h>
+
+uint8_t fetch_and_and_1(volatile uint8_t *, uint8_t, ...)
+ asm("__sync_fetch_and_and_1");
+
+uint8_t
+fetch_and_and_1(volatile uint8_t *addr, uint8_t val, ...)
+{
+ uint8_t old, new;
+
+ do {
+ old = *addr;
+ new = old & val;
+ } while (atomic_cas_8(addr, old, new) != old);
+ return old;
+}
Index: src/common/lib/libc/atomic/atomic_cas_16_cas.c
diff -u /dev/null src/common/lib/libc/atomic/atomic_cas_16_cas.c:1.2
--- /dev/null Fri Feb 21 15:51:07 2014
+++ src/common/lib/libc/atomic/atomic_cas_16_cas.c Fri Feb 21 15:51:07 2014
@@ -0,0 +1,45 @@
+/* $NetBSD: atomic_cas_16_cas.c,v 1.2 2014/02/21 15:51:07 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_2(volatile uint16_t *, uint16_t, uint16_t, ...)
+ asm("__sync_bool_compare_and_swap_2");
+
+bool
+bool_compare_and_swap_2(volatile uint16_t *addr, uint16_t oldval,
+ uint16_t newval, ...)
+{
+ return atomic_cas_16(addr, oldval, newval) == oldval;
+}
Index: src/common/lib/libc/atomic/atomic_cas_8_cas.c
diff -u /dev/null src/common/lib/libc/atomic/atomic_cas_8_cas.c:1.2
--- /dev/null Fri Feb 21 15:51:07 2014
+++ src/common/lib/libc/atomic/atomic_cas_8_cas.c Fri Feb 21 15:51:07 2014
@@ -0,0 +1,45 @@
+/* $NetBSD: atomic_cas_8_cas.c,v 1.2 2014/02/21 15:51:07 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_1(volatile uint8_t *, uint8_t, uint8_t, ...)
+ asm("__sync_bool_compare_and_swap_1");
+
+bool
+bool_compare_and_swap_1(volatile uint8_t *addr, uint8_t oldval,
+ uint8_t newval, ...)
+{
+ return atomic_cas_8(addr, oldval, newval) == oldval;
+}
Index: src/common/lib/libc/atomic/atomic_or_16_cas.c
diff -u /dev/null src/common/lib/libc/atomic/atomic_or_16_cas.c:1.2
--- /dev/null Fri Feb 21 15:51:07 2014
+++ src/common/lib/libc/atomic/atomic_or_16_cas.c Fri Feb 21 15:51:07 2014
@@ -0,0 +1,64 @@
+/* $NetBSD: atomic_or_16_cas.c,v 1.2 2014/02/21 15:51:07 martin Exp $ */
+
+/*-
+ * Copyright (c) 2007 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 "atomic_op_namespace.h"
+
+#include <sys/atomic.h>
+
+uint16_t fetch_and_or_2(volatile uint16_t *, uint16_t, ...)
+ asm("__sync_fetch_and_or_2");
+uint16_t or_and_fetch_2(volatile uint16_t *, uint16_t, ...)
+ asm("__sync_or_and_fetch_2");
+
+uint16_t
+fetch_and_or_2(volatile uint16_t *addr, uint16_t val, ...)
+{
+ uint16_t old, new;
+
+ do {
+ old = *addr;
+ new = old | val;
+ } while (atomic_cas_16(addr, old, new) != old);
+ return old;
+}
+
+uint16_t
+or_and_fetch_2(volatile uint16_t *addr, uint16_t val, ...)
+{
+ uint16_t old, new;
+
+ do {
+ old = *addr;
+ new = old | val;
+ } while (atomic_cas_16(addr, old, new) != old);
+ return old;
+}
+
Index: src/common/lib/libc/atomic/atomic_or_8_cas.c
diff -u /dev/null src/common/lib/libc/atomic/atomic_or_8_cas.c:1.2
--- /dev/null Fri Feb 21 15:51:07 2014
+++ src/common/lib/libc/atomic/atomic_or_8_cas.c Fri Feb 21 15:51:07 2014
@@ -0,0 +1,64 @@
+/* $NetBSD: atomic_or_8_cas.c,v 1.2 2014/02/21 15:51:07 martin Exp $ */
+
+/*-
+ * Copyright (c) 2007 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 "atomic_op_namespace.h"
+
+#include <sys/atomic.h>
+
+uint8_t fetch_and_or_1(volatile uint8_t *, uint8_t, ...)
+ asm("__sync_fetch_and_or_1");
+uint8_t or_and_fetch_1(volatile uint8_t *, uint8_t, ...)
+ asm("__sync_or_and_fetch_1");
+
+uint8_t
+fetch_and_or_1(volatile uint8_t *addr, uint8_t val, ...)
+{
+ uint8_t old, new;
+
+ do {
+ old = *addr;
+ new = old | val;
+ } while (atomic_cas_8(addr, old, new) != old);
+ return old;
+}
+
+uint8_t
+or_and_fetch_1(volatile uint8_t *addr, uint8_t val, ...)
+{
+ uint8_t old, new;
+
+ do {
+ old = *addr;
+ new = old | val;
+ } while (atomic_cas_8(addr, old, new) != old);
+ return old;
+}
+
Index: src/common/lib/libc/atomic/atomic_swap_16_cas.c
diff -u /dev/null src/common/lib/libc/atomic/atomic_swap_16_cas.c:1.2
--- /dev/null Fri Feb 21 15:51:07 2014
+++ src/common/lib/libc/atomic/atomic_swap_16_cas.c Fri Feb 21 15:51:07 2014
@@ -0,0 +1,50 @@
+/* $NetBSD: atomic_swap_16_cas.c,v 1.2 2014/02/21 15:51:07 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 "atomic_op_namespace.h"
+
+#include <sys/atomic.h>
+
+uint16_t
+atomic_swap_16(volatile uint16_t *addr, uint16_t new)
+ asm("__sync_lock_test_and_set_2");
+
+uint16_t
+atomic_swap_16(volatile uint16_t *addr, uint16_t new)
+{
+ uint16_t old;
+
+ do {
+ old = *addr;
+ } while (atomic_cas_16(addr, old, new) != old);
+
+ return old;
+}
Index: src/common/lib/libc/atomic/atomic_swap_8_cas.c
diff -u /dev/null src/common/lib/libc/atomic/atomic_swap_8_cas.c:1.2
--- /dev/null Fri Feb 21 15:51:07 2014
+++ src/common/lib/libc/atomic/atomic_swap_8_cas.c Fri Feb 21 15:51:07 2014
@@ -0,0 +1,50 @@
+/* $NetBSD: atomic_swap_8_cas.c,v 1.2 2014/02/21 15:51:07 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 "atomic_op_namespace.h"
+
+#include <sys/atomic.h>
+
+uint8_t
+atomic_swap_8(volatile uint8_t *addr, uint8_t new)
+ asm("__sync_lock_test_and_set_1");
+
+uint8_t
+atomic_swap_8(volatile uint8_t *addr, uint8_t new)
+{
+ uint8_t old;
+
+ do {
+ old = *addr;
+ } while (atomic_cas_8(addr, old, new) != old);
+
+ return old;
+}
Index: src/common/lib/libc/atomic/atomic_nand_16_cas.c
diff -u /dev/null src/common/lib/libc/atomic/atomic_nand_16_cas.c:1.1
--- /dev/null Fri Feb 21 15:51:07 2014
+++ src/common/lib/libc/atomic/atomic_nand_16_cas.c Fri Feb 21 15:51:07 2014
@@ -0,0 +1,61 @@
+/* $NetBSD: atomic_nand_16_cas.c,v 1.1 2014/02/21 15:51:07 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>
+
+uint16_t fetch_and_nand_2(volatile uint16_t *, uint16_t, ...)
+ asm("__sync_fetch_and_nand_2");
+uint16_t nand_and_fetch_2(volatile uint16_t *, uint16_t, ...)
+ asm("__sync_nand_and_fetch_2");
+
+uint16_t
+fetch_and_nand_2(volatile uint16_t *addr, uint16_t val, ...)
+{
+ uint16_t old, new;
+
+ do {
+ old = *addr;
+ new = ~(old & val);
+ } while (atomic_cas_16(addr, old, new) != old);
+ return old;
+}
+
+uint16_t
+nand_and_fetch_2(volatile uint16_t *addr, uint16_t val, ...)
+{
+ uint16_t old, new;
+
+ do {
+ old = *addr;
+ new = ~(old & val);
+ } while (atomic_cas_16(addr, old, new) != old);
+ return new;
+}
Index: src/common/lib/libc/atomic/atomic_nand_8_cas.c
diff -u /dev/null src/common/lib/libc/atomic/atomic_nand_8_cas.c:1.1
--- /dev/null Fri Feb 21 15:51:07 2014
+++ src/common/lib/libc/atomic/atomic_nand_8_cas.c Fri Feb 21 15:51:07 2014
@@ -0,0 +1,61 @@
+/* $NetBSD: atomic_nand_8_cas.c,v 1.1 2014/02/21 15:51:07 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>
+
+uint8_t fetch_and_nand_1(volatile uint8_t *, uint8_t, ...)
+ asm("__sync_fetch_and_nand_1");
+uint8_t nand_and_fetch_1(volatile uint8_t *, uint8_t, ...)
+ asm("__sync_nand_and_fetch_1");
+
+uint8_t
+fetch_and_nand_1(volatile uint8_t *addr, uint8_t val, ...)
+{
+ uint8_t old, new;
+
+ do {
+ old = *addr;
+ new = ~(old & val);
+ } while (atomic_cas_8(addr, old, new) != old);
+ return old;
+}
+
+uint8_t
+nand_and_fetch_1(volatile uint8_t *addr, uint8_t val, ...)
+{
+ uint8_t old, new;
+
+ do {
+ old = *addr;
+ new = ~(old & val);
+ } while (atomic_cas_8(addr, old, new) != old);
+ return new;
+}
Index: src/common/lib/libc/atomic/atomic_sub_16_cas.c
diff -u /dev/null src/common/lib/libc/atomic/atomic_sub_16_cas.c:1.1
--- /dev/null Fri Feb 21 15:51:07 2014
+++ src/common/lib/libc/atomic/atomic_sub_16_cas.c Fri Feb 21 15:51:07 2014
@@ -0,0 +1,61 @@
+/* $NetBSD: atomic_sub_16_cas.c,v 1.1 2014/02/21 15:51:07 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>
+
+uint16_t fetch_and_sub_2(volatile uint16_t *, uint16_t, ...)
+ asm("__sync_fetch_and_sub_2");
+uint16_t sub_and_fetch_2(volatile uint16_t *, uint16_t, ...)
+ asm("__sync_sub_and_fetch_2");
+
+uint16_t
+fetch_and_sub_2(volatile uint16_t *addr, uint16_t val, ...)
+{
+ uint16_t old, new;
+
+ do {
+ old = *addr;
+ new = old - val;
+ } while (atomic_cas_16(addr, old, new) != old);
+ return old;
+}
+
+uint16_t
+sub_and_fetch_2(volatile uint16_t *addr, uint16_t val, ...)
+{
+ uint16_t old, new;
+
+ do {
+ old = *addr;
+ new = old - val;
+ } while (atomic_cas_16(addr, old, new) != old);
+ return new;
+}
Index: src/common/lib/libc/atomic/atomic_sub_8_cas.c
diff -u /dev/null src/common/lib/libc/atomic/atomic_sub_8_cas.c:1.1
--- /dev/null Fri Feb 21 15:51:07 2014
+++ src/common/lib/libc/atomic/atomic_sub_8_cas.c Fri Feb 21 15:51:07 2014
@@ -0,0 +1,61 @@
+/* $NetBSD: atomic_sub_8_cas.c,v 1.1 2014/02/21 15:51:07 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>
+
+uint8_t fetch_and_sub_1(volatile uint8_t *, uint8_t, ...)
+ asm("__sync_fetch_and_sub_1");
+uint8_t sub_and_fetch_1(volatile uint8_t *, uint8_t, ...)
+ asm("__sync_sub_and_fetch_1");
+
+uint8_t
+fetch_and_sub_1(volatile uint8_t *addr, uint8_t val, ...)
+{
+ uint8_t old, new;
+
+ do {
+ old = *addr;
+ new = old - val;
+ } while (atomic_cas_8(addr, old, new) != old);
+ return old;
+}
+
+uint8_t
+sub_and_fetch_1(volatile uint8_t *addr, uint8_t val, ...)
+{
+ uint8_t old, new;
+
+ do {
+ old = *addr;
+ new = old - val;
+ } while (atomic_cas_8(addr, old, new) != old);
+ return new;
+}
Index: src/common/lib/libc/atomic/atomic_xor_16_cas.c
diff -u /dev/null src/common/lib/libc/atomic/atomic_xor_16_cas.c:1.1
--- /dev/null Fri Feb 21 15:51:07 2014
+++ src/common/lib/libc/atomic/atomic_xor_16_cas.c Fri Feb 21 15:51:07 2014
@@ -0,0 +1,61 @@
+/* $NetBSD: atomic_xor_16_cas.c,v 1.1 2014/02/21 15:51:07 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>
+
+uint16_t fetch_and_xor_2(volatile uint16_t *, uint16_t, ...)
+ asm("__sync_fetch_and_xor_2");
+uint16_t xor_and_fetch_2(volatile uint16_t *, uint16_t, ...)
+ asm("__sync_xor_and_fetch_2");
+
+uint16_t
+fetch_and_xor_2(volatile uint16_t *addr, uint16_t val, ...)
+{
+ uint16_t old, new;
+
+ do {
+ old = *addr;
+ new = old ^ val;
+ } while (atomic_cas_16(addr, old, new) != old);
+ return old;
+}
+
+uint16_t
+xor_and_fetch_2(volatile uint16_t *addr, uint16_t val, ...)
+{
+ uint16_t old, new;
+
+ do {
+ old = *addr;
+ new = old ^ val;
+ } while (atomic_cas_16(addr, old, new) != old);
+ return new;
+}
Index: src/common/lib/libc/atomic/atomic_xor_8_cas.c
diff -u /dev/null src/common/lib/libc/atomic/atomic_xor_8_cas.c:1.1
--- /dev/null Fri Feb 21 15:51:07 2014
+++ src/common/lib/libc/atomic/atomic_xor_8_cas.c Fri Feb 21 15:51:07 2014
@@ -0,0 +1,61 @@
+/* $NetBSD: atomic_xor_8_cas.c,v 1.1 2014/02/21 15:51:07 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>
+
+uint8_t fetch_and_xor_1(volatile uint8_t *, uint8_t, ...)
+ asm("__sync_fetch_and_xor_1");
+uint8_t xor_and_fetch_1(volatile uint8_t *, uint8_t, ...)
+ asm("__sync_xor_and_fetch_1");
+
+uint8_t
+fetch_and_xor_1(volatile uint8_t *addr, uint8_t val, ...)
+{
+ uint8_t old, new;
+
+ do {
+ old = *addr;
+ new = old ^ val;
+ } while (atomic_cas_8(addr, old, new) != old);
+ return old;
+}
+
+uint8_t
+xor_and_fetch_1(volatile uint8_t *addr, uint8_t val, ...)
+{
+ uint8_t old, new;
+
+ do {
+ old = *addr;
+ new = old ^ val;
+ } while (atomic_cas_8(addr, old, new) != old);
+ return new;
+}
