Module Name: src
Committed By: martin
Date: Thu Feb 20 20:39:01 UTC 2014
Modified Files:
src/common/lib/libc/arch/m68k/atomic: Makefile.inc atomic_add.S
atomic_and.S atomic_or.S
Added Files:
src/common/lib/libc/arch/m68k/atomic: atomic_nand.S atomic_sub.S
atomic_xor.S
Log Message:
Add missing __sync_* ops
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/common/lib/libc/arch/m68k/atomic/Makefile.inc
cvs rdiff -u -r1.7 -r1.8 src/common/lib/libc/arch/m68k/atomic/atomic_add.S
cvs rdiff -u -r1.8 -r1.9 src/common/lib/libc/arch/m68k/atomic/atomic_and.S \
src/common/lib/libc/arch/m68k/atomic/atomic_or.S
cvs rdiff -u -r0 -r1.1 src/common/lib/libc/arch/m68k/atomic/atomic_nand.S \
src/common/lib/libc/arch/m68k/atomic/atomic_sub.S \
src/common/lib/libc/arch/m68k/atomic/atomic_xor.S
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/arch/m68k/atomic/Makefile.inc
diff -u src/common/lib/libc/arch/m68k/atomic/Makefile.inc:1.11 src/common/lib/libc/arch/m68k/atomic/Makefile.inc:1.12
--- src/common/lib/libc/arch/m68k/atomic/Makefile.inc:1.11 Wed Jan 29 10:20:11 2014
+++ src/common/lib/libc/arch/m68k/atomic/Makefile.inc Thu Feb 20 20:39:01 2014
@@ -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
Index: src/common/lib/libc/arch/m68k/atomic/atomic_add.S
diff -u src/common/lib/libc/arch/m68k/atomic/atomic_add.S:1.7 src/common/lib/libc/arch/m68k/atomic/atomic_add.S:1.8
--- src/common/lib/libc/arch/m68k/atomic/atomic_add.S:1.7 Tue Feb 18 16:19:28 2014
+++ src/common/lib/libc/arch/m68k/atomic/atomic_add.S Thu Feb 20 20:39:01 2014
@@ -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 @@ ATOMIC_OP_ALIAS(atomic_add_ptr_nv,_atomi
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 @@ END(_atomic_add_16_nv)
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 @@ ENTRY(_atomic_add_8_nv)
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)
Index: src/common/lib/libc/arch/m68k/atomic/atomic_and.S
diff -u src/common/lib/libc/arch/m68k/atomic/atomic_and.S:1.8 src/common/lib/libc/arch/m68k/atomic/atomic_and.S:1.9
--- src/common/lib/libc/arch/m68k/atomic/atomic_and.S:1.8 Tue Jul 16 23:24:18 2013
+++ src/common/lib/libc/arch/m68k/atomic/atomic_and.S Thu Feb 20 20:39:01 2014
@@ -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 @@ ENTRY(_atomic_and_32_nv)
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 @@ ATOMIC_OP_ALIAS(atomic_and_ulong_nv,_ato
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)
+
+
Index: src/common/lib/libc/arch/m68k/atomic/atomic_or.S
diff -u src/common/lib/libc/arch/m68k/atomic/atomic_or.S:1.8 src/common/lib/libc/arch/m68k/atomic/atomic_or.S:1.9
--- src/common/lib/libc/arch/m68k/atomic/atomic_or.S:1.8 Tue Jul 16 23:24:18 2013
+++ src/common/lib/libc/arch/m68k/atomic/atomic_or.S Thu Feb 20 20:39:01 2014
@@ -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 @@ ENTRY(_atomic_or_32)
orl %d0, (%a0)
rts
END(_atomic_or_32)
+
ATOMIC_OP_ALIAS(atomic_or_32,_atomic_or_32)
ATOMIC_OP_ALIAS(atomic_or_uint,_atomic_or_32)
STRONG_ALIAS(_atomic_or_uint,_atomic_or_32)
@@ -54,7 +55,10 @@ ENTRY(_atomic_or_32_nv)
orl 8(%sp), %d0
casl %d1, %d0, (%a0)
bne 1b
+ movl %d0, %a0
rts
+END(_atomic_or_32_nv)
+
ATOMIC_OP_ALIAS(atomic_or_32_nv,_atomic_or_32_nv)
ATOMIC_OP_ALIAS(atomic_or_uint_nv,_atomic_or_32_nv)
STRONG_ALIAS(_atomic_or_uint_nv,_atomic_or_32_nv)
@@ -62,3 +66,60 @@ ATOMIC_OP_ALIAS(atomic_or_ulong_nv,_atom
STRONG_ALIAS(_atomic_or_ulong_nv,_atomic_or_32_nv)
ATOMIC_OP_ALIAS(atomic_or_ptr_nv,_atomic_or_32_nv)
STRONG_ALIAS(_atomic_or_ptr_nv,_atomic_or_32_nv)
+STRONG_ALIAS(__sync_or_and_fetch_4, _atomic_or_32_nv)
+
+
+ENTRY(__sync_fetch_and_or_4)
+ movl 4(%sp), %a0
+1: movl (%a0), %d0
+ movl %d0, %d1
+ orl 8(%sp), %d1
+ casl %d0, %d1, (%a0)
+ bne 1b
+ movl %d0, %a0
+ rts
+END(__sync_fetch_and_or_4)
+
+
+ENTRY(_atomic_or_16_nv)
+ movl 4(%sp), %a0
+1: movw (%a0), %d0
+ movw %d0, %d1
+ orw 8(%sp), %d0
+ casw %d1, %d0, (%a0)
+ bne 1b
+ rts
+END(_atomic_or_16_nv)
+STRONG_ALIAS(__sync_or_and_fetch_2, _atomic_or_16_nv)
+
+ENTRY(__sync_fetch_and_or_2)
+ movl 4(%sp), %a0
+1: movw (%a0), %d0
+ movw %d0, %d1
+ orw 8(%sp), %d1
+ casw %d0, %d1, (%a0)
+ bne 1b
+ rts
+END(__sync_fetch_and_or_2)
+
+
+ENTRY(_atomic_or_8_nv)
+ movl 4(%sp), %a0
+1: movb (%a0), %d0
+ movb %d0, %d1
+ orb 8(%sp), %d0
+ casb %d1, %d0, (%a0)
+ bne 1b
+ rts
+END(_atomic_or_8_nv)
+STRONG_ALIAS(__sync_or_and_fetch_1, _atomic_or_8_nv)
+
+ENTRY(__sync_fetch_and_or_1)
+ movl 4(%sp), %a0
+1: movb (%a0), %d0
+ movb %d0, %d1
+ orb 8(%sp), %d1
+ casb %d0, %d1, (%a0)
+ bne 1b
+ rts
+END(__sync_fetch_and_or_1)
Added files:
Index: src/common/lib/libc/arch/m68k/atomic/atomic_nand.S
diff -u /dev/null src/common/lib/libc/arch/m68k/atomic/atomic_nand.S:1.1
--- /dev/null Thu Feb 20 20:39:01 2014
+++ src/common/lib/libc/arch/m68k/atomic/atomic_nand.S Thu Feb 20 20:39:01 2014
@@ -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)
Index: src/common/lib/libc/arch/m68k/atomic/atomic_sub.S
diff -u /dev/null src/common/lib/libc/arch/m68k/atomic/atomic_sub.S:1.1
--- /dev/null Thu Feb 20 20:39:01 2014
+++ src/common/lib/libc/arch/m68k/atomic/atomic_sub.S Thu Feb 20 20:39:01 2014
@@ -0,0 +1,124 @@
+/* $NetBSD: atomic_sub.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
+ .align 2
+
+ENTRY(_atomic_sub_32)
+ movl 4(%sp), %a0
+ movl 8(%sp), %d0
+ subl %d0, (%a0)
+ rts
+END(_atomic_sub_32)
+ATOMIC_OP_ALIAS(atomic_sub_32,_atomic_sub_32)
+ATOMIC_OP_ALIAS(atomic_sub_int,_atomic_sub_32)
+STRONG_ALIAS(_atomic_sub_int,_atomic_sub_32)
+ATOMIC_OP_ALIAS(atomic_sub_long,_atomic_sub_32)
+STRONG_ALIAS(_atomic_sub_long,_atomic_sub_32)
+ATOMIC_OP_ALIAS(atomic_sub_ptr,_atomic_sub_32)
+STRONG_ALIAS(_atomic_sub_ptr,_atomic_sub_32)
+
+ENTRY(_atomic_sub_32_nv)
+ movl 4(%sp), %a0
+1: movl (%a0), %d0
+ movl %d0, %d1
+ subl 8(%sp), %d0
+ casl %d1, %d0, (%a0)
+ bne 1b
+ movl %d0, %a0 /* pointers return also in %a0 */
+ rts
+END(_atomic_sub_32_nv)
+
+ATOMIC_OP_ALIAS(atomic_sub_32_nv,_atomic_sub_32_nv)
+ATOMIC_OP_ALIAS(atomic_sub_int_nv,_atomic_sub_32_nv)
+STRONG_ALIAS(_atomic_sub_int_nv,_atomic_sub_32_nv)
+ATOMIC_OP_ALIAS(atomic_sub_long_nv,_atomic_sub_32_nv)
+STRONG_ALIAS(_atomic_sub_long_nv,_atomic_sub_32_nv)
+ATOMIC_OP_ALIAS(atomic_sub_ptr_nv,_atomic_sub_32_nv)
+STRONG_ALIAS(_atomic_sub_ptr_nv,_atomic_sub_32_nv)
+STRONG_ALIAS(__sync_sub_and_fetch_4,_atomic_sub_32_nv)
+
+ENTRY(__sync_fetch_and_sub_4)
+ movl 4(%sp), %a0
+1: movl (%a0), %d0
+ movl %d0, %d1
+ subl 8(%sp), %d1
+ casl %d0, %d1, (%a0)
+ bne 1b
+ movl %d0, %a0 /* pointers return also in %a0 */
+ rts
+END(__sync_fetch_and_sub_4)
+
+ENTRY(_atomic_sub_16_nv)
+ movl 4(%sp), %a0
+1: movw (%a0), %d0
+ movw %d0, %d1
+ subw 8(%sp), %d0
+ casw %d1, %d0, (%a0)
+ bne 1b
+ rts
+END(_atomic_sub_16_nv)
+
+STRONG_ALIAS(__sync_sub_and_fetch_2,_atomic_sub_16_nv)
+
+ENTRY(__sync_fetch_and_sub_2)
+ movl 4(%sp), %a0
+1: movw (%a0), %d0
+ movw %d0, %d1
+ subw 8(%sp), %d1
+ casw %d0, %d1, (%a0)
+ bne 1b
+ rts
+END(__sync_fetch_and_sub_2)
+
+ENTRY(_atomic_sub_8_nv)
+ movl 4(%sp), %a0
+1: movb (%a0), %d0
+ movb %d0, %d1
+ subb 8(%sp), %d0
+ casb %d1, %d0, (%a0)
+ bne 1b
+ rts
+END(_atomic_sub_8_nv)
+
+STRONG_ALIAS(__sync_sub_and_fetch_1,_atomic_sub_8_nv)
+
+ENTRY(__sync_fetch_and_sub_1)
+ movl 4(%sp), %a0
+1: movb (%a0), %d0
+ movb %d0, %d1
+ subb 8(%sp), %d1
+ casb %d0, %d1, (%a0)
+ bne 1b
+ rts
+END(__sync_fetch_and_sub_1)
Index: src/common/lib/libc/arch/m68k/atomic/atomic_xor.S
diff -u /dev/null src/common/lib/libc/arch/m68k/atomic/atomic_xor.S:1.1
--- /dev/null Thu Feb 20 20:39:01 2014
+++ src/common/lib/libc/arch/m68k/atomic/atomic_xor.S Thu Feb 20 20:39:01 2014
@@ -0,0 +1,131 @@
+/* $NetBSD: atomic_xor.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_xor_32)
+ movl 4(%sp), %a0
+ movl 8(%sp), %d0
+ eorl %d0, (%a0)
+ rts
+END(_atomic_xor_32)
+
+ATOMIC_OP_ALIAS(atomic_xor_32,_atomic_xor_32)
+ATOMIC_OP_ALIAS(atomic_xor_uint,_atomic_xor_32)
+STRONG_ALIAS(_atomic_xor_uint,_atomic_xor_32)
+ATOMIC_OP_ALIAS(atomic_xor_ulong,_atomic_xor_32)
+STRONG_ALIAS(_atomic_xor_ulong,_atomic_xor_32)
+ATOMIC_OP_ALIAS(atomic_xor_ptr,_atomic_xor_32)
+STRONG_ALIAS(_atomic_xor_ptr,_atomic_xor_32)
+
+ENTRY(_atomic_xor_32_nv)
+ movl 4(%sp), %a0
+1: movl (%a0), %d0
+ movl %d0, %d1
+ movl 8(%sp), %d2
+ eorl %d2, %d0
+ casl %d1, %d0, (%a0)
+ bne 1b
+ movl %d0, %a0
+ rts
+END(_atomic_xor_32_nv)
+
+ATOMIC_OP_ALIAS(atomic_xor_32_nv,_atomic_xor_32_nv)
+ATOMIC_OP_ALIAS(atomic_xor_uint_nv,_atomic_xor_32_nv)
+STRONG_ALIAS(_atomic_xor_uint_nv,_atomic_xor_32_nv)
+ATOMIC_OP_ALIAS(atomic_xor_ulong_nv,_atomic_xor_32_nv)
+STRONG_ALIAS(_atomic_xor_ulong_nv,_atomic_xor_32_nv)
+ATOMIC_OP_ALIAS(atomic_xor_ptr_nv,_atomic_xor_32_nv)
+STRONG_ALIAS(_atomic_xor_ptr_nv,_atomic_xor_32_nv)
+STRONG_ALIAS(__sync_xor_and_fetch_4, _atomic_xor_32_nv)
+
+
+ENTRY(__sync_fetch_and_xor_4)
+ movl 4(%sp), %a0
+1: movl (%a0), %d0
+ movl %d0, %d1
+ movl 8(%sp), %d2
+ eorl %d2, %d1
+ casl %d0, %d1, (%a0)
+ bne 1b
+ movl %d0, %a0
+ rts
+END(__sync_fetch_and_xor_4)
+
+
+ENTRY(_atomic_xor_16_nv)
+ movl 4(%sp), %a0
+1: movw (%a0), %d0
+ movw %d0, %d1
+ movw 8(%sp), %d2
+ eorw %d2, %d0
+ casw %d1, %d0, (%a0)
+ bne 1b
+ rts
+END(_atomic_xor_16_nv)
+STRONG_ALIAS(__sync_xor_and_fetch_2, _atomic_xor_16_nv)
+
+ENTRY(__sync_fetch_and_xor_2)
+ movl 4(%sp), %a0
+1: movw (%a0), %d0
+ movw %d0, %d1
+ movw 8(%sp), %d2
+ eorw %d2, %d1
+ casw %d0, %d1, (%a0)
+ bne 1b
+ rts
+END(__sync_fetch_and_xor_2)
+
+
+ENTRY(_atomic_xor_8_nv)
+ movl 4(%sp), %a0
+1: movb (%a0), %d0
+ movb %d0, %d1
+ movb 8(%sp), %d2
+ eorb %d2, %d0
+ casb %d1, %d0, (%a0)
+ bne 1b
+ rts
+END(_atomic_xor_8_nv)
+STRONG_ALIAS(__sync_xor_and_fetch_1, _atomic_xor_8_nv)
+
+ENTRY(__sync_fetch_and_xor_1)
+ movl 4(%sp), %a0
+1: movb (%a0), %d0
+ movb %d0, %d1
+ movb 8(%sp), %d2
+ eorb %d2, %d1
+ casb %d0, %d1, (%a0)
+ bne 1b
+ rts
+END(__sync_fetch_and_xor_1)
