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/powerpc64/atomic Use the sources in ../...



details:   https://anonhg.NetBSD.org/src/rev/907d7d5292a6
branches:  trunk
changeset: 327433:907d7d5292a6
user:      matt <matt%NetBSD.org@localhost>
date:      Fri Mar 07 07:20:56 2014 +0000

description:
Use the sources in ../../arch/powerpc instead

diffstat:

 common/lib/libc/arch/powerpc64/atomic/atomic_add.S    |  61 -------------------
 common/lib/libc/arch/powerpc64/atomic/atomic_and.S    |  57 -----------------
 common/lib/libc/arch/powerpc64/atomic/atomic_cas.S    |  58 ------------------
 common/lib/libc/arch/powerpc64/atomic/atomic_dec.S    |  61 -------------------
 common/lib/libc/arch/powerpc64/atomic/atomic_inc.S    |  61 -------------------
 common/lib/libc/arch/powerpc64/atomic/atomic_op_asm.h |  48 --------------
 common/lib/libc/arch/powerpc64/atomic/atomic_or.S     |  57 -----------------
 common/lib/libc/arch/powerpc64/atomic/atomic_swap.S   |  48 --------------
 common/lib/libc/arch/powerpc64/atomic/membar_ops.S    |   3 -
 9 files changed, 0 insertions(+), 454 deletions(-)

diffs (truncated from 490 to 300 lines):

