mirrors/Bochs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- fixed handling of parameter "debug_running" for restart support

Browse Source 
- wx: delete of "debugCommand" fixed
This commit is contained in:
Volker Ruppert 2006-09-17 07:12:50 +00:00
parent 4c1e82f18c
commit ec9c361e9c
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
bochs/bx_debug/dbg_main.cc
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: dbg_main.cc,v 1.76 2006-08-31 18:18:14 sshwarts Exp $
// $Id: dbg_main.cc,v 1.77 2006-09-17 07:12:50 vruppert Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2001 MandrakeSoft S.A.
@ -52,7 +52,7 @@ unsigned dbg_cpu = 0;
extern const char* cpu_mode_string(unsigned cpu_mode);
bx_param_bool_c *sim_running;
static bx_param_bool_c *sim_running = NULL;
static char bx_debug_rc_fname[BX_MAX_PATH];
static char tmp_buf[512];
@ -212,11 +212,14 @@ int bx_dbg_main(int argc, char *argv[])
// create a boolean parameter that will tell if the simulation is
// running (continue command) or waiting for user response. This affects
// some parts of the GUI.
bx_list_c *base = (bx_list_c*) SIM->get_param("general");
sim_running = new bx_param_bool_c(base,
"debug_running",
"Simulation is running", "", 0);
if (sim_running == NULL) {
bx_list_c *base = (bx_list_c*) SIM->get_param("general");
sim_running = new bx_param_bool_c(base,
"debug_running",
"Simulation is running", "", 0);
} else {
sim_running->set(0);
}
// setup Ctrl-C handler
if (!SIM->is_wx_selected()) {
signal(SIGINT, bx_debug_ctrlc_handler);

7
bochs/gui/wxmain.cc
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////
// $Id: wxmain.cc,v 1.148 2006-09-10 09:13:47 vruppert Exp $
// $Id: wxmain.cc,v 1.149 2006-09-17 07:12:50 vruppert Exp $
/////////////////////////////////////////////////////////////////
//
// wxmain.cc implements the wxWidgets frame, toolbar, menus, and dialogs.
@ -867,7 +867,7 @@ void
MyFrame::DebugBreak()
{
if (debugCommand) {
delete debugCommand;
delete [] debugCommand;
debugCommand = NULL;
}
wxASSERT(showDebugLog != NULL);
@ -892,7 +892,7 @@ MyFrame::DebugCommand(const char *cmd)
if (debugCommand != NULL) {
// one is already waiting
wxLogDebug(wxT("multiple debugger commands, discarding the earlier one"));
delete debugCommand;
delete [] debugCommand;
debugCommand = NULL;
}
int len = strlen(cmd);
@ -1084,6 +1084,7 @@ void MyFrame::OnKillSim(wxCommandEvent& WXUNUSED(event))
// the sim_thread may be waiting for a debugger command. If so, send
// it a "quit"
DebugCommand("quit");
debugCommand = NULL;
#endif
if (sim_thread) {
wxBochsStopSim = true;