[src/netbsd-1-4]: src/sys/arch/x68k/x68k Pull up revision 1.34 (requested by ...

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

details:   https://anonhg.NetBSD.org/src/rev/0baeab661296
branches:  netbsd-1-4
changeset: 469743:0baeab661296
user:      he <he%NetBSD.org@localhost>
date:      Sun Nov 21 15:44:41 1999 +0000

description:
Pull up revision 1.34 (requested by itohy):
  Fix the problem where single-step tracing of a trap instruction
  makes the system fall into kernel debugger.

diffstat:

 sys/arch/x68k/x68k/trap.c |  9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diffs (39 lines):

diff -r a1fb7708c519 -r 0baeab661296 sys/arch/x68k/x68k/trap.c
--- a/sys/arch/x68k/x68k/trap.c Sun Nov 21 15:44:19 1999 +0000
+++ b/sys/arch/x68k/x68k/trap.c Sun Nov 21 15:44:41 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: trap.c,v 1.31.2.1 1999/06/20 19:36:29 perry Exp $      */
+/*     $NetBSD: trap.c,v 1.31.2.2 1999/11/21 15:44:41 he Exp $ */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -510,10 +510,9 @@
         * SUN 3.x traps get passed through as T_TRAP15 and are not really
         * supported yet.
         *
-        * XXX: We should never get kernel-mode T_TRACE or T_TRAP15
+        * XXX: We should never get kernel-mode T_TRAP15
         * XXX: because locore.s now gives them special treatment.
         */
-       case T_TRACE:           /* kernel trace trap */
        case T_TRAP15:          /* kernel breakpoint */
 #ifdef DEBUG
                printf("unexpected kernel trace trap, type = %d\n", type);
@@ -523,7 +522,6 @@
                return;
 
        case T_TRACE|T_USER:    /* user trace trap */
-       case T_TRAP15|T_USER:   /* SUN user trace trap */
 #ifdef COMPAT_SUNOS
                /*
                 * SunOS uses Trap #2 for a "CPU cache flush".
@@ -535,6 +533,9 @@
                        return;
                }
 #endif
+               /* FALLTHROUGH */
+       case T_TRACE:           /* tracing a trap instruction */
+       case T_TRAP15|T_USER:   /* SUN user trace trap */
                frame.f_sr &= ~PSL_T;
                i = SIGTRAP;
                break;