summaryrefslogtreecommitdiffstats
path: root/sys/amd64/amd64/trap.c
diff options
context:
space:
mode:
authoryokota <yokota@FreeBSD.org>2000-01-11 14:54:01 +0000
committeryokota <yokota@FreeBSD.org>2000-01-11 14:54:01 +0000
commit715966bf8adb1f06117b0690700bed09936230f4 (patch)
tree43bfbc350096f38a69febf5012643dcc32e4077e /sys/amd64/amd64/trap.c
parentddf2890cdfae4bd1cd3a719341689d029d64b580 (diff)
downloadFreeBSD-src-715966bf8adb1f06117b0690700bed09936230f4.zip
FreeBSD-src-715966bf8adb1f06117b0690700bed09936230f4.tar.gz
Add a new mechanism, cndbctl(), to tell the console driver that
ddb is entered. Don't refer to `in_Debugger' to see if we are in the debugger. (The variable used to be static in Debugger() and wasn't updated if ddb is entered via traps and panic anyway.) - Don't refer to `in_Debugger'. - Add `db_active' to i386/i386/db_interface.d (as in alpha/alpha/db_interface.c). - Remove cnpollc() stub from ddb/db_input.c. - Add the dbctl function to syscons, pcvt, and sio. (The function for pcvt and sio is noop at the moment.) Jointly developed by: bde and me (The final version was tweaked by me and not reviewed by bde. Thus, if there is any error in this commit, that is entirely of mine, not his.) Some changes were obtained from: NetBSD
Diffstat (limited to 'sys/amd64/amd64/trap.c')
-rw-r--r--sys/amd64/amd64/trap.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/sys/amd64/amd64/trap.c b/sys/amd64/amd64/trap.c
index e1bfac4..4199346 100644
--- a/sys/amd64/amd64/trap.c
+++ b/sys/amd64/amd64/trap.c
@@ -90,9 +90,7 @@
#include <machine/vm86.h>
-#ifdef DDB
- extern int in_Debugger, debugger_on_panic;
-#endif
+#include <ddb/ddb.h>
#include "isa.h"
#include "npx.h"
@@ -900,7 +898,7 @@ trap_fatal(frame, eva)
return;
#endif
#ifdef DDB
- if ((debugger_on_panic || in_Debugger) && kdb_trap(type, 0, frame))
+ if ((debugger_on_panic || db_active) && kdb_trap(type, 0, frame))
return;
#endif
printf("trap number = %d\n", type);
OpenPOWER on IntegriCloud