mirrors
/
Bochs
mirror of https://github.com/bochs-emu/Bochs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- add new log action when debugger is on, which is to continue but 

return to the debugger ASAP.
This commit is contained in:
Bryce Denney 2001-10-06 05:51:34 +00:00
parent 5d129b827e
commit 4e22b9a5db
2 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
bochs/gui/control.cc
View File

@ -1,10 +1,10 @@
/////////////////////////////////////////////////////////////////////////
// $Id: control.cc,v 1.31 2001-10-03 13:10:37 bdenney Exp $
// $Id: control.cc,v 1.32 2001-10-06 05:51:34 bdenney Exp $
/////////////////////////////////////////////////////////////////////////
//
/*
* gui/control.cc
* $Id: control.cc,v 1.31 2001-10-03 13:10:37 bdenney Exp $
* $Id: control.cc,v 1.32 2001-10-06 05:51:34 bdenney Exp $
*
* This is code for a text-mode control panel. Note that this file
* does NOT include bochs.h. Instead, it does all of its contact with
@ -594,15 +594,8 @@ int bx_write_rc (char *rc)
}
}
/*
A panic has occurred. Do you want to:
cont - continue execution
alwayscont - continue execution, and do not ask again
die - stop execution now
*/
char *log_action_ask_choices[] = { "cont", "alwayscont", "die" };
int log_action_n_choices = 3;
char *log_action_ask_choices[] = { "cont", "alwayscont", "die", "debug" };
int log_action_n_choices = 3 + (BX_DEBUGGER?1:0);
int control_panel_notify_callback (int code)
{
@ -622,11 +615,14 @@ int control_panel_notify_callback (int code)
fprintf (stderr, " alwayscont - continue execution, and don't ask again.\n");
fprintf (stderr, " This affects only %s events from device %s\n", SIM->get_log_level_name (level), prefix);
fprintf (stderr, " die - stop execution now\n");
#if BX_DEBUGGER
fprintf (stderr, " debug - continue and return to debugger\n");
#endif
int choice;
if (ask_menu ("Choose cont, alwayscont, or die. [%s] ", 3,
log_action_ask_choices, 2, &choice) < 0)
if (ask_menu ("Choose cont, alwayscont, or die. [%s] ",
log_action_n_choices, log_action_ask_choices, 2, &choice) < 0)
return SIM->notify_return(-1);
// return 0 for continue, 1 for alwayscontinue, 2 for die.
// return 0 for continue, 1 for alwayscontinue, 2 for die, 3 for debug.
SIM->notify_return(choice);
}
break;

13
bochs/logio.cc
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: logio.cc,v 1.7 2001-10-03 13:10:37 bdenney Exp $
// $Id: logio.cc,v 1.8 2001-10-06 05:51:34 bdenney Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2001 MandrakeSoft S.A.
@ -354,6 +354,17 @@ logfunctions::ask (int level, char *prefix, char *fmt, va_list ap)
break;
case 2: // user chose die
fatal (prefix, fmt, ap);
#if BX_DEBUGGER
case 3:
// user chose debugger. To "drop into the debugger" we just set the
// interrupt_requested bit and continue execution. Before the next
// instruction, it should notice the user interrupt and return to
// the debugger.
bx_guard.interrupt_requested = 1;
break;
#endif
default:
fprintf (stderr, "WARNING: LOCAL_log_msg returned unexpected value %d\n", val);
}
}