make atomic_{set,clear}_bit() inline for arm32 ports, and

add <machine/atomic.h> for them.

sys/arch/acorn32/include/atomic.h

@@ -0,0 +1 @@
+#include <arm/atomic.h>

sys/arch/arm/arm32/intr.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: intr.c,v 1.9 2002/09/06 13:18:43 gehenna Exp $	*/
+/*	$NetBSD: intr.c,v 1.10 2002/10/19 12:22:33 bsh Exp $	*/
 
 /*
  * Copyright (c) 1994-1998 Mark Brinicombe.
@@ -45,6 +45,7 @@
 
 #include <uvm/uvm_extern.h>
 
+#include <machine/atomic.h>
 #include <machine/intr.h>
 #include <machine/cpu.h>
 

sys/arch/arm/arm32/locore.S

@@ -1,4 +1,4 @@
-/*	$NetBSD: locore.S,v 1.10 2002/10/15 23:10:32 bsh Exp $	*/
+/*	$NetBSD: locore.S,v 1.11 2002/10/19 12:22:33 bsh Exp $	*/
 
 /*
  * Copyright (C) 1994-1997 Mark Brinicombe
@@ -212,33 +212,4 @@ ENTRY_NP(abort)
 	b	_C_LABEL(abort)
 
 
-/*
- * Atomic bit set and clear functions
- */
-
-ENTRY(atomic_set_bit)
-	mrs	r2, cpsr
-	orr	r3, r2, #(I32_bit)
-	msr	cpsr_all, r3
-
-	ldr	r3, [r0]
-	orr	r3, r3, r1
-	str	r3, [r0]
-
-	msr	cpsr_all, r2
-	mov	pc, lr
-
-
-ENTRY(atomic_clear_bit)
-	mrs	r2, cpsr
-	orr	r3, r2, #(I32_bit)
-	msr	cpsr_all, r3
-
-	ldr	r3, [r0]
-	bic	r3, r3, r1
-	str	r3, [r0]
-
-	msr	cpsr_all, r2
-	mov	pc, lr
-
 /* End of locore.S */

sys/arch/arm/conf/files.arm

@@ -1,4 +1,4 @@
-#	$NetBSD: files.arm,v 1.63 2002/08/11 23:17:25 bjh21 Exp $
+#	$NetBSD: files.arm,v 1.64 2002/10/19 12:22:34 bsh Exp $
 
 # temporary define to allow easy moving to ../arch/arm/arm32
 defflag				ARM32
@@ -112,6 +112,7 @@ file	arch/arm/arm32/setstack.S		arm32
 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
 
 # arm32 library functions
 file	arch/arm/arm32/bcopy_page.S		arm32

sys/arch/arm/include/atomic.h

