 @@ -1,14 +1,14 @@
-/* $NetBSD: except.c,v 1.24 2010/03/20 23:31:27 chs Exp $ */
+/* $NetBSD: except.c,v 1.25 2010/07/07 01:17:26 chs Exp $ */
 /*-
  * Copyright (c) 1998, 1999, 2000 Ben Harris
  * 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. The name of the author may not be used to endorse or promote products
 @@ -21,27 +21,27 @@
  * 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.
  */
 /*
  * except.c -- ARM exception handling.
  */
 #include <sys/param.h>
-__KERNEL_RCSID(0, "$NetBSD: except.c,v 1.24 2010/03/20 23:31:27 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: except.c,v 1.25 2010/07/07 01:17:26 chs Exp $");
 #include "opt_ddb.h"
 #include <sys/errno.h>
 #include <sys/kauth.h>
 #include <sys/kernel.h>
 #include <sys/syslog.h>
 #include <sys/systm.h>
 #include <sys/cpu.h>
 #include <uvm/uvm_extern.h>
 #include <arm/armreg.h>
 @@ -192,84 +192,88 @@ data_abort_handler(struct trapframe *tf)
 		userret(l);
+}
 /*
  * General page fault handler.
  */
 void
 do_fault(struct trapframe *tf, struct lwp *l,
     struct vm_map *map, vaddr_t va, vm_prot_t atype)
