 @@ -1,14 +1,14 @@
-/*	$NetBSD: undefined.c,v 1.53 2014/03/15 05:58:30 ozaki-r Exp $	*/
+/*	$NetBSD: undefined.c,v 1.54 2014/03/28 21:44:35 matt Exp $	*/
 /*
  * Copyright (c) 2001 Ben Harris.
  * Copyright (c) 1995 Mark Brinicombe.
  * Copyright (c) 1995 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
 @@ -45,27 +45,27 @@
  */
 #define FAST_FPE
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
 #include "opt_dtrace.h"
 #include <sys/param.h>
 #ifdef KGDB
 #include <sys/kgdb.h>
 #endif
-__KERNEL_RCSID(0, "$NetBSD: undefined.c,v 1.53 2014/03/15 05:58:30 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: undefined.c,v 1.54 2014/03/28 21:44:35 matt Exp $");
 #include <sys/kmem.h>
 #include <sys/queue.h>
 #include <sys/signal.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
 #include <sys/syslog.h>
 #include <sys/vmmeter.h>
 #include <sys/cpu.h>
 #ifdef FAST_FPE
 #include <sys/acct.h>
 #endif
 #include <sys/userret.h>
 @@ -114,30 +114,26 @@ install_coproc_handler_static(int coproc
 	LIST_INSERT_HEAD(&undefined_handlers[coproc], uh, uh_link);
+}
 void
 remove_coproc_handler(void *cookie)
+{
 	struct undefined_handler *uh = cookie;
 	LIST_REMOVE(uh, uh_link);
 	kmem_free(uh, sizeof(*uh));
+}
 static struct evcnt cp15_ev =
     EVCNT_INITIALIZER(EVCNT_TYPE_TRAP, NULL, "cpu0", "undefined cp15 insn traps");
 EVCNT_ATTACH_STATIC(cp15_ev);
 static int
 cp15_trapper(u_int addr, u_int insn, struct trapframe *tf, int code)
+{
 	struct lwp * const l = curlwp;
 #if defined(THUMB_CODE) && !defined(CPU_ARMV7)
 	if (tf->tf_spsr & PSR_T_bit)
 		return 1;
 #endif
 	if (code != FAULT_USER)
 		return 1;
 	/*
 @@ -148,41 +144,41 @@ cp15_trapper(u_int addr, u_int insn, str
 		return 1;
 	/*
 	 * Get a pointer to the register used in the instruction to be emulated.
 	 */
 	register_t * const regp = &tf->tf_r0 + regno;
 	/*
 	 * Handle MRC p15, 0, <Rd>, c13, c0, 3 (Read User read-only thread id)
 	 */
 	if ((insn & 0xffff0fff) == 0xee1d0f70) {
 		*regp = (uintptr_t)l->l_private;
 		tf->tf_pc += INSN_SIZE;
-		cp15_ev.ev_count++;
+		curcpu()->ci_und_cp15_ev.ev_count++;
 		return 0;
+	}
 	/*
 	 * Handle {MRC,MCR} p15, 0, <Rd>, c13, c0, 2 (User read/write thread id)
 	 */
 	if ((insn & 0xffef0fff) == 0xee0d0f50) {
 		struct pcb * const pcb = lwp_getpcb(l);
 		if (insn & 0x00100000)
 			*regp = pcb->pcb_user_pid_rw;
 		else
 			pcb->pcb_user_pid_rw = *regp;
 		tf->tf_pc += INSN_SIZE;
-		cp15_ev.ev_count++;
+		curcpu()->ci_und_cp15_ev.ev_count++;
 		return 0;
+	}
 	return 1;
+}
 static int
 gdb_trapper(u_int addr, u_int insn, struct trapframe *tf, int code)
+{
 	struct lwp * const l = curlwp;
 #ifdef THUMB_CODE
 	if (tf->tf_spsr & PSR_T_bit) {
 @@ -272,45 +268,41 @@ undefined_init(void)
 	/* Install handler for CP15 emulation */
 	cp15_uh.uh_handler = cp15_trapper;
 	install_coproc_handler_static(SYSTEM_COPROC, &cp15_uh);
 	/* Install handler for GDB breakpoints */
 	gdb_uh.uh_handler = gdb_trapper;
 	install_coproc_handler_static(CORE_UNKNOWN_HANDLER, &gdb_uh);
 #ifdef THUMB_CODE
 	gdb_uh_thumb.uh_handler = gdb_trapper;
 	install_coproc_handler_static(THUMB_UNKNOWN_HANDLER, &gdb_uh_thumb);
 #endif
+}
 static struct evcnt und_ev =
     EVCNT_INITIALIZER(EVCNT_TYPE_TRAP, NULL, "cpu0", "undefined insn traps");
 EVCNT_ATTACH_STATIC(und_ev);
 void
 undefinedinstruction(trapframe_t *tf)
+{
 	struct lwp *l;
 	vaddr_t fault_pc;
 	int fault_instruction;
 	int fault_code;
 	int coprocessor;
 	int user;
 	struct undefined_handler *uh;
 #ifdef VERBOSE_ARM32
 	int s;
 #endif
-	und_ev.ev_count++;
+	curcpu()->ci_und_ev.ev_count++;
 #ifdef KDTRACE_HOOKS
 	if ((tf->tf_spsr & PSR_MODE) != PSR_USR32_MODE) {
 		tf->tf_pc -= INSN_SIZE;
 		if (dtrace_trapper(tf->tf_pc, tf) == 0)
 			return;
 		tf->tf_pc += INSN_SIZE; /* Reset for the rest code */
+	}
 #endif
 	/* Enable interrupts if they were enabled before the exception. */
 #ifdef acorn26
 	if ((tf->tf_r15 & R15_IRQ_DISABLE) == 0)