[src/netbsd-2]: src/sys/arch/acorn26/acorn26 Pull up following revision(s) (r...

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

details:   https://anonhg.NetBSD.org/src/rev/2f3de88690d5
branches:  netbsd-2
changeset: 564544:2f3de88690d5
user:      bouyer <bouyer%NetBSD.org@localhost>
date:      Sun Oct 15 16:00:51 2006 +0000

description:
Pull up following revision(s) (requested by bjh21 in ticket #10717):
        sys/arch/acorn26/acorn26/cpuswitch.c: revision 1.8
When processing RASes, only pay attention to, and change, the PC parts of R15,
leaving the PSR bits alone.  Necessary to make regress/sys/kern/ras/ras1 pass.

diffstat:

 sys/arch/acorn26/acorn26/cpuswitch.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (30 lines):

diff -r 54f5073ebae2 -r 2f3de88690d5 sys/arch/acorn26/acorn26/cpuswitch.c
--- a/sys/arch/acorn26/acorn26/cpuswitch.c      Sun Oct 15 15:55:53 2006 +0000
+++ b/sys/arch/acorn26/acorn26/cpuswitch.c      Sun Oct 15 16:00:51 2006 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cpuswitch.c,v 1.5 2003/11/07 10:41:55 he Exp $ */
+/*     $NetBSD: cpuswitch.c,v 1.5.6.1 2006/10/15 16:00:51 bouyer Exp $ */
 
 /*
  * Copyright (c) 2000 Ben Harris.
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpuswitch.c,v 1.5 2003/11/07 10:41:55 he Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpuswitch.c,v 1.5.6.1 2006/10/15 16:00:51 bouyer Exp $");
 
 #include "opt_lockdebug.h"
 
@@ -126,9 +126,9 @@
                struct trapframe *tf = l2->l_addr->u_pcb.pcb_tf;
                caddr_t pc;
 
-               pc = ras_lookup(p2, (caddr_t) tf->tf_pc);
+               pc = ras_lookup(p2, (caddr_t)(tf->tf_r15 & R15_PC));
                if (pc != (caddr_t) -1)
-                       tf->tf_pc = (register_t) pc;
+                       tf->tf_r15 = (tf->tf_r15 & ~R15_PC) | (register_t) pc;
        }
 
        cpu_loswitch(&l1->l_addr->u_pcb.pcb_sf, l2->l_addr->u_pcb.pcb_sf);