+{
 	int error;
 	struct pcb *pcb;
 	void *onfault;
 	bool user;
 	if (pmap_fault(map->pmap, va, atype))
 		return;
 	pcb = lwp_getpcb(l);
 	onfault = pcb->pcb_onfault;
 	user = (tf->tf_r15 & R15_MODE) == R15_MODE_USR;
 	if (cpu_intr_p()) {
-		KASSERT((tf->tf_r15 & R15_MODE) != R15_MODE_USR);
+		KASSERT(!user);
 		error = EFAULT;
 	} else {
 		pcb->pcb_onfault = NULL;
 		error = uvm_fault(map, va, atype);
 		pcb->pcb_onfault = onfault;
+	}
 	if (error != 0) {
 		ksiginfo_t ksi;
 		if (onfault != NULL) {
 			tf->tf_r0 = error;
 			tf->tf_r15 = (tf->tf_r15 & ~R15_PC) |
 			    (register_t)onfault;
 			return;
+		}
 #ifdef DDB
 		if (db_validating) {
 			db_faulted = true;
 			tf->tf_r15 += INSN_SIZE;
 			return;
+		}
 #endif
-		if ((tf->tf_r15 & R15_MODE) != R15_MODE_USR) {
+		if (!user) {
 #ifdef DDB
 			db_printf("Unhandled data abort in kernel mode\n");
 			kdb_trap(T_FAULT, tf);
 #else
 #ifdef DEBUG
 			printf("Unhandled data abort:\n");
 			printregs(tf);
 #endif
 			panic("unhandled data abort in kernel mode");
 #endif
+		}
 		KSI_INIT_TRAP(&ksi);
 		if (error == ENOMEM) {
 			printf("UVM: pid %d (%s), uid %d killed: "
 			    "out of swap\n",
 			    l->l_proc->p_pid, l->l_proc->p_comm,
 			    l->l_cred ? kauth_cred_geteuid(l->l_cred) : -1);
 			ksi.ksi_signo = SIGKILL;
 		} else
 			ksi.ksi_signo = SIGSEGV;
 		ksi.ksi_code = (error == EPERM) ? SEGV_ACCERR : SEGV_MAPERR;
 		ksi.ksi_addr = (void *) va;
 		trapsignal(l, &ksi);
 	} else if (!user) {
 		ucas_ras_check(tf);
+	}
+}
 /*
  * In order for the following macro to work, any function using it
  * must ensure that tf->r15 is copied into getreg(15).  This is safe
  * with the current trapframe layout on arm26, but be careful.
  */
 #define getreg(r) (((register_t *)&tf->tf_r0)[r])
 /*
  * Undo any effects of the aborted instruction that need to be undone
  * in order for us to restart it.  This is just a case of spotting

 @@ -1,14 +1,14 @@
-/*	$NetBSD: arm_machdep.c,v 1.28 2010/04/23 19:18:09 rmind Exp $	*/
+/*	$NetBSD: arm_machdep.c,v 1.29 2010/07/07 01:17:26 chs Exp $	*/
 /*
  * Copyright (c) 2001 Wasabi Systems, Inc.
  * All rights reserved.
+ *
  * Written by Jason R. Thorpe for Wasabi Systems, Inc.
+ *
  * 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
 @@ -69,27 +69,27 @@
  * 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 "opt_execfmt.h"
 #include "opt_cpuoptions.h"
 #include "opt_cputypes.h"
 #include "opt_arm_debug.h"
 #include "opt_sa.h"
 #include <sys/param.h>
-__KERNEL_RCSID(0, "$NetBSD: arm_machdep.c,v 1.28 2010/04/23 19:18:09 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: arm_machdep.c,v 1.29 2010/07/07 01:17:26 chs Exp $");
 #include <sys/exec.h>
 #include <sys/proc.h>
 #include <sys/systm.h>
 #include <sys/kmem.h>
 #include <sys/ucontext.h>
 #include <sys/evcnt.h>
 #include <sys/cpu.h>
 #include <sys/savar.h>
 #ifdef EXEC_AOUT
 #include <sys/exec_aout.h>
 #endif
 @@ -267,13 +267,25 @@ cpu_need_resched(struct cpu_info *ci, in
 	if (ci->ci_want_resched && !immed)
 		return;
 	ci->ci_want_resched = 1;
 	if (curlwp != ci->ci_data.cpu_idlelwp)
 		setsoftast();
+}
 bool
 cpu_intr_p(void)
+{
 	return curcpu()->ci_intr_depth != 0;
+}
 void
 ucas_ras_check(trapframe_t *tf)
+{
 	extern char ucas_32_ras_start[];
 	extern char ucas_32_ras_end[];
 	if (tf->tf_pc > (vaddr_t)ucas_32_ras_start &&
 	    tf->tf_pc < (vaddr_t)ucas_32_ras_end) {
 		tf->tf_pc = (vaddr_t)ucas_32_ras_start;
+	}
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: lock_cas.S,v 1.6 2009/01/16 10:28:24 bjh21 Exp $	*/
+/*	$NetBSD: lock_cas.S,v 1.7 2010/07/07 01:17:26 chs 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.
 @@ -19,29 +19,36 @@
  * 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 "opt_multiprocessor.h"
 #if defined(MULTIPROCESSOR)
 #error need to write MP support for ucas_* functions
 #endif
 #include "opt_arm_debug.h"
 #include "assym.h"
 #include <machine/asm.h>
 #include <machine/cpu.h>
 	.text
 	.align	0
 #if defined(ARM_LOCK_CAS_DEBUG)
 .L_lock_cas_success:
 	.word	_C_LABEL(_lock_cas_success)
 .L_lock_cas_fail:
 	.word	_C_LABEL(_lock_cas_fail)
 #endif /* ARM_LOCK_CAS_DEBUG */
 /*
  * _lock_cas:
 @@ -57,54 +64,94 @@
  * r1	Old value to compare.
  * r2	New value.
  */
 	.globl	_C_LABEL(_lock_cas_end)
 ENTRY_NP(_lock_cas)
 #ifdef _ARCH_ARM_6
         mov	ip, r0
 :      ldrex	r0, [ip]		/* eventual return value */
         cmp	r1, r0
 	RETc(ne)
         strex	r3, r2, [ip]
         cmp	r3, #0
         bne	1b
         RET
         END(_lock_cas)
 #else
 	ldr	r3, [r0]
 	teq	r3, r1
 	streq	r2, [r0]
 _C_LABEL(_lock_cas_end):
 	mov	r0, r3
 #if defined(ARM_LOCK_CAS_DEBUG)
 	ldreq	r3, .L_lock_cas_success
 	ldrne	r3, .L_lock_cas_fail
 	ldmia	r3, {r1-r2}		/* load ev_count */
 #if defined(__ARMEB__)
 	adds	r2, r2, #1		/* 64-bit incr (lo) */
 	adc	r1, r1, #0		/* 64-bit incr (hi) */
 #else
 	adds	r1, r1, #1		/* 64-bit incr (lo) */
 	adc	r2, r2, #0		/* 64-bit incr (hi) */
 #endif /* __ARMEB__ */
 	stmia	r3, {r1-r2}		/* store ev_count */
 #endif /* ARM_LOCK_CAS_DEBUG */
 	RET
 #endif
 	RET
 END(_lock_cas)
 STRONG_ALIAS(_atomic_cas_ulong,_lock_cas)
 STRONG_ALIAS(atomic_cas_ulong,_lock_cas)
 STRONG_ALIAS(_atomic_cas_32,_lock_cas)
 STRONG_ALIAS(atomic_cas_32,_lock_cas)
 STRONG_ALIAS(_atomic_cas_uint,_lock_cas)
 STRONG_ALIAS(atomic_cas_uint,_lock_cas)
 STRONG_ALIAS(_atomic_cas_ptr,_lock_cas)
 STRONG_ALIAS(atomic_cas_ptr,_lock_cas)
 STRONG_ALIAS(_atomic_cas_ulong_ni,_lock_cas)
 STRONG_ALIAS(atomic_cas_ulong_ni,_lock_cas)
 STRONG_ALIAS(_atomic_cas_32_ni,_lock_cas)
 STRONG_ALIAS(atomic_cas_32_ni,_lock_cas)
 STRONG_ALIAS(_atomic_cas_uint_ni,_lock_cas)
 STRONG_ALIAS(atomic_cas_uint_ni,_lock_cas)
 STRONG_ALIAS(_atomic_cas_ptr_ni,_lock_cas)
 STRONG_ALIAS(atomic_cas_ptr_ni,_lock_cas)
 #ifdef __PROG32
 #define SAVE_REGS	stmfd	sp!, {r4-r6}
 #define RESTORE_REGS	ldmfd	sp!, {r4-r6}
 #else
 /* Need to save R14_svc because it'll get trampled if we take a page fault. */
 #define SAVE_REGS	stmfd	sp!, {r4-r6, r14}
 #define RESTORE_REGS	ldmfd	sp!, {r4-r6, r14}
 #endif
 /*
  * int ucas_32(volatile int32_t *uptr, int32_t old, int32_t new, int32_t *ret);
  */
 ENTRY(ucas_32)
 	SAVE_REGS
 	GET_CURPCB(r4)
 	adr	r5, .Lucasfault
 	str	r5, [r4, #PCB_ONFAULT]
 	.globl	_C_LABEL(ucas_32_ras_start)
 _C_LABEL(ucas_32_ras_start):
 	ldrt	r5, [r0]
 	cmp	r1, r5
 	streqt	r2, [r0]
 	.globl _C_LABEL(ucas_32_ras_end)
 _C_LABEL(ucas_32_ras_end):
 	str	r5, [r3]
 	mov	r0, #0
 	str	r0, [r4, #PCB_ONFAULT]
 	RESTORE_REGS
 	RET
 .Lucasfault:
 	mov	r5, #0
 	str	r5, [r4, #PCB_ONFAULT]
 	RESTORE_REGS
 	RET
 END(ucas_32)
 STRONG_ALIAS(ucas_int,ucas_32)
 STRONG_ALIAS(ucas_ptr,ucas_32)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: atomic.S,v 1.4 2008/11/19 06:32:10 matt Exp $ */
+/*	$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
 @@ -43,73 +43,74 @@
 #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			;\
 :      ldrex	r0, [ip]		;\
 	OP	r2, r0, ARG		;\
 	strex	r3, r2, [ip]		;\
 	cmp	r3, #0			;\
 	bne	1b			;\
 	RET				;\
-	END(atomic_##NAME##_32)
+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			;\
 :      ldrex	r0, [ip]		;\
 	OP	r0, r0, ARG		;\
 	strex	r3, r0, [ip]		;\
 	cmp	r3, #0			;\
 	bne	1b			;\
 	RET				;\
-	END(atomic_##NAME##_32_nv)
+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 */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: fault.c,v 1.76 2010/03/21 00:10:14 chs Exp $	*/
+/*	$NetBSD: fault.c,v 1.77 2010/07/07 01:17:27 chs Exp $	*/
 /*
  * Copyright 2003 Wasabi Systems, Inc.
  * All rights reserved.
+ *
  * Written by Steve C. Woodford for Wasabi Systems, Inc.
+ *
  * 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
 @@ -72,27 +72,27 @@
+ *
  * fault.c
+ *
  * Fault handlers
+ *
  * Created      : 28/11/94
  */
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
 #include "opt_sa.h"
 #include <sys/types.h>
-__KERNEL_RCSID(0, "$NetBSD: fault.c,v 1.76 2010/03/21 00:10:14 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fault.c,v 1.77 2010/07/07 01:17:27 chs Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
 #include <sys/kernel.h>
 #include <sys/kauth.h>
 #include <sys/savar.h>
 #include <sys/cpu.h>
 #include <uvm/uvm_extern.h>
 #include <uvm/uvm_stat.h>
 #ifdef UVMHIST
 @@ -470,26 +470,28 @@ data_abort_handler(trapframe_t *tf)
 	onfault = pcb->pcb_onfault;
 	pcb->pcb_onfault = NULL;
 	error = uvm_fault(map, va, ftype);
 	pcb->pcb_onfault = onfault;
 #ifdef KERN_SA
 	if (map != kernel_map)
 		l->l_pflag &= ~LP_SA_PAGEFAULT;
 #endif
 	if (__predict_true(error == 0)) {
 		if (user)
 			uvm_grow(l->l_proc, va); /* Record any stack growth */
 		else
 			ucas_ras_check(tf);
 		UVMHIST_LOG(maphist, " <- uvm", 0, 0, 0, 0);
 		goto out;
+	}
 	if (user == 0) {
 		if (pcb->pcb_onfault) {
 			tf->tf_r0 = error;
 			tf->tf_pc = (register_t)(intptr_t) pcb->pcb_onfault;
 			return;
+		}
 		printf("\nuvm_fault(%p, %lx, %x) -> %x\n", map, va, ftype,
 		    error);

 @@ -374,27 +374,30 @@ void	cpu_attach(struct device *);
 struct lwp;
 /* locore.S */
 void atomic_set_bit(u_int *, u_int);
 void atomic_clear_bit(u_int *, u_int);
 /* cpuswitch.S */
 struct pcb;
 void	savectx(struct pcb *);
 /* ast.c */
 void userret(register struct lwp *);
-/* machdep.h */
+/* *_machdep.c */
 void bootsync(void);
 /* fault.c */
 int badaddr_read(void *, size_t, void *);
 /* syscall.c */
 void swi_handler(trapframe_t *);
 /* arm_machdep.c */
 void ucas_ras_check(trapframe_t *);
 #endif	/* !_LOCORE */
 #endif /* _KERNEL */
 #endif /* !_ARM_CPU_H_ */