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

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

details:   https://anonhg.NetBSD.org/src/rev/71ac3ca8829a
branches:  netbsd-1-4
changeset: 470066:71ac3ca8829a
user:      he <he%NetBSD.org@localhost>
date:      Sun Jan 16 17:54:40 2000 +0000

description:
Pull up revision 1.28 (requested by assar):
  Make sure that DDB isn't invoked on bad traps when db_onpanic=0.

diffstat:

 sys/arch/i386/i386/db_interface.c |  13 ++++++-------
 1 files changed, 6 insertions(+), 7 deletions(-)

diffs (40 lines):

diff -r 8bafdb88a4bd -r 71ac3ca8829a sys/arch/i386/i386/db_interface.c
--- a/sys/arch/i386/i386/db_interface.c Sun Jan 16 17:47:56 2000 +0000
+++ b/sys/arch/i386/i386/db_interface.c Sun Jan 16 17:54:40 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: db_interface.c,v 1.24.8.2 1999/04/12 21:27:04 pk Exp $ */
+/*     $NetBSD: db_interface.c,v 1.24.8.3 2000/01/16 17:54:40 he Exp $ */
 
 /* 
  * Mach Operating System
@@ -50,7 +50,7 @@
 #include <ddb/db_extern.h>
 #include <ddb/db_access.h>
 #include <ddb/db_output.h>
-
+#include <ddb/ddbvar.h>
 
 extern label_t *db_recover;
 extern char *trap_type[];
@@ -85,17 +85,16 @@
 {
        int s;
 
-#if 0
-       if ((boothowto&RB_KDB) == 0)
-               return(0);
-#endif
-
        switch (type) {
        case T_BPTFLT:  /* breakpoint */
        case T_TRCTRAP: /* single_step */
+       case T_NMI:     /* NMI */
        case -1:        /* keyboard interrupt */
                break;
        default:
+               if (!db_onpanic)
+                       return (0);
+
                kdbprinttrap(type, code);
                if (db_recover != 0) {
                        db_error("Faulted in DDB; continuing...\n");