Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/common/lib/libc/arch/m68k/atomic Add missing __sync_* ops
details: https://anonhg.NetBSD.org/src/rev/88331a776e00
branches: trunk
changeset: 326866:88331a776e00
user: martin <martin%NetBSD.org@localhost>
date: Thu Feb 20 20:39:01 2014 +0000
description:
Add missing __sync_* ops
diffstat:
common/lib/libc/arch/m68k/atomic/Makefile.inc | 5 +-
common/lib/libc/arch/m68k/atomic/atomic_add.S | 33 ++++++-
common/lib/libc/arch/m68k/atomic/atomic_and.S | 63 +++++++++++-
common/lib/libc/arch/m68k/atomic/atomic_nand.S | 123 +++++++++++++++++++++++
common/lib/libc/arch/m68k/atomic/atomic_or.S | 63 +++++++++++-
common/lib/libc/arch/m68k/atomic/atomic_sub.S | 124 +++++++++++++++++++++++
common/lib/libc/arch/m68k/atomic/atomic_xor.S | 131 +++++++++++++++++++++++++
7 files changed, 537 insertions(+), 5 deletions(-)
diffs (truncated from 637 to 300 lines):
diff -r 867e625edca8 -r 88331a776e00 common/lib/libc/arch/m68k/atomic/Makefile.inc
--- a/common/lib/libc/arch/m68k/atomic/Makefile.inc Thu Feb 20 19:47:19 2014 +0000
+++ b/common/lib/libc/arch/m68k/atomic/Makefile.inc Thu Feb 20 20:39:01 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.11 2014/01/29 10:20:11 martin Exp $
+# $NetBSD: Makefile.inc,v 1.12 2014/02/20 20:39:01 martin Exp $
#
# Note: The atomic operations here in these assembly files are atomic
@@ -14,7 +14,8 @@
.if ${MACHINE_ARCH} == "m68k"
SRCS+= atomic_add.S atomic_and.S atomic_cas.S atomic_dec.S \
- atomic_inc.S atomic_or.S atomic_swap.S membar_ops_nop.c
+ atomic_inc.S atomic_or.S atomic_swap.S membar_ops_nop.c \
+ atomic_sub.S atomic_xor.S atomic_nand.S
.else
diff -r 867e625edca8 -r 88331a776e00 common/lib/libc/arch/m68k/atomic/atomic_add.S
--- a/common/lib/libc/arch/m68k/atomic/atomic_add.S Thu Feb 20 19:47:19 2014 +0000
+++ b/common/lib/libc/arch/m68k/atomic/atomic_add.S Thu Feb 20 20:39:01 2014 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: atomic_add.S,v 1.7 2014/02/18 16:19:28 martin Exp $ */
+/* $NetBSD: atomic_add.S,v 1.8 2014/02/20 20:39:01 martin Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -68,6 +68,17 @@
STRONG_ALIAS(_atomic_add_ptr_nv,_atomic_add_32_nv)
STRONG_ALIAS(__sync_add_and_fetch_4,_atomic_add_32_nv)
+ENTRY(__sync_fetch_and_add_4)
+ movl 4(%sp), %a0
+1: movl (%a0), %d0
+ movl %d0, %d1
+ addl 8(%sp), %d1
+ casl %d0, %d1, (%a0)
+ bne 1b
+ movl %d0, %a0 /* pointers return also in %a0 */
+ rts
+END(__sync_fetch_and_add_4)
+
ENTRY(_atomic_add_16_nv)
movl 4(%sp), %a0
1: movw (%a0), %d0
@@ -80,6 +91,16 @@
STRONG_ALIAS(__sync_add_and_fetch_2,_atomic_add_16_nv)
+ENTRY(__sync_fetch_and_add_2)
+ movl 4(%sp), %a0
+1: movw (%a0), %d0
+ movw %d0, %d1
+ addw 8(%sp), %d1
+ casw %d0, %d1, (%a0)
+ bne 1b
+ rts
+END(__sync_fetch_and_add_2)
+
ENTRY(_atomic_add_8_nv)
movl 4(%sp), %a0
1: movb (%a0), %d0
@@ -91,3 +112,13 @@
END(_atomic_add_8_nv)
STRONG_ALIAS(__sync_add_and_fetch_1,_atomic_add_8_nv)
+
+ENTRY(__sync_fetch_and_add_1)
+ movl 4(%sp), %a0
+1: movb (%a0), %d0
+ movb %d0, %d1
+ addb 8(%sp), %d1
+ casb %d0, %d1, (%a0)
+ bne 1b
+ rts
+END(__sync_fetch_and_add_1)
diff -r 867e625edca8 -r 88331a776e00 common/lib/libc/arch/m68k/atomic/atomic_and.S
--- a/common/lib/libc/arch/m68k/atomic/atomic_and.S Thu Feb 20 19:47:19 2014 +0000
+++ b/common/lib/libc/arch/m68k/atomic/atomic_and.S Thu Feb 20 20:39:01 2014 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: atomic_and.S,v 1.8 2013/07/16 23:24:18 matt Exp $ */
+/* $NetBSD: atomic_and.S,v 1.9 2014/02/20 20:39:01 martin Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -54,6 +54,7 @@
andl 8(%sp), %d0
casl %d1, %d0, (%a0)
bne 1b
+ movl %d0, %a0
rts
END(_atomic_and_32_nv)
ATOMIC_OP_ALIAS(atomic_and_32_nv,_atomic_and_32_nv)
@@ -63,3 +64,63 @@
STRONG_ALIAS(_atomic_and_ulong_nv,_atomic_and_32_nv)
ATOMIC_OP_ALIAS(atomic_and_ptr_nv,_atomic_and_32_nv)
STRONG_ALIAS(_atomic_and_ptr_nv,_atomic_and_32_nv)
+STRONG_ALIAS(__sync_and_and_fetch_4,_atomic_and_32_nv)
+
+ENTRY(__sync_fetch_and_and_4)
+ movl 4(%sp), %a0
+1: movl (%a0), %d0
+ movl %d0, %d1
+ andl 8(%sp), %d1
+ casl %d0, %d1, (%a0)
+ bne 1b
+ movl %d0, %a0
+ rts
+END(__sync_fetch_and_and_4)
+
+
+ENTRY(_atomic_and_16_nv)
+ movl 4(%sp), %a0
+1: movw (%a0), %d0
+ movw %d0, %d1
+ andw 8(%sp), %d0
+ casw %d1, %d0, (%a0)
+ bne 1b
+ rts
+END(_atomic_and_16_nv)
+
+STRONG_ALIAS(__sync_and_and_fetch_2,_atomic_and_16_nv)
+
+ENTRY(__sync_fetch_and_and_2)
+ movl 4(%sp), %a0
+1: movw (%a0), %d0
+ movw %d0, %d1
+ andw 8(%sp), %d1
+ casw %d0, %d1, (%a0)
+ bne 1b
+ rts
+END(__sync_fetch_and_and_2)
+
+
+ENTRY(_atomic_and_8_nv)
+ movl 4(%sp), %a0
+1: movb (%a0), %d0
+ movb %d0, %d1
+ andb 8(%sp), %d0
+ casb %d1, %d0, (%a0)
+ bne 1b
+ rts
+END(_atomic_and_8_nv)
+
+STRONG_ALIAS(__sync_and_and_fetch_1,_atomic_and_8_nv)
+
+ENTRY(__sync_fetch_and_and_1)
+ movl 4(%sp), %a0
+1: movb (%a0), %d0
+ movb %d0, %d1
+ andb 8(%sp), %d1
+ casb %d0, %d1, (%a0)
+ bne 1b
+ rts
+END(__sync_fetch_and_and_1)
+
+
diff -r 867e625edca8 -r 88331a776e00 common/lib/libc/arch/m68k/atomic/atomic_nand.S
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/common/lib/libc/arch/m68k/atomic/atomic_nand.S Thu Feb 20 20:39:01 2014 +0000
@@ -0,0 +1,123 @@
+/* $NetBSD: atomic_nand.S,v 1.1 2014/02/20 20:39:01 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_asm.h"
+
+ .text
+
+ENTRY(_atomic_nand_32_nv)
+ movl 4(%sp), %a0
+1: movl (%a0), %d0
+ movl %d0, %d1
+ andl 8(%sp), %d0
+ notl %d0
+ casl %d1, %d0, (%a0)
+ bne 1b
+ movl %d0, %a0
+ rts
+END(_atomic_nand_32_nv)
+ATOMIC_OP_ALIAS(atomic_nand_32_nv,_atomic_nand_32_nv)
+ATOMIC_OP_ALIAS(atomic_nand_uint_nv,_atomic_nand_32_nv)
+STRONG_ALIAS(_atomic_nand_uint_nv,_atomic_nand_32_nv)
+ATOMIC_OP_ALIAS(atomic_nand_ulong_nv,_atomic_nand_32_nv)
+STRONG_ALIAS(_atomic_nand_ulong_nv,_atomic_nand_32_nv)
+ATOMIC_OP_ALIAS(atomic_nand_ptr_nv,_atomic_nand_32_nv)
+STRONG_ALIAS(_atomic_nand_ptr_nv,_atomic_nand_32_nv)
+ATOMIC_OP_ALIAS(atomic_nand_32,_atomic_nand_32_nv)
+ATOMIC_OP_ALIAS(atomic_nand_uint,_atomic_nand_32_nv)
+STRONG_ALIAS(_atomic_nand_uint,_atomic_nand_32_nv)
+ATOMIC_OP_ALIAS(atomic_nand_ulong,_atomic_nand_32_nv)
+STRONG_ALIAS(_atomic_nand_ulong,_atomic_nand_32_nv)
+ATOMIC_OP_ALIAS(atomic_nand_ptr,_atomic_nand_32_nv)
+STRONG_ALIAS(_atomic_nand_ptr,_atomic_nand_32_nv)
+STRONG_ALIAS(__sync_nand_and_fetch_4,_atomic_nand_32_nv)
+
+ENTRY(__sync_fetch_and_nand_4)
+ movl 4(%sp), %a0
+1: movl (%a0), %d0
+ movl %d0, %d1
+ andl 8(%sp), %d1
+ notl %d1
+ casl %d0, %d1, (%a0)
+ bne 1b
+ movl %d0, %a0
+ rts
+END(__sync_fetch_and_nand_4)
+
+
+ENTRY(_atomic_nand_16_nv)
+ movl 4(%sp), %a0
+1: movw (%a0), %d0
+ movw %d0, %d1
+ andw 8(%sp), %d0
+ notw %d0
+ casw %d1, %d0, (%a0)
+ bne 1b
+ rts
+END(_atomic_nand_16_nv)
+
+STRONG_ALIAS(__sync_nand_and_fetch_2,_atomic_nand_16_nv)
+
+ENTRY(__sync_fetch_and_nand_2)
+ movl 4(%sp), %a0
+1: movw (%a0), %d0
+ movw %d0, %d1
+ andw 8(%sp), %d1
+ notw %d1
+ casw %d0, %d1, (%a0)
+ bne 1b
+ rts
+END(__sync_fetch_and_nand_2)
+
+
+ENTRY(_atomic_nand_8_nv)
+ movl 4(%sp), %a0
+1: movb (%a0), %d0
+ movb %d0, %d1
+ andb 8(%sp), %d0
+ notb %d0
+ casb %d1, %d0, (%a0)
+ bne 1b
+ rts
+END(_atomic_nand_8_nv)
+
+STRONG_ALIAS(__sync_nand_and_fetch_1,_atomic_nand_8_nv)
+
+ENTRY(__sync_fetch_and_nand_1)
+ movl 4(%sp), %a0
+1: movb (%a0), %d0
+ movb %d0, %d1
+ andb 8(%sp), %d1
+ notb %d1
+ casb %d0, %d1, (%a0)
+ bne 1b
+ rts
+END(__sync_fetch_and_nand_1)
diff -r 867e625edca8 -r 88331a776e00 common/lib/libc/arch/m68k/atomic/atomic_or.S
--- a/common/lib/libc/arch/m68k/atomic/atomic_or.S Thu Feb 20 19:47:19 2014 +0000
+++ b/common/lib/libc/arch/m68k/atomic/atomic_or.S Thu Feb 20 20:39:01 2014 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: atomic_or.S,v 1.8 2013/07/16 23:24:18 matt Exp $ */
+/* $NetBSD: atomic_or.S,v 1.9 2014/02/20 20:39:01 martin Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -39,6 +39,7 @@
orl %d0, (%a0)
rts
END(_atomic_or_32)
+
ATOMIC_OP_ALIAS(atomic_or_32,_atomic_or_32)
Home |
Main Index |
Thread Index |
Old Index