[src/trunk]: src/sys/arch/arm Nuke atomic.S since we have MI defined atomic ops

[matt <matt%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/64dae95dc328
branches:  trunk
changeset: 789385:64dae95dc328
user:      matt <matt%NetBSD.org@localhost>
date:      Sat Aug 17 22:21:02 2013 +0000

description:
Nuke atomic.S since we have MI defined atomic ops

diffstat:

 sys/arch/arm/arm32/atomic.S |  116 --------------------------------------------
 sys/arch/arm/conf/files.arm |    3 +-
 2 files changed, 1 insertions(+), 118 deletions(-)

diffs (137 lines):

diff -r 2848676bb641 -r 64dae95dc328 sys/arch/arm/arm32/atomic.S
--- a/sys/arch/arm/arm32/atomic.S       Sat Aug 17 20:21:38 2013 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,116 +0,0 @@
-/*     $NetBSD: atomic.S,v 1.5 2010/07/07 01:17:27 chs Exp $ */
-
-/*
- * Copyright (C) 1994-1997 Mark Brinicombe
- * Copyright (C) 1994 Brini
- * 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.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *     This product includes software developed by Brini.
- * 4. The name of Brini may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY BRINI ``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 BRINI 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 "assym.h"
-#include <machine/asm.h>
-#include <machine/atomic.h>
-#include <machine/cpu.h>
-       
-#ifdef ATOMIC_SET_BIT_NONINLINE_REQUIRED
-/*
- * Atomic bit set and clear functions
- */
-
-#undef atomic_set_bit
-ENTRY(atomic_set_bit)
-       mrs     r2, cpsr
-       orr     r3, r2, #(IF32_bits)
-       msr     cpsr_c, r3
-
-       ldr     r3, [r0]
-       orr     r3, r3, r1
-       str     r3, [r0]
-
-       msr     cpsr_c, r2
-       mov     pc, lr
-END(atomic_set_bit)
-
-#undef atomic_clear_bit
-ENTRY(atomic_clear_bit)
-       mrs     r2, cpsr
-       orr     r3, r2, #(IF32_bits)
-       msr     cpsr_c, r3
-
-       ldr     r3, [r0]
-       bic     r3, r3, r1
-       str     r3, [r0]
-
-       msr     cpsr_c, r2
-       mov     pc, lr
-END(atomic_clear_bit)
-
-#endif /* ATOMIC_SET_BIT_NONINLINE_REQUIRED */
-
-#if 0 && defined(_ARM_ARCH_6)
-
-#define        ATOMIC_OP(NAME, OP, ARG)        \
-ENTRY_NP(atomic_##NAME##_32)           ;\
-       mov     ip, r0                  ;\
-1:      ldrex  r0, [ip]                ;\
-       OP      r2, r0, ARG             ;\
-       strex   r3, r2, [ip]            ;\
-       cmp     r3, #0                  ;\
-       bne     1b                      ;\
-       RET                             ;\
-END(atomic_##NAME##_32)
-
-ATOMIC_OP(and, and, r1)
-ATOMIC_OP(nand, bic, r1)
-ATOMIC_OP(or, orr, r1)
-ATOMIC_OP(xor, eor, r1)
-ATOMIC_OP(add, add, r1)
-ATOMIC_OP(inc, add, #1)
-ATOMIC_OP(sub, sub, r1)
-ATOMIC_OP(dec, sub, #1)
-
-#define        ATOMIC_OP_NV(NAME, OP, ARG)     \
-ENTRY_NP(atomic_##NAME##_32_nv)                ;\
-       mov     ip, r0                  ;\
-1:      ldrex  r0, [ip]                ;\
-       OP      r0, r0, ARG             ;\
-       strex   r3, r0, [ip]            ;\
-       cmp     r3, #0                  ;\
-       bne     1b                      ;\
-       RET                             ;\
-END(atomic_##NAME##_32_nv)
-
-ATOMIC_OP_NV(and, and, r1)
-ATOMIC_OP_NV(nand, bic, r1)
-ATOMIC_OP_NV(or, orr, r1)
-ATOMIC_OP_NV(xor, eor, r1)
-ATOMIC_OP_NV(add, add, r1)
-ATOMIC_OP_NV(inc, add, #1)
-ATOMIC_OP_NV(sub, sub, r1)
-ATOMIC_OP_NV(dec, sub, #1)
-
-#endif /* _ARM_ARCH_6 */
diff -r 2848676bb641 -r 64dae95dc328 sys/arch/arm/conf/files.arm
--- a/sys/arch/arm/conf/files.arm       Sat Aug 17 20:21:38 2013 +0000
+++ b/sys/arch/arm/conf/files.arm       Sat Aug 17 22:21:02 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.arm,v 1.121 2013/07/02 06:07:11 matt Exp $
+#      $NetBSD: files.arm,v 1.122 2013/08/17 22:21:02 matt Exp $
 
 # temporary define to allow easy moving to ../arch/arm/arm32
 defflag                                ARM32
@@ -196,7 +196,6 @@
 file   arch/arm/arm32/stubs.c                  arm32
 file   arch/arm/arm32/sys_machdep.c            arm32
 file   arch/arm/arm32/vm_machdep.c             arm32
-file   arch/arm/arm32/atomic.S                 arm32
 
 # files less common to arm32 implementations...
 file   kern/kern_cctr.c                        arm11