Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/common/lib/libc Merge from matt-nb5-mips64
details: https://anonhg.NetBSD.org/src/rev/4873e4b0b7b5
branches: trunk
changeset: 749973:4873e4b0b7b5
user: matt <matt%NetBSD.org@localhost>
date: Mon Dec 14 00:38:59 2009 +0000
description:
Merge from matt-nb5-mips64
diffstat:
common/lib/libc/arch/mips/atomic/Makefile.inc | 39 ++-
common/lib/libc/arch/mips/atomic/atomic_add.S | 111 ++++++++++
common/lib/libc/arch/mips/atomic/atomic_and.S | 105 +++++++++
common/lib/libc/arch/mips/atomic/atomic_cas.S | 93 ++++++++
common/lib/libc/arch/mips/atomic/atomic_dec.S | 111 ++++++++++
common/lib/libc/arch/mips/atomic/atomic_inc.S | 111 ++++++++++
common/lib/libc/arch/mips/atomic/atomic_or.S | 103 +++++++++
common/lib/libc/arch/mips/atomic/atomic_swap.S | 79 +++++++
common/lib/libc/arch/mips/atomic/membar_ops.S | 27 +-
common/lib/libc/arch/mips/gen/byte_swap_2.S | 21 +-
common/lib/libc/arch/mips/gen/byte_swap_4.S | 21 +-
common/lib/libc/arch/mips/gen/byte_swap_8.S | 118 ++++++++++
common/lib/libc/arch/mips/string/bcopy.S | 250 +++++++++++-----------
common/lib/libc/arch/mips/string/ffs.S | 10 +-
common/lib/libc/arch/mips/string/memset.S | 51 ----
common/lib/libc/arch/mips/string/strcmp.S | 14 +-
common/lib/libc/arch/mips/string/strlen.S | 22 +-
common/lib/libc/atomic/atomic_init_testset.c | 6 +-
common/lib/libc/string/bzero2.c | 36 +++
common/lib/libc/string/memset2.c | 277 +++++++++++++++++++++++++
20 files changed, 1364 insertions(+), 241 deletions(-)
diffs (truncated from 1933 to 300 lines):
diff -r d63e15bf90e2 -r 4873e4b0b7b5 common/lib/libc/arch/mips/atomic/Makefile.inc
--- a/common/lib/libc/arch/mips/atomic/Makefile.inc Mon Dec 14 00:38:48 2009 +0000
+++ b/common/lib/libc/arch/mips/atomic/Makefile.inc Mon Dec 14 00:38:59 2009 +0000
@@ -1,23 +1,40 @@
-# $NetBSD: Makefile.inc,v 1.9 2009/01/04 17:54:29 pooka Exp $
+# $NetBSD: Makefile.inc,v 1.10 2009/12/14 00:38:59 matt Exp $
.if defined(LIB) && (${LIB} == "kern" || ${LIB} == "c" || ${LIB} == "pthread" \
|| ${LIB} == "rump")
-SRCS+= atomic_add_32_cas.c atomic_add_32_nv_cas.c atomic_and_32_cas.c \
- atomic_and_32_nv_cas.c atomic_dec_32_cas.c atomic_dec_32_nv_cas.c \
- atomic_inc_32_cas.c atomic_inc_32_nv_cas.c atomic_or_32_cas.c \
- atomic_or_32_nv_cas.c atomic_swap_32_cas.c atomic_add_64_cas.c \
- atomic_add_64_nv_cas.c atomic_and_64_cas.c atomic_and_64_nv_cas.c \
- atomic_dec_64_cas.c atomic_dec_64_nv_cas.c atomic_inc_64_cas.c \
- atomic_inc_64_nv_cas.c atomic_or_64_cas.c atomic_or_64_nv_cas.c \
- atomic_swap_64_cas.c membar_ops.o
+.if ${MACHINE_ARCH:Mmips64*} == ""
+SRCS+= atomic_add_32_cas.c atomic_add_32_nv_cas.c \
+ atomic_and_32_cas.c atomic_and_32_nv_cas.c \
+ atomic_dec_32_cas.c atomic_dec_32_nv_cas.c \
+ atomic_inc_32_cas.c atomic_inc_32_nv_cas.c \
+ atomic_or_32_cas.c atomic_or_32_nv_cas.c \
+ atomic_swap_32_cas.c \
+ atomic_add_64_cas.c atomic_add_64_nv_cas.c \
+ atomic_and_64_cas.c atomic_and_64_nv_cas.c \
+ atomic_dec_64_cas.c atomic_dec_64_nv_cas.c \
+ atomic_inc_64_cas.c atomic_inc_64_nv_cas.c \
+ atomic_or_64_cas.c atomic_or_64_nv_cas.c \
+ atomic_swap_64_cas.c
+CPPFLAGS+= -D__HAVE_ASM_ATOMIC_CAS_UP
+
+.else
+SRCS+= atomic_add.S atomic_dec.S atomic_inc.S
+SRCS+= atomic_and.S atomic_or.S
+SRCS+= atomic_swap.S
+.endif
+
+SRCS+= membar_ops.S
.endif
.if defined(LIB) && (${LIB} == "c" || ${LIB} == "pthread")
-SRCS+= membar_ops_nop.c atomic_init_testset.c atomic_cas_up.S
-CPPFLAGS+= -D__HAVE_ASM_ATOMIC_CAS_UP
+.if ${MACHINE_ARCH:Mmips64*} == ""
+SRCS+= atomic_init_testset.c atomic_cas_up.S
+.else
+SRCS+= atomic_cas.S atomic_init_cas.c
+.endif
.endif
diff -r d63e15bf90e2 -r 4873e4b0b7b5 common/lib/libc/arch/mips/atomic/atomic_add.S
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/common/lib/libc/arch/mips/atomic/atomic_add.S Mon Dec 14 00:38:59 2009 +0000
@@ -0,0 +1,111 @@
+/* $NetBSD: atomic_add.S,v 1.2 2009/12/14 00:38:59 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.2 2009/12/14 00:38:59 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)
diff -r d63e15bf90e2 -r 4873e4b0b7b5 common/lib/libc/arch/mips/atomic/atomic_and.S
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/common/lib/libc/arch/mips/atomic/atomic_and.S Mon Dec 14 00:38:59 2009 +0000
@@ -0,0 +1,105 @@
+/* $NetBSD: atomic_and.S,v 1.2 2009/12/14 00:38:59 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.2 2009/12/14 00:38:59 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)
diff -r d63e15bf90e2 -r 4873e4b0b7b5 common/lib/libc/arch/mips/atomic/atomic_cas.S
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/common/lib/libc/arch/mips/atomic/atomic_cas.S Mon Dec 14 00:38:59 2009 +0000
@@ -0,0 +1,93 @@
+/* $NetBSD: atomic_cas.S,v 1.2 2009/12/14 00:39:00 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
Home |
Main Index |
Thread Index |
Old Index