From 715966bf8adb1f06117b0690700bed09936230f4 Mon Sep 17 00:00:00 2001 From: yokota Date: Tue, 11 Jan 2000 14:54:01 +0000 Subject: 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 --- sys/amd64/amd64/trap.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'sys/amd64/amd64/trap.c') 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 -#ifdef DDB - extern int in_Debugger, debugger_on_panic; -#endif +#include #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); -- cgit v1.1