[src/nathanw_sa]: src/sys/arch/powerpc/powerpc Sync with HEAD.

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

details:   https://anonhg.NetBSD.org/src/rev/0ff3831f720f
branches:  nathanw_sa
changeset: 506670:0ff3831f720f
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Sat Jan 04 23:51:18 2003 +0000

description:
Sync with HEAD.

diffstat:

 sys/arch/powerpc/powerpc/db_interface.c |  20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

diffs (41 lines):

diff -r d4321e6aeb54 -r 0ff3831f720f sys/arch/powerpc/powerpc/db_interface.c
--- a/sys/arch/powerpc/powerpc/db_interface.c   Sat Jan 04 18:56:44 2003 +0000
+++ b/sys/arch/powerpc/powerpc/db_interface.c   Sat Jan 04 23:51:18 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: db_interface.c,v 1.12.6.7 2002/12/29 19:35:06 thorpej Exp $ */
+/*     $NetBSD: db_interface.c,v 1.12.6.8 2003/01/04 23:51:18 thorpej Exp $ */
 /*     $OpenBSD: db_interface.c,v 1.2 1996/12/28 06:21:50 rahnds Exp $ */
 
 #define USERACC
@@ -69,22 +69,22 @@
 ddb_trap_glue(frame)
        struct trapframe *frame;
 {
-#ifndef PPC_IBM4XX
-       if (!(frame->srr1 & PSL_PR)
-           && (frame->exc == EXC_TRC || frame->exc == EXC_RUNMODETRC
-               || (frame->exc == EXC_PGM
-                   && (frame->srr1 & 0x20000))
-               || frame->exc == EXC_BPT)) {
+#ifdef PPC_IBM4XX
+       if ((frame->srr1 & PSL_PR) == 0)
+               return kdb_trap(frame->exc, frame);
+#else /* PPC_MPC6XX */
+       if ((frame->srr1 & PSL_PR) == 0 &&
+           (frame->exc == EXC_TRC || frame->exc == EXC_RUNMODETRC ||
+            (frame->exc == EXC_PGM && (frame->srr1 & 0x20000)) ||
+            frame->exc == EXC_BPT)) {
                int type = frame->exc;
                if (type == EXC_PGM && (frame->srr1 & 0x20000)) {
                        type = T_BREAKPOINT;
                }
                return kdb_trap(type, frame);
        }
+#endif
        return 0;
-#else
-       return kdb_trap(frame->exc, frame);
-#endif
 }
 
 int