Module Name: src
Committed By: matt
Date: Sat Sep 5 03:07:07 UTC 2009
Added Files:
src/common/lib/libc/arch/mips/atomic [matt-nb5-mips64]: atomic_add.S
atomic_and.S atomic_cas.S atomic_dec.S atomic_inc.S atomic_or.S
atomic_swap.S
Log Message:
Add native ll/sc or lld/scd versions of the atomic ops.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1.2.1 src/common/lib/libc/arch/mips/atomic/atomic_add.S \
src/common/lib/libc/arch/mips/atomic/atomic_and.S \
src/common/lib/libc/arch/mips/atomic/atomic_cas.S \
src/common/lib/libc/arch/mips/atomic/atomic_dec.S \
src/common/lib/libc/arch/mips/atomic/atomic_inc.S \
src/common/lib/libc/arch/mips/atomic/atomic_or.S \
src/common/lib/libc/arch/mips/atomic/atomic_swap.S
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/arch/mips/atomic/atomic_add.S
diff -u /dev/null src/common/lib/libc/arch/mips/atomic/atomic_add.S:1.1.2.1
--- /dev/null Sat Sep 5 03:07:07 2009
+++ src/common/lib/libc/arch/mips/atomic/atomic_add.S Sat Sep 5 03:07:07 2009
@@ -0,0 +1,111 @@
+/* $NetBSD: atomic_add.S,v 1.1.2.1 2009/09/05 03:07:07 matt Exp $ */
+
+/*-
+ * Copyright (c) 2008 The NetBSD Foundation, Inc.
+ * 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 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/cdefs.h>
+#include <machine/asm.h>
+#include "atomic_op_asm.h"
+
+RCSID("$NetBSD: atomic_add.S,v 1.1.2.1 2009/09/05 03:07:07 matt Exp $")
+
+ .text
+ .set noat
+ .set noreorder
+ .set nomacro
+
+LEAF(_atomic_add_32)
+1: INT_LL t0, 0(a0)
+ nop
+ INT_ADDU t0, a1
+ INT_SC t0, 0(a0)
+ beq t0, zero, 1b
+ nop
+ j ra
+ nop
+END(_atomic_add_32)
+ATOMIC_OP_ALIAS(atomic_add_32, _atomic_add_32)
+
+LEAF(_atomic_add_32_nv)
+1: INT_LL v0, 0(a0)
+ nop
+ INT_ADDU v0, a1
+ move t0, v0
+ INT_SC t0, 0(a0)
+ beq t0, zero, 1b
+ nop
+ j ra
+ nop
+END(_atomic_add_32_nv)
+ATOMIC_OP_ALIAS(atomic_add_32_nv, _atomic_add_32_nv)
+
+#if !defined(__mips_o32)
+LEAF(_atomic_add_64)
+1: REG_LL t0, 0(a0)
+ nop
+ REG_ADDU t0, a1
+ REG_SC t0, 0(a0)
+ beq t0, zero, 1b
+ nop
+ j ra
+ nop
+END(_atomic_add_64)
+ATOMIC_OP_ALIAS(atomic_add_64, _atomic_add_64)
+
+LEAF(_atomic_add_64_nv)
+1: REG_LL v0, 0(a0)
+ nop
+ REG_ADDU v0, a1
+ move t0, v0
+ REG_SC t0, 0(a0)
+ beq t0, zero, 1b
+ nop
+ j ra
+ nop
+END(_atomic_add_64_nv)
+ATOMIC_OP_ALIAS(atomic_add_64_nv, _atomic_add_64_nv)
+#endif
+
+#ifdef _LP64
+STRONG_ALIAS(_atomic_add_long, _atomic_add_64)
+STRONG_ALIAS(_atomic_add_long_nv, _atomic_add_64_nv)
+STRONG_ALIAS(_atomic_add_ptr, _atomic_add_64)
+STRONG_ALIAS(_atomic_add_ptr_nv, _atomic_add_64_nv)
+#else
+STRONG_ALIAS(_atomic_add_long, _atomic_add_32)
+STRONG_ALIAS(_atomic_add_long_nv, _atomic_add_32_nv)
+STRONG_ALIAS(_atomic_add_ptr, _atomic_add_32)
+STRONG_ALIAS(_atomic_add_ptr_nv, _atomic_add_32_nv)
+#endif
+STRONG_ALIAS(_atomic_add_int, _atomic_add_32)
+STRONG_ALIAS(_atomic_add_int_nv, _atomic_add_32_nv)
+
+ATOMIC_OP_ALIAS(atomic_add_int, _atomic_add_int)
+ATOMIC_OP_ALIAS(atomic_add_int_nv, _atomic_add_int_nv)
+ATOMIC_OP_ALIAS(atomic_add_ptr, _atomic_add_ptr)
+ATOMIC_OP_ALIAS(atomic_add_ptr_nv, _atomic_add_ptr_nv)
+ATOMIC_OP_ALIAS(atomic_add_long, _atomic_add_long)
+ATOMIC_OP_ALIAS(atomic_add_long_nv, _atomic_add_long_nv)
Index: src/common/lib/libc/arch/mips/atomic/atomic_and.S
diff -u /dev/null src/common/lib/libc/arch/mips/atomic/atomic_and.S:1.1.2.1
--- /dev/null Sat Sep 5 03:07:07 2009
+++ src/common/lib/libc/arch/mips/atomic/atomic_and.S Sat Sep 5 03:07:07 2009
@@ -0,0 +1,105 @@
+/* $NetBSD: atomic_and.S,v 1.1.2.1 2009/09/05 03:07:07 matt Exp $ */
+
+/*-
+ * Copyright (c) 2008 The NetBSD Foundation, Inc.
+ * 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 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/cdefs.h>
+#include <machine/asm.h>
+#include "atomic_op_asm.h"
+
+RCSID("$NetBSD: atomic_and.S,v 1.1.2.1 2009/09/05 03:07:07 matt Exp $")
+
+ .text
+ .set noat
+ .set noreorder
+ .set nomacro
+
+LEAF(_atomic_and_32)
+1: INT_LL t0, 0(a0)
+ nop
+ and t0, a1
+ INT_SC t0, 0(a0)
+ beq t0, zero, 1b
+ nop
+ j ra
+ nop
+END(_atomic_and_32)
+ATOMIC_OP_ALIAS(atomic_and_32, _atomic_and_32)
+
+LEAF(_atomic_and_32_nv)
+1: INT_LL v0, 0(a0)
+ nop
+ and v0, a1
+ move t0, v0
+ INT_SC t0, 0(a0)
+ beq t0, zero, 1b
+ nop
+ j ra
+ nop
+END(_atomic_and_32_nv)
+ATOMIC_OP_ALIAS(atomic_and_32_nv, _atomic_and_32_nv)
+
+#if !defined(__mips_o32)
+LEAF(_atomic_and_64)
+1: REG_LL t0, 0(a0)
+ nop
+ and t0, a1
+ REG_SC t0, 0(a0)
+ beq t0, zero, 1b
+ nop
+ j ra
+ nop
+END(_atomic_and_64)
+ATOMIC_OP_ALIAS(atomic_and_64, _atomic_and_64)
+
+LEAF(_atomic_and_64_nv)
+1: REG_LL v0, 0(a0)
+ nop
+ and v0, a1
+ move t0, v0
+ REG_SC t0, 0(a0)
+ beq t0, zero, 1b
+ nop
+ j ra
+ nop
+END(_atomic_and_64_nv)
+ATOMIC_OP_ALIAS(atomic_and_64_nv, _atomic_and_64_nv)
+#endif
+
+#ifdef _LP64
+STRONG_ALIAS(_atomic_and_ulong, _atomic_and_64)
+STRONG_ALIAS(_atomic_and_ulong_nv, _atomic_and_64_nv)
+#else
+STRONG_ALIAS(_atomic_and_ulong, _atomic_and_32)
+STRONG_ALIAS(_atomic_and_ulong_nv, _atomic_and_32_nv)
+#endif
+STRONG_ALIAS(_atomic_and_uint, _atomic_and_32)
+STRONG_ALIAS(_atomic_and_uint_nv, _atomic_and_32_nv)
+
+ATOMIC_OP_ALIAS(atomic_and_uint, _atomic_and_uint)
+ATOMIC_OP_ALIAS(atomic_and_uint_nv, _atomic_and_uint_nv)
+ATOMIC_OP_ALIAS(atomic_and_ulong, _atomic_and_ulong)
+ATOMIC_OP_ALIAS(atomic_and_ulong_nv, _atomic_and_ulong_nv)
Index: src/common/lib/libc/arch/mips/atomic/atomic_cas.S
diff -u /dev/null src/common/lib/libc/arch/mips/atomic/atomic_cas.S:1.1.2.1
--- /dev/null Sat Sep 5 03:07:07 2009
+++ src/common/lib/libc/arch/mips/atomic/atomic_cas.S Sat Sep 5 03:07:07 2009
@@ -0,0 +1,93 @@
+/* $NetBSD: atomic_cas.S,v 1.1.2.1 2009/09/05 03:07:07 matt Exp $ */
+
+/*-
+ * Copyright (c) 2008 The NetBSD Foundation, Inc.
+ * 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 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/cdefs.h>
+#include <machine/asm.h>
+#include "atomic_op_asm.h"
+
+RCSID("$NetBSD: atomic_cas.S,v 1.1.2.1 2009/09/05 03:07:07 matt Exp $")
+
+ .text
+ .set noat
+ .set noreorder
+ .set nomacro
+
+LEAF(_atomic_cas_32)
+1: INT_LL v0, 0(a0)
+ nop
+ bne v0, a1, 2f
+ nop
+ move t0, a2
+ INT_SC t0, 0(a0)
+ beq t0, zero, 1b
+ nop
+ move v0, a1
+2:
+ j ra
+ nop
+END(_atomic_cas_32)
+ATOMIC_OP_ALIAS(atomic_cas_32, _atomic_cas_32)
+
+#if !defined(__mips_o32)
+LEAF(_atomic_cas_64)
+1: REG_LL v0, 0(a0)
+ nop
+ bne v0, a1, 2f
+ nop
+ move t0, a2
+ REG_SC t0, 0(a0)
+ beq t0, zero, 1b
+ nop
+ move v0, a1
+2:
+ j ra
+ nop
+END(_atomic_cas_64)
+ATOMIC_OP_ALIAS(atomic_cas_64, _atomic_cas_64)
+#endif
+
+#ifdef _LP64
+STRONG_ALIAS(_atomic_cas_ptr, _atomic_cas_64)
+STRONG_ALIAS(_atomic_cas_ptr_ni, _atomic_cas_64)
+STRONG_ALIAS(_atomic_cas_ulong, _atomic_cas_64)
+STRONG_ALIAS(_atomic_cas_ulong_ni, _atomic_cas_64)
+#else
+STRONG_ALIAS(_atomic_cas_ptr, _atomic_cas_32)
+STRONG_ALIAS(_atomic_cas_ptr_ni, _atomic_cas_32)
+STRONG_ALIAS(_atomic_cas_ulong, _atomic_cas_32)
+STRONG_ALIAS(_atomic_cas_ulong_ni, _atomic_cas_32)
+#endif
+STRONG_ALIAS(_atomic_cas_uint, _atomic_cas_32)
+STRONG_ALIAS(_atomic_cas_uint_ni, _atomic_cas_32)
+
+ATOMIC_OP_ALIAS(atomic_cas_ptr, _atomic_cas_ptr)
+ATOMIC_OP_ALIAS(atomic_cas_ptr_ni, _atomic_cas_ptr_ni)
+ATOMIC_OP_ALIAS(atomic_cas_uint, _atomic_cas_uint)
+ATOMIC_OP_ALIAS(atomic_cas_uint_ni, _atomic_cas_uint_ni)
+ATOMIC_OP_ALIAS(atomic_cas_ulong, _atomic_cas_ulong)
+ATOMIC_OP_ALIAS(atomic_cas_ulong_ni, _atomic_cas_ulong_ni)
Index: src/common/lib/libc/arch/mips/atomic/atomic_dec.S
diff -u /dev/null src/common/lib/libc/arch/mips/atomic/atomic_dec.S:1.1.2.1
--- /dev/null Sat Sep 5 03:07:07 2009
+++ src/common/lib/libc/arch/mips/atomic/atomic_dec.S Sat Sep 5 03:07:07 2009
@@ -0,0 +1,111 @@
+/* $NetBSD: atomic_dec.S,v 1.1.2.1 2009/09/05 03:07:07 matt Exp $ */
+
+/*-
+ * Copyright (c) 2008 The NetBSD Foundation, Inc.
+ * 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 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/cdefs.h>
+#include <machine/asm.h>
+#include "atomic_op_asm.h"
+
+RCSID("$NetBSD: atomic_dec.S,v 1.1.2.1 2009/09/05 03:07:07 matt Exp $")
+
+ .text
+ .set noat
+ .set noreorder
+ .set nomacro
+
+LEAF(_atomic_dec_32)
+1: INT_LL t0, 0(a0)
+ nop
+ INT_ADDU t0, -1
+ INT_SC t0, 0(a0)
+ beq t0, zero, 1b
+ nop
+ j ra
+ nop
+END(_atomic_dec_32)
+ATOMIC_OP_ALIAS(atomic_dec_32, _atomic_dec_32)
+
+LEAF(_atomic_dec_32_nv)
+1: INT_LL v0, 0(a0)
+ nop
+ INT_ADDU v0, -1
+ move t0, v0
+ INT_SC t0, 0(a0)
+ beq t0, zero, 1b
+ nop
+ j ra
+ nop
+END(_atomic_dec_32_nv)
+ATOMIC_OP_ALIAS(atomic_dec_32_nv, _atomic_dec_32_nv)
+
+#if !defined(__mips_o32)
+LEAF(_atomic_dec_64)
+1: REG_LL t0, 0(a0)
+ nop
+ REG_ADDU t0, -1
+ REG_SC t0, 0(a0)
+ beq t0, zero, 1b
+ nop
+ j ra
+ nop
+END(_atomic_dec_64)
+ATOMIC_OP_ALIAS(atomic_dec_64, _atomic_dec_64)
+
+LEAF(_atomic_dec_64_nv)
+1: REG_LL v0, 0(a0)
+ nop
+ REG_ADDU v0, -1
+ move t0, v0
+ REG_SC t0, 0(a0)
+ beq t0, zero, 1b
+ nop
+ j ra
+ nop
+END(_atomic_dec_64_nv)
+ATOMIC_OP_ALIAS(atomic_dec_64_nv, _atomic_dec_64_nv)
+#endif
+
+#ifdef _LP64
+STRONG_ALIAS(_atomic_dec_ptr, _atomic_dec_64)
+STRONG_ALIAS(_atomic_dec_ptr_nv, _atomic_dec_64_nv)
+STRONG_ALIAS(_atomic_dec_ulong, _atomic_dec_64)
+STRONG_ALIAS(_atomic_dec_ulong_nv, _atomic_dec_64_nv)
+#else
+STRONG_ALIAS(_atomic_dec_ptr, _atomic_dec_32)
+STRONG_ALIAS(_atomic_dec_ptr_nv, _atomic_dec_32_nv)
+STRONG_ALIAS(_atomic_dec_ulong, _atomic_dec_32)
+STRONG_ALIAS(_atomic_dec_ulong_nv, _atomic_dec_32_nv)
+#endif
+STRONG_ALIAS(_atomic_dec_uint, _atomic_dec_32)
+STRONG_ALIAS(_atomic_dec_uint_nv, _atomic_dec_32_nv)
+
+ATOMIC_OP_ALIAS(atomic_dec_ptr, _atomic_dec_ptr)
+ATOMIC_OP_ALIAS(atomic_dec_ptr_nv, _atomic_dec_ptr_nv)
+ATOMIC_OP_ALIAS(atomic_dec_uint, _atomic_dec_uint)
+ATOMIC_OP_ALIAS(atomic_dec_uint_nv, _atomic_dec_uint_nv)
+ATOMIC_OP_ALIAS(atomic_dec_ulong, _atomic_dec_ulong)
+ATOMIC_OP_ALIAS(atomic_dec_ulong_nv, _atomic_dec_ulong_nv)
Index: src/common/lib/libc/arch/mips/atomic/atomic_inc.S
diff -u /dev/null src/common/lib/libc/arch/mips/atomic/atomic_inc.S:1.1.2.1
--- /dev/null Sat Sep 5 03:07:07 2009
+++ src/common/lib/libc/arch/mips/atomic/atomic_inc.S Sat Sep 5 03:07:07 2009
@@ -0,0 +1,111 @@
+/* $NetBSD: atomic_inc.S,v 1.1.2.1 2009/09/05 03:07:07 matt Exp $ */
+
+/*-
+ * Copyright (c) 2008 The NetBSD Foundation, Inc.
+ * 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 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/cdefs.h>
+#include <machine/asm.h>
+#include "atomic_op_asm.h"
+
+RCSID("$NetBSD: atomic_inc.S,v 1.1.2.1 2009/09/05 03:07:07 matt Exp $")
+
+ .text
+ .set noat
+ .set noreorder
+ .set nomacro
+
+LEAF(_atomic_inc_32)
+1: INT_LL t0, 0(a0)
+ nop
+ INT_ADDU t0, 1
+ INT_SC t0, 0(a0)
+ beq t0, zero, 1b
+ nop
+ j ra
+ nop
+END(_atomic_inc_32)
+ATOMIC_OP_ALIAS(atomic_inc_32, _atomic_inc_32)
+
+LEAF(_atomic_inc_32_nv)
+1: INT_LL v0, 0(a0)
+ nop
+ INT_ADDU v0, 1
+ move t0, v0
+ INT_SC t0, 0(a0)
+ beq t0, zero, 1b
+ nop
+ j ra
+ nop
+END(_atomic_inc_32_nv)
+ATOMIC_OP_ALIAS(atomic_inc_32_nv, _atomic_inc_32_nv)
+
+#if !defined(__mips_o32)
+LEAF(_atomic_inc_64)
+1: REG_LL t0, 0(a0)
+ nop
+ REG_ADDU t0, 1
+ REG_SC t0, 0(a0)
+ beq t0, zero, 1b
+ nop
+ j ra
+ nop
+END(_atomic_inc_64)
+ATOMIC_OP_ALIAS(atomic_inc_64, _atomic_inc_64)
+
+LEAF(_atomic_inc_64_nv)
+1: REG_LL v0, 0(a0)
+ nop
+ REG_ADDU v0, 1
+ move t0, v0
+ REG_SC t0, 0(a0)
+ beq t0, zero, 1b
+ nop
+ j ra
+ nop
+END(_atomic_inc_64_nv)
+ATOMIC_OP_ALIAS(atomic_inc_64_nv, _atomic_inc_64_nv)
+#endif
+
+#ifdef _LP64
+STRONG_ALIAS(_atomic_inc_ptr, _atomic_inc_64)
+STRONG_ALIAS(_atomic_inc_ptr_nv, _atomic_inc_64_nv)
+STRONG_ALIAS(_atomic_inc_ulong, _atomic_inc_64)
+STRONG_ALIAS(_atomic_inc_ulong_nv, _atomic_inc_64_nv)
+#else
+STRONG_ALIAS(_atomic_inc_ptr, _atomic_inc_32)
+STRONG_ALIAS(_atomic_inc_ptr_nv, _atomic_inc_32_nv)
+STRONG_ALIAS(_atomic_inc_ulong, _atomic_inc_32)
+STRONG_ALIAS(_atomic_inc_ulong_nv, _atomic_inc_32_nv)
+#endif
+STRONG_ALIAS(_atomic_inc_uint, _atomic_inc_32)
+STRONG_ALIAS(_atomic_inc_uint_nv, _atomic_inc_32_nv)
+
+ATOMIC_OP_ALIAS(atomic_inc_ptr, _atomic_inc_ptr)
+ATOMIC_OP_ALIAS(atomic_inc_ptr_nv, _atomic_inc_ptr_nv)
+ATOMIC_OP_ALIAS(atomic_inc_uint, _atomic_inc_uint)
+ATOMIC_OP_ALIAS(atomic_inc_uint_nv, _atomic_inc_uint_nv)
+ATOMIC_OP_ALIAS(atomic_inc_ulong, _atomic_inc_ulong)
+ATOMIC_OP_ALIAS(atomic_inc_ulong_nv, _atomic_inc_ulong_nv)
Index: src/common/lib/libc/arch/mips/atomic/atomic_or.S
diff -u /dev/null src/common/lib/libc/arch/mips/atomic/atomic_or.S:1.1.2.1
--- /dev/null Sat Sep 5 03:07:07 2009
+++ src/common/lib/libc/arch/mips/atomic/atomic_or.S Sat Sep 5 03:07:07 2009
@@ -0,0 +1,103 @@
+/* $NetBSD: atomic_or.S,v 1.1.2.1 2009/09/05 03:07:07 matt Exp $ */
+
+/*-
+ * Copyright (c) 2008 The NetBSD Foundation, Inc.
+ * 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 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/cdefs.h>
+#include <machine/asm.h>
+#include "atomic_op_asm.h"
+
+ .text
+ .set noat
+ .set noreorder
+ .set nomacro
+
+LEAF(_atomic_or_32)
+1: INT_LL t0, 0(a0)
+ nop
+ or t0, a1
+ INT_SC t0, 0(a0)
+ beq t0, zero, 1b
+ nop
+ j ra
+ nop
+END(_atomic_or_32)
+ATOMIC_OP_ALIAS(atomic_or_32, _atomic_or_32)
+
+LEAF(_atomic_or_32_nv)
+1: INT_LL v0, 0(a0)
+ nop
+ or v0, a1
+ move t0, v0
+ INT_SC t0, 0(a0)
+ beq t0, zero, 1b
+ nop
+ j ra
+ nop
+END(_atomic_or_32_nv)
+ATOMIC_OP_ALIAS(atomic_or_32_nv, _atomic_or_32_nv)
+
+#if !defined(__mips_o32)
+LEAF(_atomic_or_64)
+1: REG_LL t0, 0(a0)
+ nop
+ or t0, a1
+ REG_SC t0, 0(a0)
+ beq t0, zero, 1b
+ nop
+ j ra
+ nop
+END(_atomic_or_64)
+ATOMIC_OP_ALIAS(atomic_or_64, _atomic_or_64)
+
+LEAF(_atomic_or_64_nv)
+1: REG_LL v0, 0(a0)
+ nop
+ or v0, a1
+ move t0, v0
+ REG_SC t0, 0(a0)
+ beq t0, zero, 1b
+ nop
+ j ra
+ nop
+END(_atomic_or_64_nv)
+ATOMIC_OP_ALIAS(atomic_or_64_nv, _atomic_or_64_nv)
+#endif
+
+#ifdef _LP64
+STRONG_ALIAS(_atomic_or_ulong, _atomic_or_64)
+STRONG_ALIAS(_atomic_or_ulong_nv, _atomic_or_64_nv)
+#else
+STRONG_ALIAS(_atomic_or_ulong, _atomic_or_32)
+STRONG_ALIAS(_atomic_or_ulong_nv, _atomic_or_32_nv)
+#endif
+STRONG_ALIAS(_atomic_or_uint, _atomic_or_32)
+STRONG_ALIAS(_atomic_or_uint_nv, _atomic_or_32_nv)
+
+ATOMIC_OP_ALIAS(atomic_or_uint, _atomic_or_uint)
+ATOMIC_OP_ALIAS(atomic_or_uint_nv, _atomic_or_uint_nv)
+ATOMIC_OP_ALIAS(atomic_or_ulong, _atomic_or_ulong)
+ATOMIC_OP_ALIAS(atomic_or_ulong_nv, _atomic_or_ulong_nv)
Index: src/common/lib/libc/arch/mips/atomic/atomic_swap.S
diff -u /dev/null src/common/lib/libc/arch/mips/atomic/atomic_swap.S:1.1.2.1
--- /dev/null Sat Sep 5 03:07:07 2009
+++ src/common/lib/libc/arch/mips/atomic/atomic_swap.S Sat Sep 5 03:07:07 2009
@@ -0,0 +1,79 @@
+/* $NetBSD: atomic_swap.S,v 1.1.2.1 2009/09/05 03:07:07 matt Exp $ */
+
+/*-
+ * Copyright (c) 2008 The NetBSD Foundation, Inc.
+ * 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 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/cdefs.h>
+#include <machine/asm.h>
+#include "atomic_op_asm.h"
+
+RCSID("$NetBSD: atomic_swap.S,v 1.1.2.1 2009/09/05 03:07:07 matt Exp $")
+
+ .text
+ .set noat
+ .set noreorder
+ .set nomacro
+
+LEAF(_atomic_swap_32)
+1: INT_LL v0, 0(a0)
+ nop
+ move t0, a1
+ INT_SC t0, 0(a0)
+ beq t0, zero, 1b
+ nop
+2:
+ j ra
+ nop
+END(_atomic_swap_32)
+ATOMIC_OP_ALIAS(atomic_swap_32, _atomic_swap_32)
+
+#if !defined(__mips_o32)
+LEAF(_atomic_swap_64)
+1: REG_LL v0, 0(a0)
+ nop
+ move t0, a1
+ REG_SC t0, 0(a0)
+ beq t0, zero, 1b
+ nop
+2:
+ j ra
+ nop
+END(_atomic_swap_64)
+ATOMIC_OP_ALIAS(atomic_swap_64, _atomic_swap_64)
+#endif
+
+#ifdef _LP64
+STRONG_ALIAS(_atomic_swap_ptr, _atomic_swap_64)
+STRONG_ALIAS(_atomic_swap_ulong, _atomic_swap_64)
+#else
+STRONG_ALIAS(_atomic_swap_ptr, _atomic_swap_32)
+STRONG_ALIAS(_atomic_swap_ulong, _atomic_swap_32)
+#endif
+STRONG_ALIAS(_atomic_swap_uint, _atomic_swap_32)
+
+ATOMIC_OP_ALIAS(atomic_swap_ptr, _atomic_swap_ptr)
+ATOMIC_OP_ALIAS(atomic_swap_uint, _atomic_swap_uint)
+ATOMIC_OP_ALIAS(atomic_swap_ulong, _atomic_swap_ulong)
