 @@ -1,14 +1,14 @@
-/*	$NetBSD: trap.c,v 1.1.2.1 2011/01/07 01:26:19 matt Exp $	*/
+/*	$NetBSD: trap.c,v 1.1.2.2 2011/01/07 15:14:23 matt Exp $	*/
 /*-
  * Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Raytheon BBN Technologies Corp and Defense Advanced Research Projects
  * Agency and which was developed by Matt Thomas of 3am Software Foundry.
+ *
  * This material is based upon work supported by the Defense Advanced Research
  * Projects Agency and Space and Naval Warfare Systems Center, Pacific, under
  * Contract No. N66001-09-C-2073.
  * Approved for Public Release, Distribution Unlimited
+ *
 @@ -29,46 +29,48 @@
  * 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_ddb.h"
 #include "opt_sa.h"
 #include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: trap.c,v 1.1.2.1 2011/01/07 01:26:19 matt Exp $");
+__KERNEL_RCSID(1, "$NetBSD: trap.c,v 1.1.2.2 2011/01/07 15:14:23 matt Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/siginfo.h>
 #include <sys/user.h>
 #include <sys/lwp.h>
 #include <sys/proc.h>
 #include <sys/cpu.h>
 #ifdef KERN_SA
 #include <sys/savar.h>
 #endif
 #include <sys/kauth.h>
 #include <sys/kmem.h>
 #include <sys/ras.h>
 #include <uvm/uvm_extern.h>
 #include <powerpc/pcb.h>
 #include <powerpc/userret.h>
 #include <powerpc/psl.h>
 #include <powerpc/instr.h>
 #include <powerpc/spr.h>
 #include <powerpc/booke/spr.h>
 #include <powerpc/db_machdep.h>
 #include <ddb/db_interface.h>
 #include <powerpc/trap.h>
 #include <powerpc/booke/trap.h>
 #include <powerpc/booke/pte.h>
 void trap(enum ppc_booke_exceptions, struct trapframe *);
 static void dump_trapframe(const struct trapframe *);
 @@ -375,48 +377,84 @@ itlb_exception(struct trapframe *tf, ksi
 	    usertrap);
 	if (__predict_false(rv != 0 && usertrap)) {
 		ci->ci_ev_isi_fatal.ev_count++;
 		KSI_INIT_TRAP(ksi);
 		ksi->ksi_signo = SIGSEGV;
 		ksi->ksi_trap = EXC_ISI;
 		ksi->ksi_code = (rv == EACCES ? SEGV_ACCERR : SEGV_MAPERR);
 		ksi->ksi_addr = (void *)tf->tf_srr0;
+	}
 	return rv;
+}
 static bool
 emulate_opcode(struct trapframe *tf, ksiginfo_t *ksi)
+{
 	uint32_t opcode;
         if (copyin((void *)tf->tf_srr0, &opcode, sizeof(opcode)) != 0)
 		return false;
 	if (opcode == OPC_LWSYNC)
 		return true;
 	if (OPC_MFSPR_P(opcode, SPR_PVR)) {
 		__asm ("mfpvr %0" : "=r"(tf->tf_fixreg[OPC_MFSPR_REG(opcode)]));
 		return true;
+	}
 	/*
 	 * If we bothered to emulate FP, we would try to do so here.
 	 */
 	return false;
+}
 static int
 pgm_exception(struct trapframe *tf, ksiginfo_t *ksi)
+{
 	struct cpu_info * const ci = curcpu();
 	int rv = EPERM;
-	if (rv != 0 && usertrap_p(tf)) {
+	if (!usertrap_p(tf))
-		ci->ci_ev_pgm.ev_count++;
+		return rv;
 		KSI_INIT_TRAP(ksi);
-		ksi->ksi_signo = SIGILL;
+	ci->ci_ev_pgm.ev_count++;
 		ksi->ksi_trap = EXC_PGM;
-		if (tf->tf_esr & ESR_PIL)
+	if (tf->tf_esr & ESR_PTR) {
-			ksi->ksi_code = ILL_ILLOPC;
+		struct proc *p = curlwp->l_proc;
-		else if (tf->tf_esr & ESR_PPR)
+		if (p->p_raslist != NULL
-			ksi->ksi_code = ILL_PRVOPC;
+		    && ras_lookup(p, (void *)tf->tf_srr0) != (void *) -1) {
-		else if (tf->tf_esr & ESR_PTR)
+			tf->tf_srr0 += 4;
-			ksi->ksi_code = ILL_ILLTRP;
+			return 0;
 		else
-			ksi->ksi_code = 0;
+	} else if (tf->tf_esr & (ESR_PIL|ESR_PPR)) {
-		ksi->ksi_addr = (void *)tf->tf_srr0;
+		if (emulate_opcode(tf, ksi)) {
 			tf->tf_srr0 += 4;
 			return 0;
+		}
+	}
 	KSI_INIT_TRAP(ksi);
 	ksi->ksi_signo = SIGILL;
 	ksi->ksi_trap = EXC_PGM;
 	if (tf->tf_esr & ESR_PIL)
 		ksi->ksi_code = ILL_ILLOPC;
 	else if (tf->tf_esr & ESR_PPR)
 		ksi->ksi_code = ILL_PRVOPC;
 	else if (tf->tf_esr & ESR_PTR)
 		ksi->ksi_code = ILL_ILLTRP;
 	else
 		ksi->ksi_code = 0;
 	ksi->ksi_addr = (void *)tf->tf_srr0;
 	return rv;
+}
 static int
 ali_exception(struct trapframe *tf, ksiginfo_t *ksi)
+{
 	struct cpu_info * const ci = curcpu();
 	int rv = EFAULT;
 	ci->ci_ev_ali.ev_count++;
 	if (rv != 0 && usertrap_p(tf)) {
 		ci->ci_ev_ali_fatal.ev_count++;