diff -r 7b6fd5ad4b85 -r 907d7d5292a6 common/lib/libc/arch/powerpc64/atomic/atomic_add.S
--- a/common/lib/libc/arch/powerpc64/atomic/atomic_add.S        Fri Mar 07 07:20:24 2014 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,61 +0,0 @@
-/*     $NetBSD: atomic_add.S,v 1.5 2009/03/08 12:08:19 he 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"
-
-#include "../../powerpc/atomic/atomic_add.S"
-
-       .text
-
-ENTRY(_atomic_add_64)
-1:     ldarx   %r10,0,%r3
-       add     %r10,%r10,%r4
-       stdcx.  %r10,0,%r3
-       bne-    1b
-       blr
-ATOMIC_OP_ALIAS(atomic_add_64,_atomic_add_64)
-ATOMIC_OP_ALIAS(atomic_add_long,_atomic_add_64)
-STRONG_ALIAS(_atomic_add_long,_atomic_add_64)
-ATOMIC_OP_ALIAS(atomic_add_ptr,_atomic_add_64)
-STRONG_ALIAS(_atomic_add_ptr,_atomic_add_64)
-
-ENTRY(_atomic_add_64_nv)
-1:     ldarx   %r10,0,%r3
-       add     %r10,%r10,%r4
-       stdcx.  %r10,0,%r3
-       bne-    1b
-       mr      %r3,%r10
-       blr
-ATOMIC_OP_ALIAS(atomic_add_64_nv,_atomic_add_64_nv)
-ATOMIC_OP_ALIAS(atomic_add_long_nv,_atomic_add_64_nv)
-STRONG_ALIAS(_atomic_add_long_nv,_atomic_add_64_nv)
-ATOMIC_OP_ALIAS(atomic_add_ptr_nv,_atomic_add_64_nv)
-STRONG_ALIAS(_atomic_add_ptr_nv,_atomic_add_64_nv)
diff -r 7b6fd5ad4b85 -r 907d7d5292a6 common/lib/libc/arch/powerpc64/atomic/atomic_and.S
--- a/common/lib/libc/arch/powerpc64/atomic/atomic_and.S        Fri Mar 07 07:20:24 2014 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,57 +0,0 @@
-/*     $NetBSD: atomic_and.S,v 1.5 2009/03/08 12:08:19 he 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"
-
-#include "../../powerpc/atomic/atomic_and.S"
-
-       .text
-
-ENTRY(_atomic_and_64)
-1:     ldarx   %r10,0,%r3
-       and     %r10,%r10,%r4
-       stdcx.  %r10,0,%r3
-       bne-    1b
-       blr
-ATOMIC_OP_ALIAS(atomic_and_64,_atomic_and_64)
-ATOMIC_OP_ALIAS(atomic_and_ulong,_atomic_and_64)
-STRONG_ALIAS(_atomic_and_ulong,_atomic_and_64)
-
-ENTRY(_atomic_and_64_nv)
-1:     ldarx   %r10,0,%r3
-       and     %r10,%r10,%r4
-       stdcx.  %r10,0,%r3
-       bne-    1b
-       mr      %r3,%r10
-       blr
-ATOMIC_OP_ALIAS(atomic_and_64_nv,_atomic_and_64_nv)
-ATOMIC_OP_ALIAS(atomic_and_ulong_nv,_atomic_and_64_nv)
-STRONG_ALIAS(_atomic_and_ulong_nv,_atomic_and_64_nv)
diff -r 7b6fd5ad4b85 -r 907d7d5292a6 common/lib/libc/arch/powerpc64/atomic/atomic_cas.S
--- a/common/lib/libc/arch/powerpc64/atomic/atomic_cas.S        Fri Mar 07 07:20:24 2014 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,58 +0,0 @@
-/*     $NetBSD: atomic_cas.S,v 1.6 2009/03/08 12:08:19 he Exp $        */
-
-/*-
- * Copyright (c) 2007, 2008 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"
-
-#include "../../powerpc/atomic/atomic_cas.S"
-
-       .text
-
-ENTRY(_atomic_cas_64)
-1:     ldarx   %r10,0,%r3
-       cmpd    %r10,%r4
-       bne-    2f
-       stdcx.  %r5,0,%r3
-       bne-    1b
-2:     mr      %r3,%r10
-       blr
-
-ATOMIC_OP_ALIAS(atomic_cas_64,_atomic_cas_64)
-ATOMIC_OP_ALIAS(atomic_cas_ulong,_atomic_cas_64)
-STRONG_ALIAS(_atomic_cas_ulong,_atomic_cas_64)
-ATOMIC_OP_ALIAS(atomic_cas_ptr,_atomic_cas_64)
-STRONG_ALIAS(_atomic_cas_ptr,_atomic_cas_64)
-
-ATOMIC_OP_ALIAS(atomic_cas_64_ni,_atomic_cas_64)
-STRONG_ALIAS(_atomic_cas_64_ni,_atomic_cas_64)
-ATOMIC_OP_ALIAS(atomic_cas_ulong_ni,_atomic_cas_64)
-STRONG_ALIAS(_atomic_cas_ulong_ni,_atomic_cas_64)
-ATOMIC_OP_ALIAS(atomic_cas_ptr_ni,_atomic_cas_64)
-STRONG_ALIAS(_atomic_cas_ptr_ni,_atomic_cas_64)
diff -r 7b6fd5ad4b85 -r 907d7d5292a6 common/lib/libc/arch/powerpc64/atomic/atomic_dec.S
--- a/common/lib/libc/arch/powerpc64/atomic/atomic_dec.S        Fri Mar 07 07:20:24 2014 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,61 +0,0 @@
-/*     $NetBSD: atomic_dec.S,v 1.5 2009/03/08 12:08:19 he 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"
-
-#include "../../powerpc/atomic/atomic_dec.S"
-
-       .text
-
-ENTRY(_atomic_dec_64)
-1:     ldarx   %r10,0,%r3
-       addi    %r10,%r10,-1
-       stdcx.  %r10,0,%r3
-       bne-    1b
-       blr
-ATOMIC_OP_ALIAS(atomic_dec_64,_atomic_dec_64)
-ATOMIC_OP_ALIAS(atomic_dec_ulong,_atomic_dec_64)
-STRONG_ALIAS(_atomic_dec_ulong,_atomic_dec_64)
-ATOMIC_OP_ALIAS(atomic_dec_ptr,_atomic_dec_64)
-STRONG_ALIAS(_atomic_dec_ptr,_atomic_dec_64)
-
-ENTRY(_atomic_dec_64_nv)
-1:     ldarx   %r10,0,%r3
-       addi    %r10,%r10,-1
-       stdcx.  %r10,0,%r3
-       bne-    1b
-       mr      %r3,%r10
-       blr
-ATOMIC_OP_ALIAS(atomic_dec_64_nv,_atomic_dec_64_nv)
-ATOMIC_OP_ALIAS(atomic_dec_ulong_nv,_atomic_dec_64_nv)
-STRONG_ALIAS(_atomic_dec_ulong_nv,_atomic_dec_64_nv)
-ATOMIC_OP_ALIAS(atomic_dec_ptr_nv,_atomic_dec_64_nv)
-STRONG_ALIAS(_atomic_dec_ptr_nv,_atomic_dec_64_nv)
diff -r 7b6fd5ad4b85 -r 907d7d5292a6 common/lib/libc/arch/powerpc64/atomic/atomic_inc.S
--- a/common/lib/libc/arch/powerpc64/atomic/atomic_inc.S        Fri Mar 07 07:20:24 2014 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,61 +0,0 @@
-/*     $NetBSD: atomic_inc.S,v 1.5 2009/03/08 12:08:19 he 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"
-
-#include "../../powerpc/atomic/atomic_inc.S"
-
-       .text
-
-ENTRY(_atomic_inc_64)
-1:     ldarx   %r10,0,%r3
-       addi    %r10,%r10,1
-       stdcx.  %r10,0,%r3
-       bne-    1b
-       blr



Home | Main Index | Thread Index | Old Index