@@ -0,0 +1,102 @@
+/* $NetBSD: atomic.h,v 1.1 2002/10/19 12:22:34 bsh Exp $ */
+
+/*
+ * Copyright (C) 1994-1997 Mark Brinicombe
+ * Copyright (C) 1994 Brini
+ * All rights reserved.
+ *
+ * This code is derived from software written for Brini by Mark Brinicombe
+ *
+ * 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.
+ */
+
+#ifndef	_ARM_ATOMIC_H_
+#define	_ARM_ATOMIC_H_
+
+#ifndef ATOMIC_SET_BIT_NONINLINE_REQUIRED
+
+#if defined(__PROG26) || defined(ATOMIC_SET_BIT_NOINLINE)
+#define	ATOMIC_SET_BIT_NONINLINE_REQUIRED
+#endif
+
+#endif /* ATOMIC_SET_BIT_NONINLINE_REQUIRED */
+
+
+#ifndef _LOCORE
+
+#include <sys/types.h>
+#include <arm/armreg.h>			/* I32_bit */
+
+#ifdef ATOMIC_SET_BIT_NONINLINE_REQUIRED
+void atomic_set_bit( u_int *, u_int );
+void atomic_clear_bit( u_int *, u_int );
+#endif
+
+#ifdef __PROG32
+#define __with_interrupts_disabled(expr) \
+	do {						\
+		u_int cpsr_save, tmp;			\
+							\
+		__asm __volatile(			\
+			"mrs  %0, cpsr;"		\
+			"orr  %1, %0, %2;"		\
+			"msr  cpsr_all, %1;"		\
+			: "=r" (cpsr_save), "=r" (tmp)	\
+			: "I" (I32_bit)		\
+		        : "cc" );		\
+		(expr);				\
+		 __asm __volatile(		\
+			"msr  cpsr_all, %0"	\
+			: /* no output */	\
+			: "r" (cpsr_save)	\
+			: "cc" );		\
+	} while(0)
+
+static __inline void
+inline_atomic_set_bit( u_int *address, u_int setmask )
+{
+	__with_interrupts_disabled( *address |= setmask );
+}
+
+static __inline void
+inline_atomic_clear_bit( u_int *address, u_int clearmask )
+{
+	__with_interrupts_disabled( *address &= ~clearmask );
+}
+
+#if !defined(ATOMIC_SET_BIT_NOINLINE)
+
+#define atomic_set_bit(a,m)   inline_atomic_set_bit(a,m)
+#define atomic_clear_bit(a,m) inline_atomic_clear_bit(a,m)
+
+#endif
+
+#endif /* __PROG32 */
+
+#undef __with_interrutps_disabled
+
+#endif /* _LOCORE */
+#endif /* _ARM_ATOMIC_H_ */

sys/arch/cats/include/atomic.h

@@ -0,0 +1 @@
+#include <arm/atomic.h>

sys/arch/evbarm/include/atomic.h

@@ -0,0 +1 @@
+#include <arm/atomic.h>

sys/arch/hpcarm/hpcarm/intr.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: intr.c,v 1.6 2002/10/05 17:12:10 chs Exp $	*/
+/*	$NetBSD: intr.c,v 1.7 2002/10/19 12:22:35 bsh Exp $	*/
 
 /*
  * Copyright (c) 1994-1998 Mark Brinicombe.
@@ -44,6 +44,7 @@
 
 #include <uvm/uvm_extern.h>
 
+#include <machine/atomic.h>
 #include <machine/intr.h>
 #include <machine/cpu.h>
 

sys/arch/hpcarm/hpcarm/locore.S

@@ -1,4 +1,4 @@
-/*	$NetBSD: locore.S,v 1.6 2002/10/14 22:32:54 bjh21 Exp $	*/
+/*	$NetBSD: locore.S,v 1.7 2002/10/19 12:22:35 bsh Exp $	*/
 
 /*
  * Copyright (C) 1994-1997 Mark Brinicombe
@@ -186,33 +186,4 @@ ENTRY_NP(abort)
 	b	_C_LABEL(abort)
 
 
-/*
- * Atomic bit set and clear functions
- */
-
-ENTRY(atomic_set_bit)
-	mrs	r2, cpsr
-	orr	r3, r2, #(I32_bit)
-	msr	cpsr, r3
-
-	ldr	r3, [r0]
-	orr	r3, r3, r1
-	str	r3, [r0]
-
-	msr	cpsr, r2
-	mov	pc, lr
-
-
-ENTRY(atomic_clear_bit)
-	mrs	r2, cpsr
-	orr	r3, r2, #(I32_bit)
-	msr	cpsr, r3
-
-	ldr	r3, [r0]
-	bic	r3, r3, r1
-	str	r3, [r0]
-
-	msr	cpsr, r2
-	mov	pc, lr
-
 /* End of locore.S */

sys/arch/hpcarm/include/atomic.h

@@ -0,0 +1 @@
+#include <arm/atomic.h>

sys/arch/shark/include/atomic.h

@@ -0,0 +1 @@
+#include <arm/atomic.h>