[src/trunk]: src/sys/arch/powerpc/powerpc s/SSR/SRR

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

details:   https://anonhg.NetBSD.org/src/rev/38d41f7b5bb8
branches:  trunk
changeset: 553902:38d41f7b5bb8
user:      matt <matt%NetBSD.org@localhost>
date:      Wed Oct 22 17:29:18 2003 +0000

description:
s/SSR/SRR

diffstat:

 sys/arch/powerpc/powerpc/trap.c |  22 ++++++++++++++--------
 1 files changed, 14 insertions(+), 8 deletions(-)

diffs (79 lines):

diff -r 8bb095649ebd -r 38d41f7b5bb8 sys/arch/powerpc/powerpc/trap.c
--- a/sys/arch/powerpc/powerpc/trap.c   Wed Oct 22 17:27:58 2003 +0000
+++ b/sys/arch/powerpc/powerpc/trap.c   Wed Oct 22 17:29:18 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: trap.c,v 1.91 2003/10/17 19:56:18 matt Exp $   */
+/*     $NetBSD: trap.c,v 1.92 2003/10/22 17:29:18 matt Exp $   */
 
 /*
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.91 2003/10/17 19:56:18 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.92 2003/10/22 17:29:18 matt Exp $");
 
 #include "opt_altivec.h"
 #include "opt_ddb.h"
@@ -87,8 +87,14 @@
 
        ci->ci_ev_traps.ev_count++;
 
-       if (frame->srr1 & PSL_PR)
+       if (frame->srr1 & PSL_PR) {
                type |= EXC_USER;
+#ifdef DIAGNOSTIC
+               if (l == NULL || p == NULL)
+                       panic("trap: user trap %d with lwp = %p, proc = %p",
+                           type, l, p);
+#endif
+       }
 
        uvmexp.traps++;
 
@@ -356,7 +362,7 @@
                KERNEL_PROC_LOCK(l);
                if (cpu_printfataltraps) {
                        printf("trap: pid %d.%d (%s): user VEC trap @ %#lx "
-                           "(SSR1=%#lx)\n",
+                           "(SRR1=%#lx)\n",
                            p->p_pid, l->l_lid, p->p_comm,
                            frame->srr0, frame->srr1);
                }
@@ -374,7 +380,7 @@
                KERNEL_PROC_LOCK(l);
                if (cpu_printfataltraps) {
                        printf("trap: pid %d (%s): user MCHK trap @ %#lx "
-                           "(SSR1=%#lx)\n",
+                           "(SRR1=%#lx)\n",
                            p->p_pid, p->p_comm, frame->srr0, frame->srr1);
                }
                KSI_INIT_TRAP(&ksi);
@@ -404,7 +410,7 @@
                } else {
                        if (cpu_printfataltraps)
                                printf("trap: pid %d.%d (%s): user PGM trap @"
-                                   " %#lx (SSR1=%#lx)\n", p->p_pid, l->l_lid,
+                                   " %#lx (SRR1=%#lx)\n", p->p_pid, l->l_lid,
                                    p->p_comm, frame->srr0, frame->srr1);
                        KSI_INIT_TRAP(&ksi);
                        ksi.ksi_signo = SIGILL;
@@ -436,7 +442,7 @@
                        return;
                }
                printf("trap: pid %d.%d (%s): kernel MCHK trap @"
-                   " %#lx (SSR1=%#lx)\n", p->p_pid, l->l_lid,
+                   " %#lx (SRR1=%#lx)\n", p->p_pid, l->l_lid,
                    p->p_comm, frame->srr0, frame->srr1);
                goto brain_damage2;
        }
@@ -447,7 +453,7 @@
                goto brain_damage2;
        case EXC_PGM:
                printf("trap: pid %d.%d (%s): kernel PGM trap @"
-                   " %#lx (SSR1=%#lx)\n", p->p_pid, l->l_lid,
+                   " %#lx (SRR1=%#lx)\n", p->p_pid, l->l_lid,
                    p->p_comm, frame->srr0, frame->srr1);
                goto brain_damage2;