2002-08-28 07:20:23 +04:00
|
|
|
////////////////////////////////////////////////////////////////////
|
2011-02-25 01:05:47 +03:00
|
|
|
// $Id$
|
2002-08-28 07:20:23 +04:00
|
|
|
////////////////////////////////////////////////////////////////////
|
2013-02-11 01:26:51 +04:00
|
|
|
//
|
2021-01-21 21:10:40 +03:00
|
|
|
// Copyright (C) 2002-2021 The Bochs Project
|
2013-02-11 01:26:51 +04:00
|
|
|
//
|
2014-01-04 00:46:59 +04:00
|
|
|
// This library is free software; you can redistribute it and/or
|
|
|
|
// modify it under the terms of the GNU Lesser General Public
|
|
|
|
// License as published by the Free Software Foundation; either
|
|
|
|
// version 2 of the License, or (at your option) any later version.
|
|
|
|
//
|
|
|
|
// This library is distributed in the hope that it will be useful,
|
|
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
|
// Lesser General Public License for more details.
|
|
|
|
//
|
|
|
|
// You should have received a copy of the GNU Lesser General Public
|
|
|
|
// License along with this library; if not, write to the Free Software
|
|
|
|
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
|
|
|
//
|
|
|
|
/////////////////////////////////////////////////////////////////
|
|
|
|
|
2004-10-03 13:11:28 +04:00
|
|
|
// wxWidgets dialogs for Bochs
|
2002-08-28 07:20:23 +04:00
|
|
|
|
2002-08-30 11:03:50 +04:00
|
|
|
#include <wx/spinctrl.h>
|
2008-12-18 12:55:09 +03:00
|
|
|
#include <wx/notebook.h>
|
2002-08-28 19:27:26 +04:00
|
|
|
|
2002-08-30 03:18:10 +04:00
|
|
|
////////////////////////////////////////////////////////////////////
|
|
|
|
// text messages used in several places
|
|
|
|
////////////////////////////////////////////////////////////////////
|
2006-03-18 19:30:52 +03:00
|
|
|
#define MSG_NO_HELP wxT("No help is available yet.")
|
|
|
|
#define MSG_NO_HELP_CAPTION wxT("No help")
|
|
|
|
#define BTNLABEL_HELP wxT("Help")
|
|
|
|
#define BTNLABEL_CANCEL wxT("Cancel")
|
|
|
|
#define BTNLABEL_OK wxT("Ok")
|
2014-01-12 23:27:01 +04:00
|
|
|
#define BTNLABEL_CLOSE wxT("Close")
|
2006-03-18 19:30:52 +03:00
|
|
|
#define BTNLABEL_CREATE_IMG wxT("Create Image")
|
|
|
|
#define BTNLABEL_BROWSE wxT("<--Browse")
|
2002-09-03 00:13:52 +04:00
|
|
|
|
2002-09-03 21:48:21 +04:00
|
|
|
#if defined(WIN32)
|
|
|
|
// On win32, apparantly the spinctrl depends on a native control which only
|
|
|
|
// has a 16bit signed value. If you try to set the max above 32767, it
|
|
|
|
// overflows and does stupid things.
|
|
|
|
#define SPINCTRL_FIX_MAX(x) ((x)>32767 ? 32767 : (x))
|
|
|
|
#else
|
|
|
|
#define SPINCTRL_FIX_MAX(x) x
|
|
|
|
#endif
|
|
|
|
|
2002-09-03 00:13:52 +04:00
|
|
|
// utility function prototype
|
2006-03-11 13:00:56 +03:00
|
|
|
void ChangeStaticText(wxSizer *sizer, wxStaticText *win, wxString newtext);
|
|
|
|
bool CreateImage(int harddisk, int sectors, const char *filename);
|
|
|
|
void SetTextCtrl(wxTextCtrl *text, const char *format, int val);
|
2006-03-18 19:30:52 +03:00
|
|
|
int GetTextCtrlInt(wxTextCtrl *text, bool *valid = NULL, bool complain=false, wxString complaint = wxT("Invalid integer!"));
|
2006-03-11 13:00:56 +03:00
|
|
|
bool BrowseTextCtrl(wxTextCtrl *text,
|
2006-03-18 19:30:52 +03:00
|
|
|
wxString prompt= wxT("Choose a file"),
|
2014-12-23 22:30:03 +03:00
|
|
|
long style=wxFD_OPEN);
|
2006-03-11 13:00:56 +03:00
|
|
|
wxChoice *makeLogOptionChoiceBox(wxWindow *parent, wxWindowID id, int evtype, bool includeNoChange = false);
|
2002-08-30 03:18:10 +04:00
|
|
|
|
2002-08-28 07:20:23 +04:00
|
|
|
////////////////////////////////////////////////////////////////////
|
|
|
|
// LogMsgAskDialog is a modal dialog box that shows the user a
|
2008-02-06 01:57:43 +03:00
|
|
|
// simulation error message and asks if they want to continue or
|
2002-08-28 07:20:23 +04:00
|
|
|
// not. It looks something like this:
|
|
|
|
//
|
2002-09-02 21:03:14 +04:00
|
|
|
// +----- PANIC ---------------------------------------------------+
|
|
|
|
// | |
|
|
|
|
// | Context: Hard Drive |
|
|
|
|
// | Message: could not open hard drive image file '30M.sample' |
|
|
|
|
// | |
|
|
|
|
// | [ ] Don't ask about future messages like this |
|
|
|
|
// | |
|
|
|
|
// | [Continue] [Die] [Dump Core] [Debugger] [Help] |
|
|
|
|
// +---------------------------------------------------------------+
|
2002-08-28 07:20:23 +04:00
|
|
|
//
|
|
|
|
// To use this dialog:
|
|
|
|
// After constructor, use SetContext, SetMessage, EnableButton to
|
|
|
|
// determine what will be displayed. Then call n = ShowModal(). The return
|
|
|
|
// value tells which button was pressed (button_t types). Call GetDontAsk()
|
|
|
|
// to see if they checked "Don't ask about..." or not.
|
|
|
|
//////////////////////////////////////////////////////////////////////
|
|
|
|
|
|
|
|
class LogMsgAskDialog: public wxDialog
|
|
|
|
{
|
|
|
|
public:
|
|
|
|
enum button_t {
|
2008-02-06 01:57:43 +03:00
|
|
|
CONT=0, DIE, DUMP, DEBUG, HELP,
|
|
|
|
N_BUTTONS /* number of entries in enum */
|
2002-08-28 07:20:23 +04:00
|
|
|
};
|
|
|
|
#define LOG_MSG_ASK_IDS \
|
2002-08-28 11:54:53 +04:00
|
|
|
{ ID_Continue, ID_Die, ID_DumpCore, ID_Debugger, wxHELP }
|
2002-08-28 07:20:23 +04:00
|
|
|
#define LOG_MSG_ASK_NAMES \
|
2006-03-18 19:30:52 +03:00
|
|
|
{ wxT("Continue"), wxT("Kill Sim"), wxT("Dump Core"), wxT("Debugger"), wxT("Help") }
|
2002-08-28 07:20:23 +04:00
|
|
|
#define LOG_MSG_DONT_ASK_STRING \
|
2006-03-18 19:30:52 +03:00
|
|
|
wxT("Don't ask about future messages like this")
|
2006-09-03 15:06:54 +04:00
|
|
|
#define LOG_MSG_CONTEXT wxT("Context: ")
|
|
|
|
#define LOG_MSG_MSG wxT("Message: ")
|
2002-08-28 07:20:23 +04:00
|
|
|
private:
|
|
|
|
wxStaticText *context, *message;
|
|
|
|
wxCheckBox *dontAsk;
|
|
|
|
bool enabled[N_BUTTONS];
|
|
|
|
wxBoxSizer *btnSizer, *vertSizer;
|
2006-03-19 18:35:20 +03:00
|
|
|
void Init(); // called automatically by ShowModal()
|
|
|
|
void ShowHelp();
|
2002-08-28 07:20:23 +04:00
|
|
|
public:
|
|
|
|
LogMsgAskDialog(wxWindow* parent,
|
|
|
|
wxWindowID id,
|
|
|
|
const wxString& title);
|
2006-03-19 18:35:20 +03:00
|
|
|
void EnableButton(button_t btn, bool en) { enabled[(int)btn] = en; }
|
|
|
|
void SetContext(wxString s);
|
|
|
|
void SetMessage(wxString s);
|
|
|
|
bool GetDontAsk() { return dontAsk->GetValue(); }
|
|
|
|
void OnEvent(wxCommandEvent& event);
|
2002-08-28 07:20:23 +04:00
|
|
|
int ShowModal() { Init(); return wxDialog::ShowModal(); }
|
|
|
|
DECLARE_EVENT_TABLE()
|
|
|
|
};
|
|
|
|
|
2002-09-19 08:52:03 +04:00
|
|
|
////////////////////////////////////////////////////////////////////////////
|
|
|
|
// AdvancedLogOptionsDialog
|
|
|
|
////////////////////////////////////////////////////////////////////////////
|
|
|
|
// +---- Advanced event configuration -----------------------+
|
|
|
|
// | |
|
|
|
|
// | Log file is [_____________________________] [ Browse ] |
|
|
|
|
// | |
|
|
|
|
// | This table determines how Bochs will respond to each |
|
|
|
|
// | kind of event coming from a particular source. For |
|
|
|
|
// | example if you are having problems with the keyboard, |
|
|
|
|
// | you could ask for debug and info events from the |
|
|
|
|
// | keyboard to be reported. |
|
|
|
|
// | |
|
2002-09-20 21:53:14 +04:00
|
|
|
// | [Use defaults for all devices] |
|
2002-09-19 08:52:03 +04:00
|
|
|
// | |
|
|
|
|
// | +---------------------------------------------------+-+ |
|
|
|
|
// | |Device Debug Info Error Panic |^| |
|
|
|
|
// | |-------- -------- ------- -------- --------- ||| |
|
|
|
|
// | |Keyboard [ignore] [ignore] [report] [report] ||| |
|
|
|
|
// | |VGA [ignore] [ignore] [report] [report] ||| |
|
|
|
|
// | |NE2000 [ignore] [ignore] [report] [report] ||| |
|
|
|
|
// | |Sound [ignore] [ignore] [report] [report] |v| |
|
|
|
|
// | +-----------------------------------------------------+ |
|
|
|
|
// | |
|
|
|
|
// | [ Help ] [ Cancel ] [ Ok ] |
|
|
|
|
// +-------------------------------------------------------+-+
|
2008-02-06 01:57:43 +03:00
|
|
|
//
|
2002-09-19 08:52:03 +04:00
|
|
|
class AdvancedLogOptionsDialog: public wxDialog
|
|
|
|
{
|
|
|
|
private:
|
2006-03-18 19:30:52 +03:00
|
|
|
#define ADVLOG_OPTS_TITLE wxT("Configure Log Events")
|
|
|
|
#define ADVLOG_OPTS_LOGFILE wxT("Log file")
|
|
|
|
#define ADVLOG_OPTS_PROMPT wxT( \
|
2002-09-19 08:52:03 +04:00
|
|
|
"This table determines how Bochs will respond to each kind of event coming\n" \
|
|
|
|
"from a particular source. For example if you are having problems with\n" \
|
|
|
|
"the keyboard, you could ask for debug and info events from the keyboard\n" \
|
2006-03-18 19:30:52 +03:00
|
|
|
"to be reported.")
|
2011-10-01 16:48:48 +04:00
|
|
|
#define ADVLOG_OPTS_TYPE_NAMES { wxT("Debug"), wxT("Info"), wxT("Error"), wxT("Panic") }
|
|
|
|
#define ADVLOG_OPTS_N_TYPES 4
|
2006-03-18 19:30:52 +03:00
|
|
|
#define ADVLOG_DEFAULTS wxT("Use defaults for all devices")
|
2006-03-19 18:35:20 +03:00
|
|
|
void Init(); // called automatically by ShowModal()
|
|
|
|
void ShowHelp();
|
2002-09-19 08:52:03 +04:00
|
|
|
wxBoxSizer *vertSizer, *logfileSizer, *buttonSizer;
|
|
|
|
wxScrolledWindow *scrollWin;
|
|
|
|
wxPanel *scrollPanel;
|
2006-03-26 19:52:31 +04:00
|
|
|
wxGridSizer *headerSizer, *gridSizer;
|
2002-09-19 08:52:03 +04:00
|
|
|
wxTextCtrl *logfile;
|
|
|
|
wxButton *applyDefault;
|
2002-09-20 21:53:14 +04:00
|
|
|
// 2d array of wxChoice pointers. Each wxChoice* is action[dev][type].
|
|
|
|
wxChoice* **action;
|
2014-01-04 00:46:59 +04:00
|
|
|
bool runtime;
|
2002-09-19 08:52:03 +04:00
|
|
|
public:
|
|
|
|
AdvancedLogOptionsDialog(wxWindow* parent, wxWindowID id);
|
2002-09-20 21:53:14 +04:00
|
|
|
~AdvancedLogOptionsDialog();
|
2006-03-19 18:35:20 +03:00
|
|
|
void OnEvent(wxCommandEvent& event);
|
2002-09-19 08:52:03 +04:00
|
|
|
int ShowModal() { Init(); return wxDialog::ShowModal(); }
|
2006-03-19 18:35:20 +03:00
|
|
|
void SetLogfile(wxString f) { logfile->SetValue(f); }
|
|
|
|
wxString GetLogfile() { return logfile->GetValue(); }
|
|
|
|
void CopyParamToGui();
|
|
|
|
void CopyGuiToParam();
|
|
|
|
void SetAction(int dev, int evtype, int act);
|
|
|
|
int GetAction(int dev, int evtype);
|
2014-01-04 00:46:59 +04:00
|
|
|
void SetRuntimeFlag(bool val) { runtime = val; }
|
2002-09-19 08:52:03 +04:00
|
|
|
DECLARE_EVENT_TABLE()
|
|
|
|
};
|
|
|
|
|
2012-02-21 16:00:54 +04:00
|
|
|
////////////////////////////////////////////////////////////////////////////
|
|
|
|
// PluginControlDialog
|
|
|
|
////////////////////////////////////////////////////////////////////////////
|
|
|
|
class PluginControlDialog: public wxDialog
|
|
|
|
{
|
|
|
|
private:
|
|
|
|
void Init(); // called automatically by ShowModal()
|
|
|
|
void ShowHelp();
|
2021-01-21 21:10:40 +03:00
|
|
|
wxBoxSizer *vertSizer, *horzSizer, *buttonSizer;
|
|
|
|
wxBoxSizer *leftSizer, *centerSizer, *rightSizer;
|
|
|
|
wxStaticText *plugtxt1, *plugtxt2;
|
|
|
|
wxListBox *pluglist1, *pluglist2;
|
2012-02-21 16:00:54 +04:00
|
|
|
wxButton *btn_load, *btn_unload;
|
|
|
|
public:
|
|
|
|
PluginControlDialog(wxWindow* parent, wxWindowID id);
|
|
|
|
~PluginControlDialog() {}
|
|
|
|
void OnEvent(wxCommandEvent& event);
|
|
|
|
int ShowModal() { Init(); return wxDialog::ShowModal(); }
|
|
|
|
DECLARE_EVENT_TABLE()
|
|
|
|
};
|
|
|
|
|
2014-01-12 23:27:01 +04:00
|
|
|
////////////////////////////////////////////////////////////////////////////
|
|
|
|
// LogViewDialog
|
|
|
|
////////////////////////////////////////////////////////////////////////////
|
|
|
|
class LogViewDialog: public wxDialog
|
|
|
|
{
|
|
|
|
private:
|
|
|
|
wxBoxSizer *mainSizer, *logSizer, *buttonSizer;
|
|
|
|
wxTextCtrl *log;
|
|
|
|
Bit32u lengthMax;
|
|
|
|
Bit32u lengthTolerance;
|
|
|
|
#define LOG_VIEW_DEFAULT_LENGTH_MAX (400*80)
|
|
|
|
#define LOG_VIEW_DEFAULT_TOLERANCE (200*80)
|
|
|
|
void CheckLogLength();
|
|
|
|
public:
|
|
|
|
LogViewDialog(wxWindow* parent, wxWindowID id);
|
|
|
|
~LogViewDialog() {}
|
|
|
|
void Init();
|
|
|
|
bool Show(bool val);
|
2014-01-13 22:03:40 +04:00
|
|
|
void AppendText(int level, wxString msg);
|
2014-01-12 23:27:01 +04:00
|
|
|
void OnEvent(wxCommandEvent& event);
|
|
|
|
DECLARE_EVENT_TABLE()
|
|
|
|
};
|
|
|
|
|
- add generic dialog class called ParamDialog. You create it, call
a method to add the parameters (bx_param_c) that you want to edit,
and display it. It knows how to display and edit boolean, int,
enum, and string, so it can do a reasonable job on any parameter.
The end result is not as nice as a box that you lay out by hand, but
it's decent. The most obvious thing that's missing from
ParamDialog-generated dialogs is that I haven't found a way to
make an "Enable" button that enables/disables a bunch of other
parameters. I'll keep thinking about that.
- using ParamDialog, I made dialogs for Sound, Cmos, Serial/Parallel,
32bitOSloader, and an ugly catch-all category called other.
Now I believe you can edit every single option using wxWindows.
2002-09-03 09:32:49 +04:00
|
|
|
////////////////////////////////////////////////////////////////////////////
|
|
|
|
// ParamDialog is a general purpose dialog box that displays and edits
|
|
|
|
// any combination of parameters. It's always made up of a
|
|
|
|
// wxFlexGridSizer with three columns. Each parameter takes up one row.
|
|
|
|
// Column 1 shows the name of the parameter, column 2 shows the value of
|
|
|
|
// the parameter in some sort of control that can be edited. Column 3
|
|
|
|
// is used for anything that needs to appear to the right of the data, for
|
|
|
|
// example a Browse button on a filename control. Several buttons including
|
|
|
|
// Cancel and Ok will appear at the bottom.
|
|
|
|
//
|
|
|
|
// This will allow editing of all the miscellaneous parameters which do
|
|
|
|
// not need to be laid out by hand.
|
- add infrastructure for sending commands from the wxWindows interface to the
Bochs debugger. The Bochs debugger calls SIM->debug_get_next_command() which
does not return until a debugger command is found. The siminterface sends an
synchronous event to the wxWindows thread with a blank to be filled in with a
debugger command. wxWindows fills in the blank and sends the synchronous
event back, and the Bochs debugger interprets it as if it was typed on
the command line. For the long term I haven't decided whether to stick with
sending text strings vs. some other method.
- so far the wxWindows debugger consists of one big dialog box that shows
all the standard registers, and a working Continue, Stop, and Step button.
- modify ParamDialog so that it is more useful as a base class, by moving
some things to protected members&fields, separating out functionality
that is most likely to be replaced into virtual functions, and making it
generally more flexible. The new CpuRegistersDialog is based on
ParamDialog.
- in wxdialog.cc, continue the convention of using wxID_HELP, wxID_OK,
wxID_CANCEL, etc. for the id's of buttons, instead of wxHELP, wxOK, etc.
which are intended to be ORred together in a bit field.
- cpu/init.cc: put ifdefs around DEFPARAMs for flags in configurations
where they don't exist. Add an eflags shadow parameter that represents all
of the bits of eflags at once. There are also boolean shadow params for
each bit.
- modified files: cpu/init.cc debug/dbg_main.cc debug/debug.h
gui/siminterface.cc gui/siminterface.h gui/wxdialog.cc gui/wxdialog.h
gui/wxmain.cc gui/wxmain.h
2002-09-13 23:39:38 +04:00
|
|
|
//
|
|
|
|
// NOTES:
|
|
|
|
// Right now, there is always one wxFlexGridSizer with three columns
|
|
|
|
// where the fields go. It is possible to create a new wxFlexGridSizer
|
|
|
|
// and make that one the default. This is used when handling a bx_list_c
|
|
|
|
// parameter.
|
- add generic dialog class called ParamDialog. You create it, call
a method to add the parameters (bx_param_c) that you want to edit,
and display it. It knows how to display and edit boolean, int,
enum, and string, so it can do a reasonable job on any parameter.
The end result is not as nice as a box that you lay out by hand, but
it's decent. The most obvious thing that's missing from
ParamDialog-generated dialogs is that I haven't found a way to
make an "Enable" button that enables/disables a bunch of other
parameters. I'll keep thinking about that.
- using ParamDialog, I made dialogs for Sound, Cmos, Serial/Parallel,
32bitOSloader, and an ugly catch-all category called other.
Now I believe you can edit every single option using wxWindows.
2002-09-03 09:32:49 +04:00
|
|
|
////////////////////////////////////////////////////////////////////////////
|
2002-09-21 01:25:09 +04:00
|
|
|
|
|
|
|
struct ParamStruct : public wxObject {
|
|
|
|
bx_param_c *param;
|
|
|
|
int id;
|
2002-09-23 00:56:12 +04:00
|
|
|
wxStaticText *label;
|
2002-09-21 01:25:09 +04:00
|
|
|
union _u_tag {
|
- fixed up ParamDialog to correctly handle "trees" of parameters. A
bx_list_c can now be displayed as either a wxStaticBox with the
child parameters inside, or as a wxNotebook with each child
parameter in a separate tab. (The children can also be lists of
course.) The default display is the wxStaticBox type, but if you
set the option bit bx_list_c::USE_TAB_WINDOW in the list,
ParamDialog will use the wxNotebook display instead.
- to get the param trees working, I created a new struct
AddParamContext, which is passed to AddParam(). This struct is
critical when AddParam calls itself recursively to display lists
within lists.
- use the wxNotebook display feature for the ATA0,1,2,3 controller
dialog box. Now instead of being hundreds of pixels tall, it is
reasonable height with three different tabs. This fixed bug
#619074: "wx: ATA interface editor too tall" and was the whole
reason I started messing with this at all.
plus some minor cleanups
- when I added the enum constant bx_list_c::USE_TAB_WINDOW, I also
removed the BX_ prefix from all the other enum constants that are
used in parameter options in siminterface.cc. Since these constants
are enums within a class, there is no possibility of namespace
conflicts so the prefix is not needed.
- added wxADJUST_MINSIZE to all wxChoice controls, since that tells
wxWindows to adjust its size to the length of the longest string.
- instead of calling SetSize or SetSizeHints on every textcontrol with
a hardcoded width, I am using just two wxSize specifications for
everything: either normalTextSize or longTextSize.
- edit names of a few menus and params. For example now instead of
the tab saying "Master ATA device on channel 0" it will say
"First HD/CD on channel 0".
Modified Files:
main.cc gui/control.cc gui/gui.cc gui/siminterface.cc gui/siminterface.h
gui/wxdialog.cc gui/wxdialog.h gui/wxmain.cc
2002-10-06 06:37:28 +04:00
|
|
|
void *ptr;
|
2002-09-21 01:25:09 +04:00
|
|
|
wxWindow *window;
|
|
|
|
wxChoice *choice;
|
|
|
|
wxTextCtrl *text;
|
2003-09-06 02:07:54 +04:00
|
|
|
wxSpinCtrl *spin;
|
2002-09-21 01:25:09 +04:00
|
|
|
wxCheckBox *checkbox;
|
2002-09-23 00:56:12 +04:00
|
|
|
wxStaticBox *staticbox;
|
- fixed up ParamDialog to correctly handle "trees" of parameters. A
bx_list_c can now be displayed as either a wxStaticBox with the
child parameters inside, or as a wxNotebook with each child
parameter in a separate tab. (The children can also be lists of
course.) The default display is the wxStaticBox type, but if you
set the option bit bx_list_c::USE_TAB_WINDOW in the list,
ParamDialog will use the wxNotebook display instead.
- to get the param trees working, I created a new struct
AddParamContext, which is passed to AddParam(). This struct is
critical when AddParam calls itself recursively to display lists
within lists.
- use the wxNotebook display feature for the ATA0,1,2,3 controller
dialog box. Now instead of being hundreds of pixels tall, it is
reasonable height with three different tabs. This fixed bug
#619074: "wx: ATA interface editor too tall" and was the whole
reason I started messing with this at all.
plus some minor cleanups
- when I added the enum constant bx_list_c::USE_TAB_WINDOW, I also
removed the BX_ prefix from all the other enum constants that are
used in parameter options in siminterface.cc. Since these constants
are enums within a class, there is no possibility of namespace
conflicts so the prefix is not needed.
- added wxADJUST_MINSIZE to all wxChoice controls, since that tells
wxWindows to adjust its size to the length of the longest string.
- instead of calling SetSize or SetSizeHints on every textcontrol with
a hardcoded width, I am using just two wxSize specifications for
everything: either normalTextSize or longTextSize.
- edit names of a few menus and params. For example now instead of
the tab saying "Master ATA device on channel 0" it will say
"First HD/CD on channel 0".
Modified Files:
main.cc gui/control.cc gui/gui.cc gui/siminterface.cc gui/siminterface.h
gui/wxdialog.cc gui/wxdialog.h gui/wxmain.cc
2002-10-06 06:37:28 +04:00
|
|
|
wxNotebook *notebook;
|
2002-09-21 01:25:09 +04:00
|
|
|
} u;
|
|
|
|
int browseButtonId; // only for filename params
|
|
|
|
wxButton *browseButton; // only for filename params
|
|
|
|
ParamStruct() { param = NULL; u.window = NULL; browseButton = NULL; }
|
|
|
|
};
|
|
|
|
|
- fixed up ParamDialog to correctly handle "trees" of parameters. A
bx_list_c can now be displayed as either a wxStaticBox with the
child parameters inside, or as a wxNotebook with each child
parameter in a separate tab. (The children can also be lists of
course.) The default display is the wxStaticBox type, but if you
set the option bit bx_list_c::USE_TAB_WINDOW in the list,
ParamDialog will use the wxNotebook display instead.
- to get the param trees working, I created a new struct
AddParamContext, which is passed to AddParam(). This struct is
critical when AddParam calls itself recursively to display lists
within lists.
- use the wxNotebook display feature for the ATA0,1,2,3 controller
dialog box. Now instead of being hundreds of pixels tall, it is
reasonable height with three different tabs. This fixed bug
#619074: "wx: ATA interface editor too tall" and was the whole
reason I started messing with this at all.
plus some minor cleanups
- when I added the enum constant bx_list_c::USE_TAB_WINDOW, I also
removed the BX_ prefix from all the other enum constants that are
used in parameter options in siminterface.cc. Since these constants
are enums within a class, there is no possibility of namespace
conflicts so the prefix is not needed.
- added wxADJUST_MINSIZE to all wxChoice controls, since that tells
wxWindows to adjust its size to the length of the longest string.
- instead of calling SetSize or SetSizeHints on every textcontrol with
a hardcoded width, I am using just two wxSize specifications for
everything: either normalTextSize or longTextSize.
- edit names of a few menus and params. For example now instead of
the tab saying "Master ATA device on channel 0" it will say
"First HD/CD on channel 0".
Modified Files:
main.cc gui/control.cc gui/gui.cc gui/siminterface.cc gui/siminterface.h
gui/wxdialog.cc gui/wxdialog.h gui/wxmain.cc
2002-10-06 06:37:28 +04:00
|
|
|
// This context structure is used by AddParam to keep track of where the
|
|
|
|
// next parameter's controls should be added. When AddParam is called on
|
|
|
|
// a list of parameters (bx_list_c), it calls itself recursively to add
|
|
|
|
// the child parameters, which in turn could be lists as well. When it
|
|
|
|
// calls itself recursively, it will create a new AddParamContext so that
|
|
|
|
// the various children can be added in the right place.
|
|
|
|
struct AddParamContext {
|
|
|
|
int depth;
|
|
|
|
wxWindow *parent;
|
|
|
|
wxBoxSizer *vertSizer;
|
|
|
|
wxFlexGridSizer *gridSizer;
|
|
|
|
};
|
|
|
|
|
|
|
|
|
2008-02-06 01:57:43 +03:00
|
|
|
class ParamDialog: public wxDialog
|
- add generic dialog class called ParamDialog. You create it, call
a method to add the parameters (bx_param_c) that you want to edit,
and display it. It knows how to display and edit boolean, int,
enum, and string, so it can do a reasonable job on any parameter.
The end result is not as nice as a box that you lay out by hand, but
it's decent. The most obvious thing that's missing from
ParamDialog-generated dialogs is that I haven't found a way to
make an "Enable" button that enables/disables a bunch of other
parameters. I'll keep thinking about that.
- using ParamDialog, I made dialogs for Sound, Cmos, Serial/Parallel,
32bitOSloader, and an ugly catch-all category called other.
Now I believe you can edit every single option using wxWindows.
2002-09-03 09:32:49 +04:00
|
|
|
{
|
|
|
|
private:
|
2006-03-08 21:10:41 +03:00
|
|
|
void ShowHelp();
|
|
|
|
int genId();
|
- add infrastructure for sending commands from the wxWindows interface to the
Bochs debugger. The Bochs debugger calls SIM->debug_get_next_command() which
does not return until a debugger command is found. The siminterface sends an
synchronous event to the wxWindows thread with a blank to be filled in with a
debugger command. wxWindows fills in the blank and sends the synchronous
event back, and the Bochs debugger interprets it as if it was typed on
the command line. For the long term I haven't decided whether to stick with
sending text strings vs. some other method.
- so far the wxWindows debugger consists of one big dialog box that shows
all the standard registers, and a working Continue, Stop, and Step button.
- modify ParamDialog so that it is more useful as a base class, by moving
some things to protected members&fields, separating out functionality
that is most likely to be replaced into virtual functions, and making it
generally more flexible. The new CpuRegistersDialog is based on
ParamDialog.
- in wxdialog.cc, continue the convention of using wxID_HELP, wxID_OK,
wxID_CANCEL, etc. for the id's of buttons, instead of wxHELP, wxOK, etc.
which are intended to be ORred together in a bit field.
- cpu/init.cc: put ifdefs around DEFPARAMs for flags in configurations
where they don't exist. Add an eflags shadow parameter that represents all
of the bits of eflags at once. There are also boolean shadow params for
each bit.
- modified files: cpu/init.cc debug/dbg_main.cc debug/debug.h
gui/siminterface.cc gui/siminterface.h gui/wxdialog.cc gui/wxdialog.h
gui/wxmain.cc gui/wxmain.h
2002-09-13 23:39:38 +04:00
|
|
|
bool isShowing;
|
|
|
|
int nbuttons;
|
2003-09-02 23:34:48 +04:00
|
|
|
bool runtime;
|
- add infrastructure for sending commands from the wxWindows interface to the
Bochs debugger. The Bochs debugger calls SIM->debug_get_next_command() which
does not return until a debugger command is found. The siminterface sends an
synchronous event to the wxWindows thread with a blank to be filled in with a
debugger command. wxWindows fills in the blank and sends the synchronous
event back, and the Bochs debugger interprets it as if it was typed on
the command line. For the long term I haven't decided whether to stick with
sending text strings vs. some other method.
- so far the wxWindows debugger consists of one big dialog box that shows
all the standard registers, and a working Continue, Stop, and Step button.
- modify ParamDialog so that it is more useful as a base class, by moving
some things to protected members&fields, separating out functionality
that is most likely to be replaced into virtual functions, and making it
generally more flexible. The new CpuRegistersDialog is based on
ParamDialog.
- in wxdialog.cc, continue the convention of using wxID_HELP, wxID_OK,
wxID_CANCEL, etc. for the id's of buttons, instead of wxHELP, wxOK, etc.
which are intended to be ORred together in a bit field.
- cpu/init.cc: put ifdefs around DEFPARAMs for flags in configurations
where they don't exist. Add an eflags shadow parameter that represents all
of the bits of eflags at once. There are also boolean shadow params for
each bit.
- modified files: cpu/init.cc debug/dbg_main.cc debug/debug.h
gui/siminterface.cc gui/siminterface.h gui/wxdialog.cc gui/wxdialog.h
gui/wxmain.cc gui/wxmain.h
2002-09-13 23:39:38 +04:00
|
|
|
protected:
|
2013-12-08 15:32:13 +04:00
|
|
|
wxBoxSizer *mainSizer, *buttonSizer, *infoSizer;
|
2004-10-03 13:11:28 +04:00
|
|
|
// hash table that maps the ID of a wxWidgets control (e.g. wxChoice,
|
2002-09-03 12:53:41 +04:00
|
|
|
// wxTextCtrl) to the associated ParamStruct object. Data in the hash table
|
|
|
|
// is of ParamStruct*.
|
|
|
|
wxHashTable *idHash;
|
2006-03-19 18:35:20 +03:00
|
|
|
// map parameter ID onto ParamStruct.
|
2002-09-03 12:53:41 +04:00
|
|
|
wxHashTable *paramHash;
|
2006-03-08 21:10:41 +03:00
|
|
|
virtual void EnableChanged();
|
|
|
|
void EnableChanged(ParamStruct *pstr);
|
2009-03-20 19:23:46 +03:00
|
|
|
void EnableParam(int param_id, bool enabled);
|
|
|
|
void ProcessDependentList(ParamStruct *pstrChanged, bool enabled);
|
2006-03-08 21:10:41 +03:00
|
|
|
bool CopyGuiToParam();
|
2009-04-05 12:33:27 +04:00
|
|
|
bool CopyGuiToParam(bx_param_c *param);
|
2009-03-28 01:22:07 +03:00
|
|
|
bool isGeneratedId(int id);
|
- add generic dialog class called ParamDialog. You create it, call
a method to add the parameters (bx_param_c) that you want to edit,
and display it. It knows how to display and edit boolean, int,
enum, and string, so it can do a reasonable job on any parameter.
The end result is not as nice as a box that you lay out by hand, but
it's decent. The most obvious thing that's missing from
ParamDialog-generated dialogs is that I haven't found a way to
make an "Enable" button that enables/disables a bunch of other
parameters. I'll keep thinking about that.
- using ParamDialog, I made dialogs for Sound, Cmos, Serial/Parallel,
32bitOSloader, and an ugly catch-all category called other.
Now I believe you can edit every single option using wxWindows.
2002-09-03 09:32:49 +04:00
|
|
|
public:
|
|
|
|
ParamDialog(wxWindow* parent, wxWindowID id);
|
2002-09-21 01:25:09 +04:00
|
|
|
virtual ~ParamDialog();
|
2006-03-08 21:10:41 +03:00
|
|
|
void OnEvent(wxCommandEvent& event);
|
2002-09-14 02:03:05 +04:00
|
|
|
wxButton* AddButton(int id, wxString label);
|
2006-03-08 21:10:41 +03:00
|
|
|
virtual void AddDefaultButtons();
|
|
|
|
virtual void Init(); // called automatically by ShowModal()
|
- apply a patch I've been working on
- modified files: config.h.in cpu/init.cc debug/dbg_main.cc gui/control.cc
gui/siminterface.cc gui/siminterface.h gui/wxdialog.cc gui/wxdialog.h
gui/wxmain.cc gui/wxmain.h iodev/keyboard.cc
----------------------------------------------------------------------
Patch name: patch.wx-show-cpu2
Author: Bryce Denney
Date: Fri Sep 6 12:13:28 EDT 2002
Description:
Second try at implementing the "Debug:Show Cpu" and "Debug:Show
Keyboard" dialog with values that change as the simulation proceeds.
(Nobody gets to see the first try.) This is the first step toward
making something resembling a wxWindows debugger.
First, variables which are going to be visible in the CI must be
registered as parameters. For some variables, it might be acceptable
to change them from Bit32u into bx_param_num_c and access them only
with set/get methods, but for most variables it would be a horrible
pain and wreck performance.
To deal with this, I introduced the concept of a shadow parameter. A
normal parameter has its value stored inside the struct, but a shadow
parameter has only a pointer to the value. Shadow params allow you to
treat any variable as if it was a parameter, without having to change
its type and access it using get/set methods. Of course, a shadow
param's value is controlled by someone else, so it can change at any
time.
To demonstrate and test the registration of shadow parameters, I
added code in cpu/init.cc to register a few CPU registers and
code in iodev/keyboard.cc to register a few keyboard state values.
Now these parameters are visible in the Debug:Show CPU and
Debug:Show Keyboard dialog boxes.
The Debug:Show* dialog boxes are created by the ParamDialog class,
which already understands how to display each type of parameter,
including the new shadow parameters (because they are just a subclass
of a normal parameter class). I have added a ParamDialog::Refresh()
method, which rereads the value from every parameter that it is
displaying and changes the displayed value. At the moment, in the
Debug:Show CPU dialog, changing the values has no effect. However
this is trivial to add when it's time (just call CommitChanges!). It
wouldn't really make sense to change the values unless you have paused
the simulation, for example when single stepping with the debugger.
The Refresh() method must be called periodically or else the dialog
will show the initial values forever. At the moment, Refresh() is
called when the simulator sends an async event called
BX_ASYNC_EVT_REFRESH, created by a call to SIM->refresh_ci ().
Details:
- implement shadow parameter class for Bit32s, called bx_shadow_num_c.
implement shadow parameter class for Boolean, called bx_shadow_bool_c.
more to follow (I need one for every type!)
- now the simulator thread can request that the config interface refresh
its display. For now, the refresh event causes the CI to check every
parameter it is watching and change the display value. Later, it may
be worth the trouble to keep track of which parameters have actually
changed. Code in the simulator thread calls SIM->refresh_ci(), which
creates an async event called BX_ASYNC_EVT_REFRESH and sends it to
the config interface. When it arrives in the wxWindows gui thread,
it calls RefreshDialogs(), which calls the Refresh() method on any
dialogs that might need it.
- in the debugger, SIM->refresh_ci() is called before every prompt
is printed. Otherwise, the refresh would wait until the next
SIM->periodic(), which might be thousands of cycles. This way,
when you're single stepping, the dialogs update with every step.
- To improve performance, the CI has a flag (MyFrame::WantRefresh())
which tells whether it has any need for refresh events. If no
dialogs are showing that need refresh events, then no event is sent
between threads.
- add a few defaults to the param classes that affect the settings of
newly created parameters. When declaring a lot of params with
similar settings it's more compact to set the default for new params
rather than to change each one separately. default_text_format is
the printf format string for displaying numbers. default_base is
the default base for displaying numbers (0, 16, 2, etc.)
- I added to ParamDialog to make it able to display modeless dialog
boxes such as "Debug:Show CPU". The new Refresh() method queries
all the parameters for their current value and changes the value in
the wxWindows control. The ParamDialog class still needs a little
work; for example, if it's modal it should have Cancel/Ok buttons,
but if it's going to be modeless it should maybe have Apply (commit
any changes) and Close.
2002-09-06 20:43:26 +04:00
|
|
|
int ShowModal() {
|
2008-02-06 01:57:43 +03:00
|
|
|
Init();
|
- apply a patch I've been working on
- modified files: config.h.in cpu/init.cc debug/dbg_main.cc gui/control.cc
gui/siminterface.cc gui/siminterface.h gui/wxdialog.cc gui/wxdialog.h
gui/wxmain.cc gui/wxmain.h iodev/keyboard.cc
----------------------------------------------------------------------
Patch name: patch.wx-show-cpu2
Author: Bryce Denney
Date: Fri Sep 6 12:13:28 EDT 2002
Description:
Second try at implementing the "Debug:Show Cpu" and "Debug:Show
Keyboard" dialog with values that change as the simulation proceeds.
(Nobody gets to see the first try.) This is the first step toward
making something resembling a wxWindows debugger.
First, variables which are going to be visible in the CI must be
registered as parameters. For some variables, it might be acceptable
to change them from Bit32u into bx_param_num_c and access them only
with set/get methods, but for most variables it would be a horrible
pain and wreck performance.
To deal with this, I introduced the concept of a shadow parameter. A
normal parameter has its value stored inside the struct, but a shadow
parameter has only a pointer to the value. Shadow params allow you to
treat any variable as if it was a parameter, without having to change
its type and access it using get/set methods. Of course, a shadow
param's value is controlled by someone else, so it can change at any
time.
To demonstrate and test the registration of shadow parameters, I
added code in cpu/init.cc to register a few CPU registers and
code in iodev/keyboard.cc to register a few keyboard state values.
Now these parameters are visible in the Debug:Show CPU and
Debug:Show Keyboard dialog boxes.
The Debug:Show* dialog boxes are created by the ParamDialog class,
which already understands how to display each type of parameter,
including the new shadow parameters (because they are just a subclass
of a normal parameter class). I have added a ParamDialog::Refresh()
method, which rereads the value from every parameter that it is
displaying and changes the displayed value. At the moment, in the
Debug:Show CPU dialog, changing the values has no effect. However
this is trivial to add when it's time (just call CommitChanges!). It
wouldn't really make sense to change the values unless you have paused
the simulation, for example when single stepping with the debugger.
The Refresh() method must be called periodically or else the dialog
will show the initial values forever. At the moment, Refresh() is
called when the simulator sends an async event called
BX_ASYNC_EVT_REFRESH, created by a call to SIM->refresh_ci ().
Details:
- implement shadow parameter class for Bit32s, called bx_shadow_num_c.
implement shadow parameter class for Boolean, called bx_shadow_bool_c.
more to follow (I need one for every type!)
- now the simulator thread can request that the config interface refresh
its display. For now, the refresh event causes the CI to check every
parameter it is watching and change the display value. Later, it may
be worth the trouble to keep track of which parameters have actually
changed. Code in the simulator thread calls SIM->refresh_ci(), which
creates an async event called BX_ASYNC_EVT_REFRESH and sends it to
the config interface. When it arrives in the wxWindows gui thread,
it calls RefreshDialogs(), which calls the Refresh() method on any
dialogs that might need it.
- in the debugger, SIM->refresh_ci() is called before every prompt
is printed. Otherwise, the refresh would wait until the next
SIM->periodic(), which might be thousands of cycles. This way,
when you're single stepping, the dialogs update with every step.
- To improve performance, the CI has a flag (MyFrame::WantRefresh())
which tells whether it has any need for refresh events. If no
dialogs are showing that need refresh events, then no event is sent
between threads.
- add a few defaults to the param classes that affect the settings of
newly created parameters. When declaring a lot of params with
similar settings it's more compact to set the default for new params
rather than to change each one separately. default_text_format is
the printf format string for displaying numbers. default_base is
the default base for displaying numbers (0, 16, 2, etc.)
- I added to ParamDialog to make it able to display modeless dialog
boxes such as "Debug:Show CPU". The new Refresh() method queries
all the parameters for their current value and changes the value in
the wxWindows control. The ParamDialog class still needs a little
work; for example, if it's modal it should have Cancel/Ok buttons,
but if it's going to be modeless it should maybe have Apply (commit
any changes) and Close.
2002-09-06 20:43:26 +04:00
|
|
|
isShowing = true;
|
2008-02-06 01:57:43 +03:00
|
|
|
int ret = wxDialog::ShowModal();
|
- apply a patch I've been working on
- modified files: config.h.in cpu/init.cc debug/dbg_main.cc gui/control.cc
gui/siminterface.cc gui/siminterface.h gui/wxdialog.cc gui/wxdialog.h
gui/wxmain.cc gui/wxmain.h iodev/keyboard.cc
----------------------------------------------------------------------
Patch name: patch.wx-show-cpu2
Author: Bryce Denney
Date: Fri Sep 6 12:13:28 EDT 2002
Description:
Second try at implementing the "Debug:Show Cpu" and "Debug:Show
Keyboard" dialog with values that change as the simulation proceeds.
(Nobody gets to see the first try.) This is the first step toward
making something resembling a wxWindows debugger.
First, variables which are going to be visible in the CI must be
registered as parameters. For some variables, it might be acceptable
to change them from Bit32u into bx_param_num_c and access them only
with set/get methods, but for most variables it would be a horrible
pain and wreck performance.
To deal with this, I introduced the concept of a shadow parameter. A
normal parameter has its value stored inside the struct, but a shadow
parameter has only a pointer to the value. Shadow params allow you to
treat any variable as if it was a parameter, without having to change
its type and access it using get/set methods. Of course, a shadow
param's value is controlled by someone else, so it can change at any
time.
To demonstrate and test the registration of shadow parameters, I
added code in cpu/init.cc to register a few CPU registers and
code in iodev/keyboard.cc to register a few keyboard state values.
Now these parameters are visible in the Debug:Show CPU and
Debug:Show Keyboard dialog boxes.
The Debug:Show* dialog boxes are created by the ParamDialog class,
which already understands how to display each type of parameter,
including the new shadow parameters (because they are just a subclass
of a normal parameter class). I have added a ParamDialog::Refresh()
method, which rereads the value from every parameter that it is
displaying and changes the displayed value. At the moment, in the
Debug:Show CPU dialog, changing the values has no effect. However
this is trivial to add when it's time (just call CommitChanges!). It
wouldn't really make sense to change the values unless you have paused
the simulation, for example when single stepping with the debugger.
The Refresh() method must be called periodically or else the dialog
will show the initial values forever. At the moment, Refresh() is
called when the simulator sends an async event called
BX_ASYNC_EVT_REFRESH, created by a call to SIM->refresh_ci ().
Details:
- implement shadow parameter class for Bit32s, called bx_shadow_num_c.
implement shadow parameter class for Boolean, called bx_shadow_bool_c.
more to follow (I need one for every type!)
- now the simulator thread can request that the config interface refresh
its display. For now, the refresh event causes the CI to check every
parameter it is watching and change the display value. Later, it may
be worth the trouble to keep track of which parameters have actually
changed. Code in the simulator thread calls SIM->refresh_ci(), which
creates an async event called BX_ASYNC_EVT_REFRESH and sends it to
the config interface. When it arrives in the wxWindows gui thread,
it calls RefreshDialogs(), which calls the Refresh() method on any
dialogs that might need it.
- in the debugger, SIM->refresh_ci() is called before every prompt
is printed. Otherwise, the refresh would wait until the next
SIM->periodic(), which might be thousands of cycles. This way,
when you're single stepping, the dialogs update with every step.
- To improve performance, the CI has a flag (MyFrame::WantRefresh())
which tells whether it has any need for refresh events. If no
dialogs are showing that need refresh events, then no event is sent
between threads.
- add a few defaults to the param classes that affect the settings of
newly created parameters. When declaring a lot of params with
similar settings it's more compact to set the default for new params
rather than to change each one separately. default_text_format is
the printf format string for displaying numbers. default_base is
the default base for displaying numbers (0, 16, 2, etc.)
- I added to ParamDialog to make it able to display modeless dialog
boxes such as "Debug:Show CPU". The new Refresh() method queries
all the parameters for their current value and changes the value in
the wxWindows control. The ParamDialog class still needs a little
work; for example, if it's modal it should have Cancel/Ok buttons,
but if it's going to be modeless it should maybe have Apply (commit
any changes) and Close.
2002-09-06 20:43:26 +04:00
|
|
|
isShowing = false;
|
|
|
|
return ret;
|
|
|
|
}
|
2006-03-19 18:35:20 +03:00
|
|
|
bool Show(bool val) { isShowing = val; return wxDialog::Show(val); }
|
2006-03-08 21:10:41 +03:00
|
|
|
void AddParam(bx_param_c *param, wxFlexGridSizer *sizer, bool plain = false);
|
|
|
|
void AddParam(bx_param_c *param, bool plain = false, AddParamContext *context = NULL);
|
2008-12-18 12:55:09 +03:00
|
|
|
void AddParamList(const char *nameList[], bx_param_c *base, wxFlexGridSizer *sizer = NULL, bool plain = false);
|
2006-03-08 21:10:41 +03:00
|
|
|
virtual void CopyParamToGui();
|
|
|
|
bool IsShowing() { return isShowing; }
|
2003-09-02 23:34:48 +04:00
|
|
|
void SetRuntimeFlag(bool val) { runtime = val; }
|
- add generic dialog class called ParamDialog. You create it, call
a method to add the parameters (bx_param_c) that you want to edit,
and display it. It knows how to display and edit boolean, int,
enum, and string, so it can do a reasonable job on any parameter.
The end result is not as nice as a box that you lay out by hand, but
it's decent. The most obvious thing that's missing from
ParamDialog-generated dialogs is that I haven't found a way to
make an "Enable" button that enables/disables a bunch of other
parameters. I'll keep thinking about that.
- using ParamDialog, I made dialogs for Sound, Cmos, Serial/Parallel,
32bitOSloader, and an ugly catch-all category called other.
Now I believe you can edit every single option using wxWindows.
2002-09-03 09:32:49 +04:00
|
|
|
DECLARE_EVENT_TABLE()
|
|
|
|
};
|
|
|
|
|
2009-03-28 01:22:07 +03:00
|
|
|
////////////////////////////////////////////////////////////////////////////
|
|
|
|
// FloppyConfigDialog
|
|
|
|
////////////////////////////////////////////////////////////////////////////
|
|
|
|
//
|
|
|
|
// the new FloppyConfigDialog is based on ParamDialog. It allows the user to
|
|
|
|
// configure the floppy settings and to create a floppy image if necessary.
|
|
|
|
class FloppyConfigDialog : public ParamDialog
|
|
|
|
{
|
|
|
|
private:
|
|
|
|
wxButton *createButton;
|
2010-07-03 09:34:27 +04:00
|
|
|
ParamStruct *pstrDevice, *pstrPath, *pstrMedia, *pstrStatus, *pstrReadonly;
|
2009-03-28 01:22:07 +03:00
|
|
|
public:
|
|
|
|
FloppyConfigDialog(wxWindow* parent, wxWindowID id);
|
|
|
|
void Setup(bx_list_c *list);
|
|
|
|
void OnEvent(wxCommandEvent& event);
|
|
|
|
DECLARE_EVENT_TABLE()
|
|
|
|
};
|
|
|
|
|
2006-03-11 13:00:56 +03:00
|
|
|
////////////////////////////////////////////////////////////////////////////
|
|
|
|
// LogOptionsDialog
|
|
|
|
////////////////////////////////////////////////////////////////////////////
|
|
|
|
//
|
|
|
|
// the new LogOptionsDialog is based on ParamDialog. It allows the user to
|
|
|
|
// configure the log file settings and to decide how Bochs will behave for
|
|
|
|
// each type of log event.
|
|
|
|
class LogOptionsDialog : public ParamDialog
|
|
|
|
{
|
|
|
|
private:
|
2006-03-18 19:30:52 +03:00
|
|
|
#define LOG_OPTS_TITLE wxT("Configure Log Events")
|
|
|
|
#define LOG_OPTS_PROMPT wxT("How should Bochs respond to each type of event?")
|
2014-01-04 00:46:59 +04:00
|
|
|
#define LOG_OPTS_TYPE_NAMES { wxT("Debug events"), wxT("Info events"), wxT("Error events"), wxT("Panic events") }
|
2012-10-05 20:04:40 +04:00
|
|
|
#define LOG_OPTS_N_TYPES 4
|
diff -urNX /home/volker/exclude-bochs /home/volker/bochs/bochs/bochs.h ./bochs.h
--- /home/volker/bochs/bochs/bochs.h 2016-08-12 19:06:18.803209189 +0200
+++ ./bochs.h 2016-12-28 00:41:20.000627252 +0100
@@ -2,7 +2,7 @@
// $Id: bochs.h 12935 2016-08-12 17:06:14Z vruppert $
/////////////////////////////////////////////////////////////////////////
//
-// Copyright (C) 2001-2015 The Bochs Project
+// Copyright (C) 2001-2016 The Bochs Project
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
@@ -276,8 +276,9 @@
void error(const char *fmt, ...) BX_CPP_AttrPrintf(2, 3);
void panic(const char *fmt, ...) BX_CPP_AttrPrintf(2, 3);
void ldebug(const char *fmt, ...) BX_CPP_AttrPrintf(2, 3);
- void fatal (const char *prefix, const char *fmt, va_list ap, int exit_status);
- void ask (int level, const char *prefix, const char *fmt, va_list ap);
+ void fatal(const char *prefix, const char *fmt, va_list ap, int exit_status);
+ void warn(int level, const char *prefix, const char *fmt, va_list ap);
+ void ask(int level, const char *prefix, const char *fmt, va_list ap);
void put(const char *p);
void put(const char *n, const char *p);
void setio(class iofunctions *);
@@ -334,7 +335,8 @@
void set_log_action(int loglevel, int action);
const char *getlevel(int i) const;
const char *getaction(int i) const;
-
+ int isaction(const char *val) const;
+
protected:
int n_logfn;
#define MAX_LOGFNS 512
diff -urNX /home/volker/exclude-bochs /home/volker/bochs/bochs/CHANGES ./CHANGES
--- /home/volker/bochs/bochs/CHANGES 2016-12-26 10:45:44.000000000 +0100
+++ ./CHANGES 2016-12-28 15:54:25.127088081 +0100
@@ -1,5 +1,8 @@
Changes after 2.6.8 release:
+- General
+ - Added new log action "warn", designed to show a message box on error events.
+
- Configure and compile
- Added Android host platform support.
diff -urNX /home/volker/exclude-bochs /home/volker/bochs/bochs/config.cc ./config.cc
--- /home/volker/bochs/bochs/config.cc 2016-05-03 21:15:09.158016000 +0200
+++ ./config.cc 2016-12-27 19:53:10.461420368 +0100
@@ -2062,15 +2062,8 @@
actstr = strtok(NULL, "");
if (actstr != NULL) {
def_action = !strcmp(module, "action");
- if (!strcmp(actstr, "fatal"))
- action = ACT_FATAL;
- else if (!strcmp (actstr, "report"))
- action = ACT_REPORT;
- else if (!strcmp (actstr, "ignore"))
- action = ACT_IGNORE;
- else if (!strcmp (actstr, "ask"))
- action = ACT_ASK;
- else {
+ action = SIM->is_action_name(actstr);
+ if (action < ACT_IGNORE) {
PARSE_ERR(("%s: %s directive malformed.", context, params[0]));
free(param);
return -1;
diff -urNX /home/volker/exclude-bochs /home/volker/bochs/bochs/gui/sdl2.cc ./gui/sdl2.cc
--- /home/volker/bochs/bochs/gui/sdl2.cc 2016-08-12 19:06:18.811209142 +0200
+++ ./gui/sdl2.cc 2016-12-28 12:33:39.534288819 +0100
@@ -2,7 +2,7 @@
// $Id: sdl2.cc 12935 2016-08-12 17:06:14Z vruppert $
/////////////////////////////////////////////////////////////////////////
//
-// Copyright (C) 2014-2015 The Bochs Project
+// Copyright (C) 2014-2016 The Bochs Project
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
@@ -1478,20 +1478,16 @@
SDL_MessageBoxData msgboxdata;
SDL_MessageBoxButtonData buttondata[4];
int level, retcode;
-#if BX_DEBUGGER || BX_GDBSTUB
- int defbtn = 3;
-#else
- int defbtn = 2;
-#endif
char message[512];
level = event->u.logmsg.level;
- sprintf(message, "%s %s", event->u.logmsg.prefix, event->u.logmsg.msg);
+ sprintf(message, "Device: %s\nMessage: %s", event->u.logmsg.prefix,
+ event->u.logmsg.msg);
msgboxdata.flags = SDL_MESSAGEBOX_ERROR;
msgboxdata.window = window;
msgboxdata.title = SIM->get_log_level_name(level);
msgboxdata.message = message;
- msgboxdata.numbuttons = defbtn + 1;
+ msgboxdata.numbuttons = 2;
msgboxdata.buttons = buttondata;
msgboxdata.colorScheme = NULL;
buttondata[0].flags = 0;
@@ -1500,14 +1496,18 @@
buttondata[1].flags = 0;
buttondata[1].buttonid = BX_LOG_ASK_CHOICE_CONTINUE_ALWAYS;
buttondata[1].text = "Alwayscont";
+ if (event->u.logmsg.flag == BX_LOG_ASK_ASKDLG) {
+ msgboxdata.numbuttons = 3;
+ buttondata[2].flags = SDL_MESSAGEBOX_BUTTON_ESCAPEKEY_DEFAULT;
+ buttondata[2].buttonid = BX_LOG_ASK_CHOICE_DIE;
+ buttondata[2].text = "Quit";
#if BX_DEBUGGER || BX_GDBSTUB
- buttondata[2].flags = 0;
- buttondata[2].buttonid = BX_LOG_ASK_CHOICE_ENTER_DEBUG;
- buttondata[2].text = "Debugger";
-#endif
- buttondata[defbtn].flags = SDL_MESSAGEBOX_BUTTON_ESCAPEKEY_DEFAULT;
- buttondata[defbtn].buttonid = BX_LOG_ASK_CHOICE_DIE;
- buttondata[defbtn].text = "Quit";
+ msgboxdata.numbuttons = 4;
+ buttondata[3].flags = 0;
+ buttondata[3].buttonid = BX_LOG_ASK_CHOICE_ENTER_DEBUG;
+ buttondata[3].text = "Debugger";
+#endif
+ }
if (SDL_ShowMessageBox(&msgboxdata, &retcode) < 0) {
return -1;
} else {
diff -urNX /home/volker/exclude-bochs /home/volker/bochs/bochs/gui/siminterface.cc ./gui/siminterface.cc
--- /home/volker/bochs/bochs/gui/siminterface.cc 2016-12-05 19:56:56.729685000 +0100
+++ ./gui/siminterface.cc 2016-12-28 11:14:02.004075717 +0100
@@ -2,7 +2,7 @@
// $Id: siminterface.cc 12981 2016-12-05 18:56:56Z sshwarts $
/////////////////////////////////////////////////////////////////////////
//
-// Copyright (C) 2002-2015 The Bochs Project
+// Copyright (C) 2002-2016 The Bochs Project
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
@@ -100,6 +100,7 @@
virtual int get_log_action(int mod, int level);
virtual void set_log_action(int mod, int level, int action);
virtual const char *get_action_name(int action);
+ virtual int is_action_name(const char *val);
virtual int get_default_log_action(int level) {
return logfunctions::get_default_action(level);
}
@@ -123,6 +124,7 @@
virtual void set_notify_callback(bxevent_handler func, void *arg);
virtual void get_notify_callback(bxevent_handler *func, void **arg);
virtual BxEvent* sim_to_ci_event(BxEvent *event);
+ virtual int log_warn(const char *prefix, int level, const char *msg);
virtual int log_ask(const char *prefix, int level, const char *msg);
virtual void log_msg(const char *prefix, int level, const char *msg);
virtual void set_log_viewer(bx_bool val) { bx_log_viewer = val; }
@@ -420,6 +422,11 @@
return io->getaction(action);
}
+int bx_real_sim_c::is_action_name(const char *val)
+{
+ return io->isaction(val);
+}
+
const char *bx_real_sim_c::get_log_level_name(int level)
{
return io->getlevel(level);
@@ -575,6 +582,21 @@
}
}
+int bx_real_sim_c::log_warn(const char *prefix, int level, const char *msg)
+{
+ BxEvent be;
+ be.type = BX_SYNC_EVT_LOG_ASK;
+ be.u.logmsg.prefix = prefix;
+ be.u.logmsg.level = level;
+ be.u.logmsg.msg = msg;
+ be.u.logmsg.flag = BX_LOG_ASK_MSGBOX_WARN;
+ // default return value in case something goes wrong.
+ be.retcode = BX_LOG_NOTIFY_FAILED;
+ // calling notify
+ sim_to_ci_event(&be);
+ return be.retcode;
+}
+
// returns 0 for continue, 1 for alwayscontinue, 2 for die.
int bx_real_sim_c::log_ask(const char *prefix, int level, const char *msg)
{
@@ -583,6 +605,7 @@
be.u.logmsg.prefix = prefix;
be.u.logmsg.level = level;
be.u.logmsg.msg = msg;
+ be.u.logmsg.flag = BX_LOG_ASK_ASKDLG;
// default return value in case something goes wrong.
be.retcode = BX_LOG_NOTIFY_FAILED;
// calling notify
@@ -1157,16 +1180,10 @@
} else if (!strncmp(string, "PANIC=", 6)) {
type = LOGLEV_PANIC;
}
- if (!strcmp(string+j, "ignore")) {
- action = ACT_IGNORE;
- } else if (!strcmp(string+j, "report")) {
- action = ACT_REPORT;
- } else if (!strcmp(string+j, "ask")) {
- action = ACT_ASK;
- } else if (!strcmp(string+j, "fatal")) {
- action = ACT_FATAL;
+ action = is_action_name(string+j);
+ if (action >= ACT_IGNORE) {
+ set_log_action(dev, type, action);
}
- set_log_action(dev, type, action);
} else {
if (i == 1) {
BX_ERROR(("restore_logopts(): log module '%s' not found", devname));
diff -urNX /home/volker/exclude-bochs /home/volker/bochs/bochs/gui/siminterface.h ./gui/siminterface.h
--- /home/volker/bochs/bochs/gui/siminterface.h 2016-03-31 19:24:37.451025427 +0200
+++ ./gui/siminterface.h 2016-12-28 11:11:21.036683362 +0100
@@ -168,6 +168,7 @@
typedef enum {
ACT_IGNORE = 0,
ACT_REPORT,
+ ACT_WARN,
ACT_ASK,
ACT_FATAL,
N_ACT
@@ -178,11 +179,11 @@
// normally all action choices are available for all event types. The exclude
// expression allows some choices to be eliminated if they don't make any
// sense. For example, it would be stupid to ignore a panic.
-#define BX_LOG_OPTS_EXCLUDE(type, choice) ( \
- /* can't die or ask, on debug or info events */ \
- (type <= LOGLEV_INFO && (choice == ACT_ASK || choice == ACT_FATAL)) \
- /* can't ignore panics */ \
- || (type == LOGLEV_PANIC && choice == ACT_IGNORE) \
+#define BX_LOG_OPTS_EXCLUDE(type, choice) ( \
+ /* can't die, ask or warn, on debug or info events */ \
+ (type <= LOGLEV_INFO && (choice >= ACT_WARN)) \
+ /* can't ignore panics */ \
+ || (type == LOGLEV_PANIC && choice == ACT_IGNORE) \
)
// floppy / cdrom media status
@@ -392,6 +393,7 @@
// synchronizing threads, etc. for each.
typedef struct {
Bit8u level;
+ Bit8u flag;
const char *prefix;
const char *msg;
} BxLogMsgEvent;
@@ -419,6 +421,12 @@
BX_LOG_NOTIFY_FAILED
};
+enum {
+ BX_LOG_ASK_ASKDLG,
+ BX_LOG_ASK_MSGBOX_WARN,
+ BX_LOG_ASK_MSGBOX_QUIT
+};
+
// Event type: BX_SYNC_EVT_GET_DBG_COMMAND
//
// This is a synchronous event sent from the simulator to the debugger
@@ -675,6 +683,7 @@
virtual int get_default_log_action(int level) {return -1;}
virtual void set_default_log_action(int level, int action) {}
virtual const char *get_action_name(int action) {return NULL;}
+ virtual int is_action_name(const char *val) {return -1;}
virtual const char *get_log_level_name(int level) {return NULL;}
virtual int get_max_log_level() {return -1;}
@@ -715,6 +724,9 @@
// send an event from the simulator to the CI.
virtual BxEvent* sim_to_ci_event(BxEvent *event) {return NULL;}
+ // called from simulator when it hits errors, to warn the user
+ // before continuing simulation
+ virtual int log_warn(const char *prefix, int level, const char *msg) {return -1;}
// called from simulator when it hits serious errors, to ask if the user
// wants to continue or not
virtual int log_ask(const char *prefix, int level, const char *msg) {return -1;}
diff -urNX /home/volker/exclude-bochs /home/volker/bochs/bochs/gui/textconfig.cc ./gui/textconfig.cc
--- /home/volker/bochs/bochs/gui/textconfig.cc 2016-12-05 20:15:59.112637000 +0100
+++ ./gui/textconfig.cc 2016-12-28 12:44:43.079411258 +0100
@@ -2,7 +2,7 @@
// $Id: textconfig.cc 12983 2016-12-05 19:15:59Z sshwarts $
/////////////////////////////////////////////////////////////////////////
//
-// Copyright (C) 2002-2013 The Bochs Project
+// Copyright (C) 2002-2016 The Bochs Project
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
@@ -552,8 +552,8 @@
}
static const char *log_options_prompt1 = "Enter the ID of the device to edit, or -1 to return: [-1] ";
-static const char *log_level_choices[] = { "ignore", "report", "ask", "fatal", "no change" };
-static int log_level_n_choices_normal = 4;
+static const char *log_level_choices[N_ACT+1] = { "ignore", "report", "warn", "ask", "fatal", "no change" };
+static int log_level_n_choices_normal = N_ACT;
void bx_log_options(int individual)
{
@@ -589,7 +589,7 @@
bx_print_log_action_table();
for (int level=0; level<SIM->get_max_log_level(); level++) {
char prompt[1024];
- int action, default_action = 4; // default to no change
+ int action, default_action = N_ACT; // default to no change
sprintf(prompt, "Enter action for %s event on all devices: [no change] ", SIM->get_log_level_name(level));
// do show the no change choice (choices=4)
if (ask_menu(prompt, "", log_level_n_choices_normal+1, log_level_choices, default_action, &action)<0)
@@ -718,47 +718,50 @@
event->retcode = event->u.param.param->text_ask(stdin, stderr);
return event;
case BX_SYNC_EVT_LOG_ASK:
- {
- int level = event->u.logmsg.level;
- fprintf(stderr, "========================================================================\n");
- fprintf(stderr, "Event type: %s\n", SIM->get_log_level_name (level));
- fprintf(stderr, "Device: %s\n", event->u.logmsg.prefix);
- fprintf(stderr, "Message: %s\n\n", event->u.logmsg.msg);
- fprintf(stderr, "A %s has occurred. Do you want to:\n", SIM->get_log_level_name (level));
- fprintf(stderr, " cont - continue execution\n");
- 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), event->u.logmsg.prefix);
- fprintf(stderr, " die - stop execution now\n");
- fprintf(stderr, " abort - dump core %s\n",
- BX_HAVE_ABORT ? "" : "(Disabled)");
+ if (event->u.logmsg.flag == BX_LOG_ASK_ASKDLG) {
+ int level = event->u.logmsg.level;
+ fprintf(stderr, "========================================================================\n");
+ fprintf(stderr, "Event type: %s\n", SIM->get_log_level_name (level));
+ fprintf(stderr, "Device: %s\n", event->u.logmsg.prefix);
+ fprintf(stderr, "Message: %s\n\n", event->u.logmsg.msg);
+ fprintf(stderr, "A %s has occurred. Do you want to:\n", SIM->get_log_level_name (level));
+ fprintf(stderr, " cont - continue execution\n");
+ 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), event->u.logmsg.prefix);
+ fprintf(stderr, " die - stop execution now\n");
+ fprintf(stderr, " abort - dump core %s\n",
+ BX_HAVE_ABORT ? "" : "(Disabled)");
#if BX_DEBUGGER
- fprintf(stderr, " debug - continue and return to bochs debugger\n");
+ fprintf(stderr, " debug - continue and return to bochs debugger\n");
#endif
#if BX_GDBSTUB
- fprintf(stderr, " debug - hand control to gdb\n");
+ fprintf(stderr, " debug - hand control to gdb\n");
#endif
- int choice;
+ int choice;
ask:
- if (ask_menu("Choose one of the actions above: [%s] ", "",
- log_action_n_choices, log_action_ask_choices, 2, &choice) < 0)
- event->retcode = -1;
- // return 0 for continue, 1 for alwayscontinue, 2 for die, 3 for debug.
- if (!BX_HAVE_ABORT && choice==BX_LOG_ASK_CHOICE_DUMP_CORE) goto ask;
- fflush(stdout);
- fflush(stderr);
- event->retcode = choice;
- }
- return event;
- case BX_ASYNC_EVT_REFRESH:
- case BX_ASYNC_EVT_DBG_MSG:
- case BX_ASYNC_EVT_LOG_MSG:
- // The text mode interface does not use these events, so just ignore
- // them.
- return event;
- default:
- fprintf(stderr, "textconfig: notify callback called with event type %04x\n", event->type);
- return event;
+ if (ask_menu("Choose one of the actions above: [%s] ", "",
+ log_action_n_choices, log_action_ask_choices, 2, &choice) < 0)
+ event->retcode = -1;
+ // return 0 for continue, 1 for alwayscontinue, 2 for die, 3 for debug.
+ if (!BX_HAVE_ABORT && choice==BX_LOG_ASK_CHOICE_DUMP_CORE) goto ask;
+ fflush(stdout);
+ fflush(stderr);
+ event->retcode = choice;
+ } else {
+ // warning prompt not implemented
+ event->retcode = 0;
+ }
+ return event;
+ case BX_ASYNC_EVT_REFRESH:
+ case BX_ASYNC_EVT_DBG_MSG:
+ case BX_ASYNC_EVT_LOG_MSG:
+ // The text mode interface does not use these events, so just ignore
+ // them.
+ return event;
+ default:
+ fprintf(stderr, "textconfig: notify callback called with event type %04x\n", event->type);
+ return event;
}
assert(0); // switch statement should return
}
diff -urNX /home/volker/exclude-bochs /home/volker/bochs/bochs/gui/win32dialog.cc ./gui/win32dialog.cc
--- /home/volker/bochs/bochs/gui/win32dialog.cc 2014-06-20 11:32:02.034026376 +0200
+++ ./gui/win32dialog.cc 2016-12-28 12:50:14.148888740 +0100
@@ -2,7 +2,7 @@
// $Id: win32dialog.cc 12381 2014-06-20 09:31:56Z vruppert $
/////////////////////////////////////////////////////////////////////////
//
-// Copyright (C) 2003-2014 The Bochs Project
+// Copyright (C) 2003-2016 The Bochs Project
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
@@ -27,7 +27,7 @@
#include "win32res.h"
#include "win32paramdlg.h"
-const char log_choices[5][16] = {"ignore", "log", "ask user", "end simulation", "no change"};
+const char log_choices[N_ACT+1][16] = {"ignore", "log", "warn user", "ask user", "end simulation", "no change"};
HWND GetBochsWindow()
{
@@ -97,12 +97,16 @@
SetWindowText(GetDlgItem(hDlg, IDASKMSG), event->u.logmsg.msg);
SendMessage(GetDlgItem(hDlg, IDASKLIST), LB_ADDSTRING, 0, (LPARAM)"Continue");
SendMessage(GetDlgItem(hDlg, IDASKLIST), LB_ADDSTRING, 0, (LPARAM)"Continue and don't ask again");
- SendMessage(GetDlgItem(hDlg, IDASKLIST), LB_ADDSTRING, 0, (LPARAM)"Kill simulation");
- SendMessage(GetDlgItem(hDlg, IDASKLIST), LB_ADDSTRING, 0, (LPARAM)"Abort (dump core)");
+ if (event->u.logmsg.flag == BX_LOG_ASK_ASKDLG) {
+ SendMessage(GetDlgItem(hDlg, IDASKLIST), LB_ADDSTRING, 0, (LPARAM)"Kill simulation");
+ SendMessage(GetDlgItem(hDlg, IDASKLIST), LB_ADDSTRING, 0, (LPARAM)"Abort (dump core)");
#if BX_DEBUGGER
- SendMessage(GetDlgItem(hDlg, IDASKLIST), LB_ADDSTRING, 0, (LPARAM)"Continue and return to debugger");
+ SendMessage(GetDlgItem(hDlg, IDASKLIST), LB_ADDSTRING, 0, (LPARAM)"Continue and return to debugger");
#endif
- SendMessage(GetDlgItem(hDlg, IDASKLIST), LB_SETCURSEL, 2, 0);
+ SendMessage(GetDlgItem(hDlg, IDASKLIST), LB_SETCURSEL, 2, 0);
+ } else {
+ SendMessage(GetDlgItem(hDlg, IDASKLIST), LB_SETCURSEL, 0, 0);
+ }
SetFocus(GetDlgItem(hDlg, IDASKLIST));
return FALSE;
case WM_CLOSE:
diff -urNX /home/volker/exclude-bochs /home/volker/bochs/bochs/gui/wxdialog.cc ./gui/wxdialog.cc
--- /home/volker/bochs/bochs/gui/wxdialog.cc 2015-01-07 17:17:40.447882000 +0100
+++ ./gui/wxdialog.cc 2016-12-27 20:30:44.997609007 +0100
@@ -2,7 +2,7 @@
// $Id: wxdialog.cc 12594 2015-01-07 16:17:40Z sshwarts $
/////////////////////////////////////////////////////////////////
//
-// Copyright (C) 2002-2014 The Bochs Project
+// Copyright (C) 2002-2016 The Bochs Project
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
@@ -208,7 +208,6 @@
: wxDialog(parent, id, wxT(""), wxDefaultPosition, wxDefaultSize,
wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER)
{
- //static int integers[LOG_OPTS_N_CHOICES_NORMAL] = {0, 1, 2, 3};
static wxString names[] = ADVLOG_OPTS_TYPE_NAMES;
SetTitle(ADVLOG_OPTS_TITLE);
vertSizer = new wxBoxSizer(wxVERTICAL);
@@ -1563,7 +1562,7 @@
bool includeNoChange)
{
static wxString choices[] = LOG_OPTS_CHOICES;
- static int integers[LOG_OPTS_N_CHOICES] = {0, 1, 2, 3, 4};
+ static int integers[LOG_OPTS_N_CHOICES] = {0, 1, 2, 3, 4, 5};
wxChoice *control = new wxChoice(parent, id, wxDefaultPosition, wxDefaultSize);
int lastChoice = 0; // remember index of last choice
int nchoice = includeNoChange? LOG_OPTS_N_CHOICES : LOG_OPTS_N_CHOICES_NORMAL;
diff -urNX /home/volker/exclude-bochs /home/volker/bochs/bochs/gui/wxdialog.h ./gui/wxdialog.h
--- /home/volker/bochs/bochs/gui/wxdialog.h 2014-12-23 20:30:12.896090221 +0100
+++ ./gui/wxdialog.h 2016-12-27 20:34:28.518389938 +0100
@@ -2,7 +2,7 @@
// $Id: wxdialog.h 12576 2014-12-23 19:30:03Z vruppert $
////////////////////////////////////////////////////////////////////
//
-// Copyright (C) 2002-2014 The Bochs Project
+// Copyright (C) 2002-2016 The Bochs Project
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
@@ -354,10 +354,10 @@
#define LOG_OPTS_PROMPT wxT("How should Bochs respond to each type of event?")
#define LOG_OPTS_TYPE_NAMES { wxT("Debug events"), wxT("Info events"), wxT("Error events"), wxT("Panic events") }
#define LOG_OPTS_N_TYPES 4
-#define LOG_OPTS_CHOICES { wxT("ignore"), wxT("log"), wxT("ask user"), wxT("end simulation"), wxT("no change") }
-#define LOG_OPTS_N_CHOICES_NORMAL 4
-#define LOG_OPTS_N_CHOICES 5 // number of choices, including "no change"
-#define LOG_OPTS_NO_CHANGE 4 // index of "no change"
+#define LOG_OPTS_CHOICES { wxT("ignore"), wxT("log"), wxT("warn user"), wxT("ask user"), wxT("end simulation"), wxT("no change") }
+#define LOG_OPTS_N_CHOICES_NORMAL 5
+#define LOG_OPTS_N_CHOICES 6 // number of choices, including "no change"
+#define LOG_OPTS_NO_CHANGE 5 // index of "no change"
#define LOG_OPTS_ADV wxT("For additional control over how each device responds to events, use the menu option \"Log ... By Device\".")
wxFlexGridSizer *gridSizer;
wxChoice *action[LOG_OPTS_N_TYPES];
diff -urNX /home/volker/exclude-bochs /home/volker/bochs/bochs/gui/wxmain.cc ./gui/wxmain.cc
--- /home/volker/bochs/bochs/gui/wxmain.cc 2016-12-26 17:12:57.470174541 +0100
+++ ./gui/wxmain.cc 2016-12-28 12:15:26.035961463 +0100
@@ -2,7 +2,7 @@
// $Id: wxmain.cc 13006 2016-12-26 16:12:54Z vruppert $
/////////////////////////////////////////////////////////////////
//
-// Copyright (C) 2002-2014 The Bochs Project
+// Copyright (C) 2002-2016 The Bochs Project
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
@@ -1158,6 +1158,10 @@
#if !BX_DEBUGGER && !BX_GDBSTUB
dlg.EnableButton(dlg.DEBUG, FALSE);
#endif
+ if (be->u.logmsg.flag != BX_LOG_ASK_ASKDLG) {
+ dlg.EnableButton(dlg.DIE, FALSE);
+ dlg.EnableButton(dlg.DUMP, FALSE);
+ }
dlg.SetContext(wxString(be->u.logmsg.prefix, wxConvUTF8));
dlg.SetMessage(wxString(be->u.logmsg.msg, wxConvUTF8));
int n = dlg.ShowModal();
diff -urNX /home/volker/exclude-bochs /home/volker/bochs/bochs/gui/x.cc ./gui/x.cc
--- /home/volker/bochs/bochs/gui/x.cc 2016-12-27 17:26:59.622665119 +0100
+++ ./gui/x.cc 2016-12-28 12:03:10.963351647 +0100
@@ -2687,11 +2687,7 @@
} else {
size_x = 30 + maxlen * 6;
}
- if (lines < 3) {
- size_y = 90;
- } else {
- size_y = 60 + lines * 15;
- }
+ size_y = 70 + lines * 15;
x11_dialog_c *xdlg = new x11_dialog_c(name, size_x, size_y,
(mode == XDLG_SIMPLE) ? 1 : 2);
ypos = 34;
@@ -2729,11 +2725,21 @@
bx_param_string_c *sparam;
bx_param_enum_c *eparam;
bx_list_c *list;
+ char message[256];
switch (event->type)
{
case BX_SYNC_EVT_LOG_ASK:
- event->retcode = x11_ask_dialog(event);
+ if (event->u.logmsg.flag == BX_LOG_ASK_ASKDLG) {
+ event->retcode = x11_ask_dialog(event);
+ } else if (event->u.logmsg.flag == BX_LOG_ASK_MSGBOX_WARN) {
+ const char *title = SIM->get_log_level_name(event->u.logmsg.level);
+ sprintf(message, "Device: %s\n\nMessage: %s", event->u.logmsg.prefix,
+ event->u.logmsg.msg);
+ bx_param_bool_c bparam(NULL, "warn", title, message, 1);
+ x11_message_box(&bparam, XDLG_SIMPLE);
+ event->retcode = 0;
+ }
return event;
case BX_SYNC_EVT_ASK_PARAM:
param = event->u.param.param;
diff -urNX /home/volker/exclude-bochs /home/volker/bochs/bochs/logio.cc ./logio.cc
--- /home/volker/bochs/bochs/logio.cc 2015-05-10 08:55:18.678940963 +0200
+++ ./logio.cc 2016-12-28 00:40:40.395736643 +0100
@@ -2,7 +2,7 @@
// $Id: logio.cc 12759 2015-05-10 06:55:16Z vruppert $
/////////////////////////////////////////////////////////////////////////
//
-// Copyright (C) 2001-2014 The Bochs Project
+// Copyright (C) 2001-2016 The Bochs Project
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
@@ -50,11 +50,25 @@
else return "?";
}
+static const char *act_name[N_ACT] = { "ignore", "report", "warn", "ask", "fatal" };
+
const char* iofunctions::getaction(int i) const
{
- static const char *name[] = { "ignore", "report", "ask", "fatal" };
assert (i>=ACT_IGNORE && i<N_ACT);
- return name[i];
+ return act_name[i];
+}
+
+int iofunctions::isaction(const char *val) const
+{
+ int action = -1;
+
+ for (int i = 0; i < N_ACT; i++) {
+ if (!strcmp(val, act_name[i])) {
+ action = ACT_IGNORE + i;
+ break;
+ }
+ }
+ return action;
}
void iofunctions::flush(void)
@@ -414,6 +428,11 @@
logio->out(LOGLEV_ERROR, prefix, fmt, ap);
va_end(ap);
+ if (onoff[LOGLEV_ERROR] == ACT_WARN) {
+ va_start(ap, fmt);
+ warn(LOGLEV_ERROR, prefix, fmt, ap);
+ va_end(ap);
+ }
if (onoff[LOGLEV_ERROR] == ACT_ASK) {
va_start(ap, fmt);
ask(LOGLEV_ERROR, prefix, fmt, ap);
@@ -438,6 +457,11 @@
logio->out(LOGLEV_PANIC, prefix, fmt, ap);
va_end(ap);
+ if (onoff[LOGLEV_PANIC] == ACT_WARN) {
+ va_start(ap, fmt);
+ warn(LOGLEV_PANIC, prefix, fmt, ap);
+ va_end(ap);
+ }
if (onoff[LOGLEV_PANIC] == ACT_ASK) {
va_start(ap, fmt);
ask(LOGLEV_PANIC, prefix, fmt, ap);
@@ -465,6 +489,36 @@
// the actions ask() and fatal() are not supported here
}
+void logfunctions::warn(int level, const char *prefix, const char *fmt, va_list ap)
+{
+ // Guard against reentry on warn() function. The danger is that some
+ // function that's called within warn() could trigger another
+ // BX_ERROR that could call warn() again, leading to infinite
+ // recursion and infinite asks.
+ static char in_warn_already = 0;
+ char buf1[1024];
+ if (in_warn_already) {
+ fprintf(stderr, "logfunctions::warn() should not reenter!!\n");
+ return;
+ }
+ in_warn_already = 1;
+ vsnprintf(buf1, sizeof(buf1), fmt, ap);
+ // FIXME: facility set to 0 because it's unknown.
+
+ // update vga screen. This is useful because sometimes useful messages
+ // are printed on the screen just before a panic. It's also potentially
+ // dangerous if this function calls ask again... That's why I added
+ // the reentry check above.
+ SIM->refresh_vga();
+
+ // ensure the text screen is showing
+ SIM->set_display_mode(DISP_MODE_CONFIG);
+ SIM->log_warn(prefix, level, buf1);
+ // return to simulation mode
+ SIM->set_display_mode(DISP_MODE_SIM);
+ in_warn_already = 0;
+}
+
void logfunctions::ask(int level, const char *prefix, const char *fmt, va_list ap)
{
// Guard against reentry on ask() function. The danger is that some
2016-12-28 18:06:34 +03:00
|
|
|
#define LOG_OPTS_CHOICES { wxT("ignore"), wxT("log"), wxT("warn user"), wxT("ask user"), wxT("end simulation"), wxT("no change") }
|
|
|
|
#define LOG_OPTS_N_CHOICES_NORMAL 5
|
|
|
|
#define LOG_OPTS_N_CHOICES 6 // number of choices, including "no change"
|
|
|
|
#define LOG_OPTS_NO_CHANGE 5 // index of "no change"
|
2006-03-18 19:30:52 +03:00
|
|
|
#define LOG_OPTS_ADV wxT("For additional control over how each device responds to events, use the menu option \"Log ... By Device\".")
|
2006-03-11 13:00:56 +03:00
|
|
|
wxFlexGridSizer *gridSizer;
|
|
|
|
wxChoice *action[LOG_OPTS_N_TYPES];
|
|
|
|
public:
|
|
|
|
LogOptionsDialog(wxWindow* parent, wxWindowID id);
|
|
|
|
int GetAction(int evtype);
|
|
|
|
void SetAction(int evtype, int action);
|
|
|
|
DECLARE_EVENT_TABLE()
|
|
|
|
};
|
|
|
|
|
- apply a patch I've been working on
- modified files: config.h.in cpu/init.cc debug/dbg_main.cc gui/control.cc
gui/siminterface.cc gui/siminterface.h gui/wxdialog.cc gui/wxdialog.h
gui/wxmain.cc gui/wxmain.h iodev/keyboard.cc
----------------------------------------------------------------------
Patch name: patch.wx-show-cpu2
Author: Bryce Denney
Date: Fri Sep 6 12:13:28 EDT 2002
Description:
Second try at implementing the "Debug:Show Cpu" and "Debug:Show
Keyboard" dialog with values that change as the simulation proceeds.
(Nobody gets to see the first try.) This is the first step toward
making something resembling a wxWindows debugger.
First, variables which are going to be visible in the CI must be
registered as parameters. For some variables, it might be acceptable
to change them from Bit32u into bx_param_num_c and access them only
with set/get methods, but for most variables it would be a horrible
pain and wreck performance.
To deal with this, I introduced the concept of a shadow parameter. A
normal parameter has its value stored inside the struct, but a shadow
parameter has only a pointer to the value. Shadow params allow you to
treat any variable as if it was a parameter, without having to change
its type and access it using get/set methods. Of course, a shadow
param's value is controlled by someone else, so it can change at any
time.
To demonstrate and test the registration of shadow parameters, I
added code in cpu/init.cc to register a few CPU registers and
code in iodev/keyboard.cc to register a few keyboard state values.
Now these parameters are visible in the Debug:Show CPU and
Debug:Show Keyboard dialog boxes.
The Debug:Show* dialog boxes are created by the ParamDialog class,
which already understands how to display each type of parameter,
including the new shadow parameters (because they are just a subclass
of a normal parameter class). I have added a ParamDialog::Refresh()
method, which rereads the value from every parameter that it is
displaying and changes the displayed value. At the moment, in the
Debug:Show CPU dialog, changing the values has no effect. However
this is trivial to add when it's time (just call CommitChanges!). It
wouldn't really make sense to change the values unless you have paused
the simulation, for example when single stepping with the debugger.
The Refresh() method must be called periodically or else the dialog
will show the initial values forever. At the moment, Refresh() is
called when the simulator sends an async event called
BX_ASYNC_EVT_REFRESH, created by a call to SIM->refresh_ci ().
Details:
- implement shadow parameter class for Bit32s, called bx_shadow_num_c.
implement shadow parameter class for Boolean, called bx_shadow_bool_c.
more to follow (I need one for every type!)
- now the simulator thread can request that the config interface refresh
its display. For now, the refresh event causes the CI to check every
parameter it is watching and change the display value. Later, it may
be worth the trouble to keep track of which parameters have actually
changed. Code in the simulator thread calls SIM->refresh_ci(), which
creates an async event called BX_ASYNC_EVT_REFRESH and sends it to
the config interface. When it arrives in the wxWindows gui thread,
it calls RefreshDialogs(), which calls the Refresh() method on any
dialogs that might need it.
- in the debugger, SIM->refresh_ci() is called before every prompt
is printed. Otherwise, the refresh would wait until the next
SIM->periodic(), which might be thousands of cycles. This way,
when you're single stepping, the dialogs update with every step.
- To improve performance, the CI has a flag (MyFrame::WantRefresh())
which tells whether it has any need for refresh events. If no
dialogs are showing that need refresh events, then no event is sent
between threads.
- add a few defaults to the param classes that affect the settings of
newly created parameters. When declaring a lot of params with
similar settings it's more compact to set the default for new params
rather than to change each one separately. default_text_format is
the printf format string for displaying numbers. default_base is
the default base for displaying numbers (0, 16, 2, etc.)
- I added to ParamDialog to make it able to display modeless dialog
boxes such as "Debug:Show CPU". The new Refresh() method queries
all the parameters for their current value and changes the value in
the wxWindows control. The ParamDialog class still needs a little
work; for example, if it's modal it should have Cancel/Ok buttons,
but if it's going to be modeless it should maybe have Apply (commit
any changes) and Close.
2002-09-06 20:43:26 +04:00
|
|
|
|
2002-08-30 10:49:19 +04:00
|
|
|
/**************************************************************************
|
|
|
|
Everything else in here is a comment!
|
|
|
|
|
|
|
|
////////////////////////////////////////////////////////////////////////////
|
2008-02-06 01:57:43 +03:00
|
|
|
// proposed dialogs, not implemented
|
2002-08-30 10:49:19 +04:00
|
|
|
////////////////////////////////////////////////////////////////////////////
|
|
|
|
|
|
|
|
Here are some quick sketches of what different parts of the interface
|
|
|
|
could look like. None of these is implemented yet, and everything is
|
2012-02-21 16:00:54 +04:00
|
|
|
open for debate. Whoever writes the wxWidgets code for any of these
|
2002-08-30 10:49:19 +04:00
|
|
|
screens gets several thousand votes!
|
|
|
|
|
2002-08-31 04:35:25 +04:00
|
|
|
Idea for large configuration dialog, based on Netscape's Edit:Preferences
|
|
|
|
dialog box. Here's a sketch of a dialog with all the components that can be
|
|
|
|
configured in a list on the left, and the details of the selected component
|
|
|
|
on the right. This is a pretty familiar structure that's used in a lot of
|
|
|
|
applications these days. In the first sketch, "IDE Interface" is selected on
|
|
|
|
the left, and the details of the IDE devices are shown on the right.
|
|
|
|
|
|
|
|
+-----Configure Bochs-------------------------------------------------------+
|
|
|
|
| |
|
|
|
|
| +--------------------+ +-- IDE Controller ---------------------------+ |
|
|
|
|
| | |-CPU | | | |
|
|
|
|
| | | | | Master device: | |
|
|
|
|
| | |-Memory | | [X] Enable Hard Disk 0 | |
|
|
|
|
| | | | | | |
|
|
|
|
| | |-Video | | Slave device (choose one): | |
|
|
|
|
| | | | | [ ] No slave device | |
|
|
|
|
| | |-Floppy disks | | [ ] Hard Disk 1 | |
|
|
|
|
| | | |-Drive 0 | | [X] CD-ROM | |
|
|
|
|
| | | |-Drive 1 | | | |
|
|
|
|
| | | | +---------------------------------------------+ |
|
|
|
|
| |***IDE controller***| |
|
|
|
|
| | | |-Hard Drive 0 | |
|
|
|
|
| | | |-CD-ROM drive | |
|
|
|
|
| | | | |
|
|
|
|
| | |-Keyboard | |
|
|
|
|
| | | | |
|
|
|
|
| | |-Networking | |
|
|
|
|
| | | | |
|
|
|
|
| | |-Sound | |
|
|
|
|
| | | |
|
|
|
|
| +--------------------+ |
|
|
|
|
| [Help] [Cancel] [Ok] |
|
|
|
|
+---------------------------------------------------------------------------+
|
|
|
|
|
|
|
|
If you click on Hard Drive 0 in the component list (left), then the
|
|
|
|
whole right panel changes to show the details of the hard drive.
|
|
|
|
|
|
|
|
+-----Configure Bochs-------------------------------------------------------+
|
|
|
|
| |
|
|
|
|
| +--------------------+ +---- Configure Hard Drive 0 ----------------+ |
|
|
|
|
| | |-CPU | | | |
|
|
|
|
| | | | | [X] Enabled | |
|
|
|
|
| | |-Memory | | | |
|
|
|
|
| | | | +--------------------------------------------+ |
|
|
|
|
| | |-Video | |
|
|
|
|
| | | | +---- Disk Image ----------------------------+ |
|
|
|
|
| | |-Floppy disks | | | |
|
|
|
|
| | | |-Drive 0 | | File name: [___________________] [Browse] | |
|
|
|
|
| | | |-Drive 1 | | Geometry: cylinders [____] | |
|
|
|
|
| | | | | heads [____] | |
|
|
|
|
| | |-IDE controller | | sectors/track [____] | |
|
|
|
|
| | |***Hard Drive 0***| | | |
|
|
|
|
| | | |-CD-ROM drive | | Size in Megabytes: 38.2 | |
|
|
|
|
| | | | | [Enter size/Compute Geometry] | |
|
|
|
|
| | |-Keyboard | | | |
|
|
|
|
| | | | | [Create Image] | |
|
|
|
|
| | |-Networking | +--------------------------------------------+ |
|
|
|
|
| | | | |
|
|
|
|
| | |-Sound | |
|
|
|
|
| | | |
|
|
|
|
| +--------------------+ |
|
|
|
|
| [Help] [Cancel] [Ok] |
|
|
|
|
+---------------------------------------------------------------------------+
|
|
|
|
|
|
|
|
Or if you choose the CD-ROM, you get to edit the settings for it.
|
|
|
|
|
|
|
|
+---- Configure Bochs ------------------------------------------------------+
|
|
|
|
| |
|
|
|
|
| +--------------------+ +-- CD-ROM Device ----------------------------+ |
|
|
|
|
| | |-CPU | | | |
|
|
|
|
| | | | | [ ] Enable Emulated CD-ROM | |
|
|
|
|
| | |-Memory | | | |
|
|
|
|
| | | | +---------------------------------------------+ |
|
|
|
|
| | |-Video | |
|
|
|
|
| | | | +-- CD-ROM Media -----------------------------+ |
|
|
|
|
| | |-Floppy disks | | | |
|
|
|
|
| | | |-Drive 0 | | Bochs can use a physical CD-ROM drive as | |
|
|
|
|
| | | |-Drive 1 | | the data source, or use an image file. | |
|
|
|
|
| | | | | | |
|
|
|
|
| | |-IDE controller | | [X] Ejected | |
|
|
|
|
| | | |-Hard Drive 0 | | [ ] Physical CD-ROM drive /dev/cdrom | |
|
2002-09-04 22:39:20 +04:00
|
|
|
| |*****CD-ROM drive***| | [ ] Disk image: [_____________] [Browse] | |
|
2002-08-31 04:35:25 +04:00
|
|
|
| | | | | | |
|
|
|
|
| | |-Keyboard | +---------------------------------------------+ |
|
|
|
|
| | | | |
|
|
|
|
| | |-Networking | |
|
|
|
|
| | | | |
|
|
|
|
| | |-Sound | |
|
|
|
|
| | | |
|
|
|
|
| +--------------------+ |
|
|
|
|
| [Help] [Cancel] [Ok] |
|
|
|
|
+---------------------------------------------------------------------------+
|
|
|
|
|
2002-08-30 10:49:19 +04:00
|
|
|
////////////////////////////////////////////////////////////////////////////
|
|
|
|
// ChooseConfigDialog
|
|
|
|
////////////////////////////////////////////////////////////////////////////
|
2008-02-06 01:57:43 +03:00
|
|
|
The idea is that you could choose from a set of configurations
|
2002-08-30 10:49:19 +04:00
|
|
|
(individual bochsrc files, basically). When you first install
|
|
|
|
Bochs, it would just have DLX Linux Demo, and Create New.
|
|
|
|
As you create new configurations and save them, the list
|
|
|
|
could grow.
|
|
|
|
+--------------------------------------------------------+
|
|
|
|
| |
|
|
|
|
| Choose a configuration for the Bochs simulator: |
|
|
|
|
| |
|
|
|
|
| +---+ |
|
|
|
|
| | O | DLX Linux Demo |
|
|
|
|
| | | | Boot 10MB Hard Disk |
|
|
|
|
| +---+ |
|
|
|
|
| |
|
|
|
|
| +---+ |
|
|
|
|
| | O | Redhat Linux Image |
|
|
|
|
| | | | Boot 10MB Hard Disk |
|
|
|
|
| +---+ |
|
|
|
|
| |
|
|
|
|
| +---+ |
|
|
|
|
| | O | FreeDOS |
|
|
|
|
| | | | Boot 40MB Hard Disk |
|
|
|
|
| +---+ |
|
|
|
|
| |
|
|
|
|
| ?? Create new configuration |
|
|
|
|
| |
|
|
|
|
+--------------------------------------------------------+
|
|
|
|
|
|
|
|
////////////////////////////////////////////////////////////////////////////
|
2008-02-06 01:57:43 +03:00
|
|
|
// KeymappingDialog
|
2002-08-30 10:49:19 +04:00
|
|
|
////////////////////////////////////////////////////////////////////////////
|
|
|
|
more ambitious: create a button for each key on a standard keyboard, so that
|
2008-02-06 01:57:43 +03:00
|
|
|
you can view/edit/load/save key mappings, produce any combination of keys
|
2002-08-30 10:49:19 +04:00
|
|
|
(esp. ones that your OS or window manager won't allow)
|
|
|
|
|
|
|
|
////////////////////////////////////////////////////////////////////////////
|
2012-02-21 16:00:54 +04:00
|
|
|
// new AdvancedLogOptionsDialog
|
2002-08-30 10:49:19 +04:00
|
|
|
////////////////////////////////////////////////////////////////////////////
|
2002-09-02 21:03:14 +04:00
|
|
|
Try #2 for the advanced event configuration dialog.
|
|
|
|
It shows the selection of the default actions again
|
2008-02-06 01:57:43 +03:00
|
|
|
at the top, with some explanation. Then at bottom, you
|
|
|
|
can select a device in the list box and edit the settings
|
|
|
|
for that device individually. It would be possible to
|
2002-09-02 21:03:14 +04:00
|
|
|
allow selection of multiple devices and then edit several
|
|
|
|
devices at once.
|
|
|
|
|
|
|
|
+---- Advanced event configuration ---------------------+-+
|
|
|
|
| |
|
|
|
|
| +--- Default Actions -------------+ |
|
|
|
|
| First choose the | | |
|
|
|
|
| default actions | Debug events: [ignore] | |
|
|
|
|
| that apply to all | Info events: [ignore] | |
|
|
|
|
| event sources. | Error events: [report] | |
|
|
|
|
| | Panic events: [ask ] | |
|
|
|
|
| | | |
|
|
|
|
| | [Copy to All Devices] | |
|
|
|
|
| +---------------------------------+ |
|
|
|
|
| |
|
|
|
|
| Then, if you want you can edit the actions for |
|
|
|
|
| individual devices. For example if you are having |
|
|
|
|
| problems with the keyboard, you could ask for debug |
|
|
|
|
| and info events from the keyboard to be reported. |
|
|
|
|
| |
|
|
|
|
| Select Device: |
|
|
|
|
| +-------------+-+ +--- Actions for VGA -------------+ |
|
|
|
|
| | CPU |^| | | |
|
|
|
|
| | Interrupts ||| | Debug events: [ignore] | |
|
|
|
|
| |*VGA*********||| | Info events: [ignore] | |
|
|
|
|
| | Keyboard ||| | Error events: [report] | |
|
|
|
|
| | Mouse ||| | Panic events: [ask ] | |
|
|
|
|
| | Floppy Disk |v| | | |
|
|
|
|
| +-------------+-+ +---------------------------------+ |
|
|
|
|
| |
|
|
|
|
| [ Help ] [ Cancel ] [ Ok ] |
|
|
|
|
+---------------------------------------------------------+
|
2002-09-20 21:53:14 +04:00
|
|
|
|
|
|
|
+---- Configure events -------------------------------------+
|
|
|
|
| __________ ____________ |
|
|
|
|
| | Default \ | Per Device \ |
|
|
|
|
| | \------------------------------------------+ |
|
|
|
|
| | | |
|
|
|
|
| | Event log file [_______________________] [Browse] | |
|
|
|
|
| | | |
|
|
|
|
| | How should Bochs respond to each type of event? | |
|
|
|
|
| | | |
|
|
|
|
| | Debug events: [ignore] | |
|
|
|
|
| | Info events: [ignore] | |
|
|
|
|
| | Error events: [report] | |
|
|
|
|
| | Panic events: [ask ] | |
|
|
|
|
| | | |
|
|
|
|
| | For additional control over how each device responds | |
|
|
|
|
| | to events, click the "Per Device" tab above. | |
|
|
|
|
| | | |
|
|
|
|
| +------------------------------------------------------+ |
|
|
|
|
| [ Help ] [ Cancel ] [ Ok ] |
|
|
|
|
+-----------------------------------------------------------+
|
2008-02-06 01:57:43 +03:00
|
|
|
|
2002-09-20 21:53:14 +04:00
|
|
|
+---- Configure events -------------------------------------+
|
|
|
|
| __________ ____________ |
|
|
|
|
| | Default \ | Per Device \ |
|
|
|
|
| +-------------| \--------------------------+ |
|
|
|
|
| | | |
|
|
|
|
| | This table determines how Bochs will respond to each | |
|
|
|
|
| | kind of event coming from a particular source. For | |
|
|
|
|
| | example if you are having problems with the keyboard,| |
|
|
|
|
| | you could ask for debug and info events from the | |
|
|
|
|
| | keyboard to be reported. | |
|
|
|
|
| | | |
|
|
|
|
| | +------------------------------------------------+-+ | |
|
|
|
|
| | |Device Debug Info Error Panic |^| | |
|
|
|
|
| | |-------- -------- ------- -------- --------- ||| | |
|
|
|
|
| | |Keyboard [ignore] [ignore] [report] [report] ||| | |
|
|
|
|
| | |VGA [ignore] [ignore] [report] [report] ||| | |
|
|
|
|
| | |NE2000 [ignore] [ignore] [report] [report] ||| | |
|
|
|
|
| | |Sound [ignore] [ignore] [report] [report] |v| | |
|
|
|
|
| | +--------------------------------------------------+ | |
|
|
|
|
| | [Set defaults for all devices] | |
|
|
|
|
| +------------------------------------------------------+ |
|
|
|
|
| [ Help ] [ Cancel ] [ Ok ] |
|
|
|
|
+-----------------------------------------------------------+
|
|
|
|
|
2002-08-30 10:49:19 +04:00
|
|
|
*****************************************************************/
|