Author: ed
Date: Tue Dec 27 22:13:51 2011
New Revision: 228919
URL: http://svn.freebsd.org/changeset/base/228919
Log:
Add locally implemented atomic intrinsics to libcompiler_rt.
The built-in atomic operations are not implemented in our version of GCC
4.2 for the ARM and MIPS architectures. Instead of emitting locked
instructions, they generate calls to functions that can be implemented
in the C runtime.
Only implement the atomic operations that are used by <stdatomic.h> for
datatype sizes that are supported by atomic(9). This means that on these
architectures, we can only use atomic operations on 32-bits and 64-bits
variables, which is typically sufficient.
This makes <stdatomic.h> work on all architectures except MIPS, since
MIPS and SPARC64 still use libgcc. Converting these architectures to
libcompiler_rt is on my todo list.
Added:
head/lib/libcompiler_rt/__sync_fetch_and_add_4.c (contents, props changed)
head/lib/libcompiler_rt/__sync_fetch_and_add_8.c (contents, props changed)
head/lib/libcompiler_rt/__sync_fetch_and_and_4.c (contents, props changed)
head/lib/libcompiler_rt/__sync_fetch_and_and_8.c (contents, props changed)
head/lib/libcompiler_rt/__sync_fetch_and_op_n.h (contents, props changed)
head/lib/libcompiler_rt/__sync_fetch_and_or_4.c (contents, props changed)
head/lib/libcompiler_rt/__sync_fetch_and_or_8.c (contents, props changed)
head/lib/libcompiler_rt/__sync_fetch_and_sub_4.c (contents, props changed)
head/lib/libcompiler_rt/__sync_fetch_and_sub_8.c (contents, props changed)
head/lib/libcompiler_rt/__sync_fetch_and_xor_4.c (contents, props changed)
head/lib/libcompiler_rt/__sync_fetch_and_xor_8.c (contents, props changed)
head/lib/libcompiler_rt/__sync_lock_test_and_set_4.c (contents, props
changed)
head/lib/libcompiler_rt/__sync_lock_test_and_set_8.c (contents, props
changed)
head/lib/libcompiler_rt/__sync_val_compare_and_swap_4.c (contents, props
changed)
head/lib/libcompiler_rt/__sync_val_compare_and_swap_8.c (contents, props
changed)
head/lib/libcompiler_rt/__sync_val_compare_and_swap_n.h (contents, props
changed)
Modified:
head/lib/libcompiler_rt/Makefile
Modified: head/lib/libcompiler_rt/Makefile
==============================================================================
--- head/lib/libcompiler_rt/Makefile Tue Dec 27 21:36:31 2011
(r228918)
+++ head/lib/libcompiler_rt/Makefile Tue Dec 27 22:13:51 2011
(r228919)
@@ -144,6 +144,26 @@ SRCF+= adddf3 \
umodsi3
.endif
+# FreeBSD-specific atomic intrinsics.
+.if ${MACHINE_CPUARCH} == "arm" || ${MACHINE_CPUARCH} == "mips"
+SRCF+= __sync_fetch_and_add_4 \
+ __sync_fetch_and_and_4 \
+ __sync_fetch_and_or_4 \
+ __sync_fetch_and_sub_4 \
+ __sync_fetch_and_xor_4 \
+ __sync_lock_test_and_set_4 \
+ __sync_val_compare_and_swap_4
+.endif
+.if ${MACHINE_ARCH:Mmips64*} != ""
+SRCF+= __sync_fetch_and_add_8 \
+ __sync_fetch_and_and_8 \
+ __sync_fetch_and_or_8 \
+ __sync_fetch_and_sub_8 \
+ __sync_fetch_and_xor_8 \
+ __sync_lock_test_and_set_8 \
+ __sync_val_compare_and_swap_8
+.endif
+
.for file in ${SRCF}
. if ${MACHINE_CPUARCH} != "arm" && exists(${CRTSRC}/${CRTARCH}/${file}.S)
SRCS+= ${file}.S
Added: head/lib/libcompiler_rt/__sync_fetch_and_add_4.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/lib/libcompiler_rt/__sync_fetch_and_add_4.c Tue Dec 27 22:13:51
2011 (r228919)
@@ -0,0 +1,6 @@
+/* $FreeBSD$ */
+#define NAME __sync_fetch_and_add_4
+#define TYPE uint32_t
+#define FETCHADD(x, y) atomic_fetchadd_32(x, y)
+
+#include "__sync_fetch_and_op_n.h"
Added: head/lib/libcompiler_rt/__sync_fetch_and_add_8.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/lib/libcompiler_rt/__sync_fetch_and_add_8.c Tue Dec 27 22:13:51
2011 (r228919)
@@ -0,0 +1,6 @@
+/* $FreeBSD$ */
+#define NAME __sync_fetch_and_add_8
+#define TYPE uint64_t
+#define FETCHADD(x, y) atomic_fetchadd_64(x, y)
+
+#include "__sync_fetch_and_op_n.h"
Added: head/lib/libcompiler_rt/__sync_fetch_and_and_4.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/lib/libcompiler_rt/__sync_fetch_and_and_4.c Tue Dec 27 22:13:51
2011 (r228919)
@@ -0,0 +1,7 @@
+/* $FreeBSD$ */
+#define NAME __sync_fetch_and_and_4
+#define TYPE uint32_t
+#define CMPSET atomic_cmpset_32
+#define EXPRESSION t & value
+
+#include "__sync_fetch_and_op_n.h"
Added: head/lib/libcompiler_rt/__sync_fetch_and_and_8.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/lib/libcompiler_rt/__sync_fetch_and_and_8.c Tue Dec 27 22:13:51
2011 (r228919)
@@ -0,0 +1,7 @@
+/* $FreeBSD$ */
+#define NAME __sync_fetch_and_and_8
+#define TYPE uint64_t
+#define CMPSET atomic_cmpset_64
+#define EXPRESSION t & value
+
+#include "__sync_fetch_and_op_n.h"
Added: head/lib/libcompiler_rt/__sync_fetch_and_op_n.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/lib/libcompiler_rt/__sync_fetch_and_op_n.h Tue Dec 27 22:13:51
2011 (r228919)
@@ -0,0 +1,47 @@
+/*-
+ * Copyright (c) 2011 Ed Schouten <e...@freebsd.org>
+ * All rights reserved.
+ *
+ * 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 AUTHOR 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 AUTHOR 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/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <sys/types.h>
+#include <machine/atomic.h>
+
+TYPE
+NAME(volatile TYPE *ptr, TYPE value)
+{
+ TYPE t;
+
+#ifdef FETCHADD
+ t = FETCHADD(ptr, value);
+#else
+ do {
+ t = *ptr;
+ } while (!CMPSET(ptr, t, EXPRESSION));
+#endif
+
+ return (t);
+}
Added: head/lib/libcompiler_rt/__sync_fetch_and_or_4.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/lib/libcompiler_rt/__sync_fetch_and_or_4.c Tue Dec 27 22:13:51
2011 (r228919)
@@ -0,0 +1,7 @@
+/* $FreeBSD$ */
+#define NAME __sync_fetch_and_or_4
+#define TYPE uint32_t
+#define CMPSET atomic_cmpset_32
+#define EXPRESSION t | value
+
+#include "__sync_fetch_and_op_n.h"
Added: head/lib/libcompiler_rt/__sync_fetch_and_or_8.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/lib/libcompiler_rt/__sync_fetch_and_or_8.c Tue Dec 27 22:13:51
2011 (r228919)
@@ -0,0 +1,7 @@
+/* $FreeBSD$ */
+#define NAME __sync_fetch_and_or_8
+#define TYPE uint64_t
+#define CMPSET atomic_cmpset_64
+#define EXPRESSION t | value
+
+#include "__sync_fetch_and_op_n.h"
Added: head/lib/libcompiler_rt/__sync_fetch_and_sub_4.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/lib/libcompiler_rt/__sync_fetch_and_sub_4.c Tue Dec 27 22:13:51
2011 (r228919)
@@ -0,0 +1,6 @@
+/* $FreeBSD$ */
+#define NAME __sync_fetch_and_sub_4
+#define TYPE uint32_t
+#define FETCHADD(x, y) atomic_fetchadd_32(x, -(y))
+
+#include "__sync_fetch_and_op_n.h"
Added: head/lib/libcompiler_rt/__sync_fetch_and_sub_8.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/lib/libcompiler_rt/__sync_fetch_and_sub_8.c Tue Dec 27 22:13:51
2011 (r228919)
@@ -0,0 +1,6 @@
+/* $FreeBSD$ */
+#define NAME __sync_fetch_and_sub_8
+#define TYPE uint64_t
+#define FETCHADD(x, y) atomic_fetchadd_64(x, -(y))
+
+#include "__sync_fetch_and_op_n.h"
Added: head/lib/libcompiler_rt/__sync_fetch_and_xor_4.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/lib/libcompiler_rt/__sync_fetch_and_xor_4.c Tue Dec 27 22:13:51
2011 (r228919)
@@ -0,0 +1,7 @@
+/* $FreeBSD$ */
+#define NAME __sync_fetch_and_xor_4
+#define TYPE uint32_t
+#define CMPSET atomic_cmpset_32
+#define EXPRESSION t ^ value
+
+#include "__sync_fetch_and_op_n.h"
Added: head/lib/libcompiler_rt/__sync_fetch_and_xor_8.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/lib/libcompiler_rt/__sync_fetch_and_xor_8.c Tue Dec 27 22:13:51
2011 (r228919)
@@ -0,0 +1,7 @@
+/* $FreeBSD$ */
+#define NAME __sync_fetch_and_xor_8
+#define TYPE uint64_t
+#define CMPSET atomic_cmpset_64
+#define EXPRESSION t ^ value
+
+#include "__sync_fetch_and_op_n.h"
Added: head/lib/libcompiler_rt/__sync_lock_test_and_set_4.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/lib/libcompiler_rt/__sync_lock_test_and_set_4.c Tue Dec 27
22:13:51 2011 (r228919)
@@ -0,0 +1,7 @@
+/* $FreeBSD$ */
+#define NAME __sync_lock_test_and_set_4
+#define TYPE uint32_t
+#define CMPSET atomic_cmpset_32
+#define EXPRESSION value
+
+#include "__sync_fetch_and_op_n.h"
Added: head/lib/libcompiler_rt/__sync_lock_test_and_set_8.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/lib/libcompiler_rt/__sync_lock_test_and_set_8.c Tue Dec 27
22:13:51 2011 (r228919)
@@ -0,0 +1,7 @@
+/* $FreeBSD$ */
+#define NAME __sync_lock_test_and_set_8
+#define TYPE uint64_t
+#define CMPSET atomic_cmpset_64
+#define EXPRESSION value
+
+#include "__sync_fetch_and_op_n.h"
Added: head/lib/libcompiler_rt/__sync_val_compare_and_swap_4.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/lib/libcompiler_rt/__sync_val_compare_and_swap_4.c Tue Dec 27
22:13:51 2011 (r228919)
@@ -0,0 +1,6 @@
+/* $FreeBSD$ */
+#define NAME __sync_val_compare_and_swap_4
+#define TYPE uint32_t
+#define CMPSET atomic_cmpset_32
+
+#include "__sync_val_compare_and_swap_n.h"
Added: head/lib/libcompiler_rt/__sync_val_compare_and_swap_8.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/lib/libcompiler_rt/__sync_val_compare_and_swap_8.c Tue Dec 27
22:13:51 2011 (r228919)
@@ -0,0 +1,6 @@
+/* $FreeBSD$ */
+#define NAME __sync_val_compare_and_swap_8
+#define TYPE uint64_t
+#define CMPSET atomic_cmpset_64
+
+#include "__sync_val_compare_and_swap_n.h"
Added: head/lib/libcompiler_rt/__sync_val_compare_and_swap_n.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/lib/libcompiler_rt/__sync_val_compare_and_swap_n.h Tue Dec 27
22:13:51 2011 (r228919)
@@ -0,0 +1,45 @@
+/*-
+ * Copyright (c) 2011 Ed Schouten <e...@freebsd.org>
+ * All rights reserved.
+ *
+ * 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 AUTHOR 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 AUTHOR 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/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <sys/types.h>
+#include <machine/atomic.h>
+
+TYPE
+NAME(volatile TYPE *ptr, TYPE oldval, TYPE newval)
+{
+ TYPE t;
+
+ while (!CMPSET(ptr, oldval, newval)) {
+ t = *ptr;
+ if (t != oldval)
+ return (t);
+ }
+
+ return (oldval);
+}
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
