85fcabbd8f
--- /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
655 lines
21 KiB
C++
655 lines
21 KiB
C++
/////////////////////////////////////////////////////////////////////////
|
|
// $Id$
|
|
/////////////////////////////////////////////////////////////////////////
|
|
//
|
|
// 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
|
|
// 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 B 02110-1301 USA
|
|
|
|
//
|
|
// bochs.h is the master header file for all C++ code. It includes all
|
|
// the system header files needed by bochs, and also includes all the bochs
|
|
// C++ header files. Because bochs.h and the files that it includes has
|
|
// structure and class definitions, it cannot be called from C code.
|
|
//
|
|
|
|
#ifndef BX_BOCHS_H
|
|
# define BX_BOCHS_H 1
|
|
|
|
#include "config.h" /* generated by configure script from config.h.in */
|
|
|
|
#ifndef __QNXNTO__
|
|
extern "C" {
|
|
#endif
|
|
|
|
#ifdef WIN32
|
|
// In a win32 compile (including cygwin), windows.h is required for several
|
|
// files in gui and iodev. It is important to include it here in a header
|
|
// file so that WIN32-specific data types can be used in fields of classes.
|
|
#define WIN32_LEAN_AND_MEAN
|
|
#include <windows.h>
|
|
#endif
|
|
|
|
#include <stdarg.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#if defined(__sun__)
|
|
#undef EAX
|
|
#undef ECX
|
|
#undef EDX
|
|
#undef EBX
|
|
#undef ESP
|
|
#undef EBP
|
|
#undef ESI
|
|
#undef EDI
|
|
#undef EIP
|
|
#undef CS
|
|
#undef DS
|
|
#undef ES
|
|
#undef SS
|
|
#undef FS
|
|
#undef GS
|
|
#endif
|
|
#include <assert.h>
|
|
#include <errno.h>
|
|
|
|
#ifndef WIN32
|
|
# include <unistd.h>
|
|
#else
|
|
# include <io.h>
|
|
#endif
|
|
#include <time.h>
|
|
#if BX_WITH_MACOS
|
|
# include <types.h>
|
|
# include <stat.h>
|
|
# include <cstdio>
|
|
# include <unistd.h>
|
|
#elif BX_WITH_CARBON
|
|
# include <sys/types.h>
|
|
# include <sys/stat.h>
|
|
# include <sys/param.h> /* for MAXPATHLEN */
|
|
# include <sys/time.h>
|
|
# include <utime.h>
|
|
#else
|
|
# ifndef WIN32
|
|
# include <sys/time.h>
|
|
# endif
|
|
# include <sys/types.h>
|
|
# include <sys/stat.h>
|
|
#endif
|
|
#include <ctype.h>
|
|
#include <string.h>
|
|
#include <fcntl.h>
|
|
#include <limits.h>
|
|
#ifdef macintosh
|
|
# define SuperDrive "[fd:]"
|
|
#endif
|
|
|
|
#ifndef __QNXNTO__
|
|
}
|
|
#endif
|
|
|
|
#include "osdep.h" /* platform dependent includes and defines */
|
|
#include "bx_debug/debug.h"
|
|
#include "gui/siminterface.h"
|
|
|
|
// BX_SHARE_PATH should be defined by the makefile. If not, give it
|
|
// a value of NULL to avoid compile problems.
|
|
#ifndef BX_SHARE_PATH
|
|
#define BX_SHARE_PATH NULL
|
|
#endif
|
|
|
|
// prototypes
|
|
int bx_begin_simulation(int argc, char *argv[]);
|
|
void bx_stop_simulation();
|
|
char *bx_find_bochsrc(void);
|
|
int bx_parse_cmdline(int arg, int argc, char *argv[]);
|
|
int bx_read_configuration(const char *rcfile);
|
|
int bx_write_configuration(const char *rcfile, int overwrite);
|
|
void bx_reset_options(void);
|
|
void bx_set_log_actions_by_device(bx_bool panic_flag);
|
|
// special config parameter and options functions for plugins
|
|
void bx_init_std_nic_options(const char *name, bx_list_c *menu);
|
|
void bx_init_usb_options(const char *usb_name, const char *pname, int maxports);
|
|
int bx_parse_param_from_list(const char *context, const char *input, bx_list_c *list);
|
|
int bx_parse_nic_params(const char *context, const char *param, bx_list_c *base);
|
|
int bx_parse_usb_port_params(const char *context, bx_bool devopt,
|
|
const char *param, int maxports, bx_list_c *base);
|
|
int bx_write_param_list(FILE *fp, bx_list_c *base, const char *optname, bx_bool multiline);
|
|
int bx_write_usb_options(FILE *fp, int maxports, bx_list_c *base);
|
|
|
|
Bit32u crc32(const Bit8u *buf, int len);
|
|
|
|
// used to print param tree from debugger
|
|
void print_tree(bx_param_c *node, int level = 0, bx_bool xml = BX_FALSE);
|
|
|
|
#if BX_ENABLE_STATISTICS
|
|
// print statistics
|
|
void print_statistics_tree(bx_param_c *node, int level = 0);
|
|
#define INC_STAT(stat) (++(stat))
|
|
#else
|
|
#define INC_STAT(stat)
|
|
#endif
|
|
|
|
//
|
|
// some macros to interface the CPU and memory to external environment
|
|
// so that these functions can be redirected to the debugger when
|
|
// needed.
|
|
//
|
|
|
|
#define BXRS_PARAM_SPECIAL(parent, name, maxvalue, save_handler, restore_handler) \
|
|
{ \
|
|
bx_param_num_c *param = new bx_param_num_c(parent, #name, "", "", 0, maxvalue, 0); \
|
|
param->set_base(BASE_HEX); \
|
|
param->set_sr_handlers(this, save_handler, restore_handler); \
|
|
}
|
|
|
|
#define BXRS_PARAM_SPECIAL64(parent, name, save_handler, restore_handler) \
|
|
BXRS_PARAM_SPECIAL(parent, name, BX_MAX_BIT64U, save_handler, restore_handler)
|
|
#define BXRS_PARAM_SPECIAL32(parent, name, save_handler, restore_handler) \
|
|
BXRS_PARAM_SPECIAL(parent, name, BX_MAX_BIT32U, save_handler, restore_handler)
|
|
#define BXRS_PARAM_SPECIAL16(parent, name, save_handler, restore_handler) \
|
|
BXRS_PARAM_SPECIAL(parent, name, BX_MAX_BIT16U, save_handler, restore_handler)
|
|
#define BXRS_PARAM_SPECIAL8(parent, name, save_handler, restore_handler) \
|
|
BXRS_PARAM_SPECIAL(parent, name, BX_MAX_BIT8U, save_handler, restore_handler)
|
|
|
|
#define BXRS_HEX_PARAM_SIMPLE32(parent, name) \
|
|
new bx_shadow_num_c(parent, #name, (Bit32u*)&(name), BASE_HEX)
|
|
#define BXRS_HEX_PARAM_SIMPLE64(parent, name) \
|
|
new bx_shadow_num_c(parent, #name, (Bit64u*)&(name), BASE_HEX)
|
|
|
|
#define BXRS_HEX_PARAM_SIMPLE(parent, name) \
|
|
new bx_shadow_num_c(parent, #name, &(name), BASE_HEX)
|
|
#define BXRS_HEX_PARAM_FIELD(parent, name, field) \
|
|
new bx_shadow_num_c(parent, #name, &(field), BASE_HEX)
|
|
|
|
#define BXRS_DEC_PARAM_SIMPLE(parent, name) \
|
|
new bx_shadow_num_c(parent, #name, &(name), BASE_DEC)
|
|
#define BXRS_DEC_PARAM_FIELD(parent, name, field) \
|
|
new bx_shadow_num_c(parent, #name, &(field), BASE_DEC)
|
|
|
|
#define BXRS_PARAM_BOOL(parent, name, field) \
|
|
new bx_shadow_bool_c(parent, #name, (bx_bool*)(&(field)))
|
|
|
|
// =-=-=-=-=-=-=- Normal optimized use -=-=-=-=-=-=-=-=-=-=-=-=-=-=
|
|
// some pc_systems functions just redirect to the IO devices so optimize
|
|
// by eliminating call here
|
|
//
|
|
// #define BX_INP(addr, len) bx_pc_system.inp(addr, len)
|
|
// #define BX_OUTP(addr, val, len) bx_pc_system.outp(addr, val, len)
|
|
#define BX_INP(addr, len) bx_devices.inp(addr, len)
|
|
#define BX_OUTP(addr, val, len) bx_devices.outp(addr, val, len)
|
|
#define BX_TICK1() bx_pc_system.tick1()
|
|
#define BX_TICKN(n) bx_pc_system.tickn(n)
|
|
#define BX_INTR bx_pc_system.INTR
|
|
#define BX_RAISE_INTR() bx_pc_system.raise_INTR()
|
|
#define BX_CLEAR_INTR() bx_pc_system.clear_INTR()
|
|
#define BX_HRQ bx_pc_system.HRQ
|
|
|
|
#if BX_SUPPORT_SMP
|
|
#define BX_CPU(x) (bx_cpu_array[x])
|
|
#else
|
|
#define BX_CPU(x) (&bx_cpu)
|
|
#endif
|
|
|
|
#define BX_MEM(x) (&bx_mem)
|
|
|
|
#define BX_SET_ENABLE_A20(enabled) bx_pc_system.set_enable_a20(enabled)
|
|
#define BX_GET_ENABLE_A20() bx_pc_system.get_enable_a20()
|
|
|
|
#if BX_SUPPORT_A20
|
|
# define A20ADDR(x) ((bx_phy_address)(x) & bx_pc_system.a20_mask)
|
|
#else
|
|
# define A20ADDR(x) ((bx_phy_address)(x))
|
|
#endif
|
|
|
|
// you can't use static member functions on the CPU, if there are going
|
|
// to be 2 cpus. Check this early on.
|
|
#if BX_SUPPORT_SMP
|
|
# if BX_USE_CPU_SMF
|
|
# error For SMP simulation, BX_USE_CPU_SMF must be 0.
|
|
# endif
|
|
#endif
|
|
|
|
//
|
|
// Ways for the the external environment to report back information
|
|
// to the debugger.
|
|
//
|
|
|
|
#if BX_DEBUGGER
|
|
# define BX_DBG_ASYNC_INTR bx_guard.async.irq
|
|
# define BX_DBG_ASYNC_DMA bx_guard.async.dma
|
|
|
|
# define BX_DBG_DMA_REPORT(addr, len, what, val) \
|
|
if (bx_guard.report.dma) bx_dbg_dma_report(addr, len, what, val)
|
|
# define BX_DBG_IAC_REPORT(vector, irq) \
|
|
if (bx_guard.report.irq) bx_dbg_iac_report(vector, irq)
|
|
# define BX_DBG_A20_REPORT(val) \
|
|
if (bx_guard.report.a20) bx_dbg_a20_report(val)
|
|
# define BX_DBG_IO_REPORT(port, size, op, val) \
|
|
if (bx_guard.report.io) bx_dbg_io_report(port, size, op, val)
|
|
# define BX_DBG_LIN_MEMORY_ACCESS(cpu, lin, phy, len, memtype, rw, data) \
|
|
bx_dbg_lin_memory_access(cpu, lin, phy, len, memtype, rw, data)
|
|
# define BX_DBG_PHY_MEMORY_ACCESS(cpu, phy, len, memtype, rw, why, data) \
|
|
bx_dbg_phy_memory_access(cpu, phy, len, memtype, rw, why, data)
|
|
#else // #if BX_DEBUGGER
|
|
// debugger not compiled in, use empty stubs
|
|
# define BX_DBG_ASYNC_INTR 1
|
|
# define BX_DBG_ASYNC_DMA 1
|
|
# define BX_DBG_DMA_REPORT(addr, len, what, val) /* empty */
|
|
# define BX_DBG_IAC_REPORT(vector, irq) /* empty */
|
|
# define BX_DBG_A20_REPORT(val) /* empty */
|
|
# define BX_DBG_IO_REPORT(port, size, op, val) /* empty */
|
|
# define BX_DBG_LIN_MEMORY_ACCESS(cpu, lin, phy, len, memtype, rw, data) /* empty */
|
|
# define BX_DBG_PHY_MEMORY_ACCESS(cpu, phy, len, memtype, rw, attr, data) /* empty */
|
|
#endif // #if BX_DEBUGGER
|
|
|
|
#define MAGIC_LOGNUM 0x12345678
|
|
|
|
typedef class BOCHSAPI logfunctions
|
|
{
|
|
char *name;
|
|
char *prefix;
|
|
int onoff[N_LOGLEV];
|
|
class iofunctions *logio;
|
|
// default log actions for all devices, declared and initialized
|
|
// in logio.cc.
|
|
BOCHSAPI_CYGONLY static int default_onoff[N_LOGLEV];
|
|
public:
|
|
logfunctions(void);
|
|
logfunctions(class iofunctions *);
|
|
virtual ~logfunctions(void);
|
|
|
|
void info(const char *fmt, ...) BX_CPP_AttrPrintf(2, 3);
|
|
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 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 *);
|
|
void setonoff(int loglev, int value) {
|
|
assert (loglev >= 0 && loglev < N_LOGLEV);
|
|
onoff[loglev] = value;
|
|
}
|
|
const char *get_name() const { return name; }
|
|
const char *getprefix() const { return prefix; }
|
|
int getonoff(int level) const {
|
|
assert (level>=0 && level<N_LOGLEV);
|
|
return onoff[level];
|
|
}
|
|
static void set_default_action(int loglev, int action) {
|
|
assert (loglev >= 0 && loglev < N_LOGLEV);
|
|
assert (action >= 0 && action < N_ACT);
|
|
default_onoff[loglev] = action;
|
|
}
|
|
static int get_default_action(int loglev) {
|
|
assert (loglev >= 0 && loglev < N_LOGLEV);
|
|
return default_onoff[loglev];
|
|
}
|
|
} logfunc_t;
|
|
|
|
#define BX_LOGPREFIX_LEN 20
|
|
|
|
class BOCHSAPI iofunctions {
|
|
int magic;
|
|
char logprefix[BX_LOGPREFIX_LEN + 1];
|
|
FILE *logfd;
|
|
class logfunctions *log;
|
|
void init(void);
|
|
void flush(void);
|
|
|
|
// Log Class types
|
|
public:
|
|
iofunctions(void);
|
|
iofunctions(FILE *);
|
|
iofunctions(int);
|
|
iofunctions(const char *);
|
|
~iofunctions(void);
|
|
|
|
void out(int level, const char *pre, const char *fmt, va_list ap);
|
|
|
|
void init_log(const char *fn);
|
|
void init_log(int fd);
|
|
void init_log(FILE *fs);
|
|
void exit_log();
|
|
void set_log_prefix(const char *prefix);
|
|
int get_n_logfns() const { return n_logfn; }
|
|
logfunc_t *get_logfn(int index) { return logfn_list[index]; }
|
|
void add_logfn(logfunc_t *fn);
|
|
void remove_logfn(logfunc_t *fn);
|
|
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
|
|
logfunc_t *logfn_list[MAX_LOGFNS];
|
|
const char *logfn;
|
|
};
|
|
|
|
typedef class iofunctions iofunc_t;
|
|
|
|
#define SAFE_GET_IOFUNC() \
|
|
((io==NULL)? (io=new iofunc_t("/dev/stderr")) : io)
|
|
#define SAFE_GET_GENLOG() \
|
|
((genlog==NULL)? (genlog=new logfunc_t(SAFE_GET_IOFUNC())) : genlog)
|
|
|
|
#if BX_NO_LOGGING
|
|
|
|
#define BX_INFO(x)
|
|
#define BX_DEBUG(x)
|
|
#define BX_ERROR(x)
|
|
#define BX_PANIC(x) (LOG_THIS panic) x
|
|
|
|
#define BX_ASSERT(x)
|
|
|
|
#else
|
|
|
|
#define BX_INFO(x) (LOG_THIS info) x
|
|
#define BX_DEBUG(x) (LOG_THIS ldebug) x
|
|
#define BX_ERROR(x) (LOG_THIS error) x
|
|
#define BX_PANIC(x) (LOG_THIS panic) x
|
|
|
|
#if BX_ASSERT_ENABLE
|
|
#define BX_ASSERT(x) do {if (!(x)) BX_PANIC(("failed assertion \"%s\" at %s:%d\n", #x, __FILE__, __LINE__));} while (0)
|
|
#else
|
|
#define BX_ASSERT(x)
|
|
#endif
|
|
|
|
#endif
|
|
|
|
BOCHSAPI extern iofunc_t *io;
|
|
BOCHSAPI extern logfunc_t *genlog;
|
|
|
|
#ifndef UNUSED
|
|
# define UNUSED(x) ((void)x)
|
|
#endif
|
|
|
|
//Generic MAX and MIN Functions
|
|
#define BX_MAX(a,b) ((a) > (b) ? (a) : (b))
|
|
#define BX_MIN(a,b) ((a) < (b) ? (a) : (b))
|
|
|
|
#if BX_SUPPORT_X86_64
|
|
#define FMT_ADDRX FMT_ADDRX64
|
|
#else
|
|
#define FMT_ADDRX FMT_ADDRX32
|
|
#endif
|
|
|
|
#if BX_PHY_ADDRESS_LONG
|
|
#define FMT_PHY_ADDRX FMT_PHY_ADDRX64
|
|
#else
|
|
#define FMT_PHY_ADDRX FMT_ADDRX32
|
|
#endif
|
|
|
|
#define FMT_LIN_ADDRX FMT_ADDRX
|
|
|
|
#if BX_GDBSTUB
|
|
// defines for GDB stub
|
|
void bx_gdbstub_init(void);
|
|
void bx_gdbstub_break(void);
|
|
int bx_gdbstub_check(unsigned int eip);
|
|
#define GDBSTUB_STOP_NO_REASON (0xac0)
|
|
|
|
#if BX_SUPPORT_SMP
|
|
#error GDB stub was written for single processor support. If multiprocessor support is added, then we can remove this check.
|
|
// The big problem is knowing which CPU gdb is referring to. In other words,
|
|
// what should we put for "n" in BX_CPU(n)->dbg_xlate_linear2phy() and
|
|
// BX_CPU(n)->dword.eip, etc.
|
|
#endif
|
|
#endif
|
|
|
|
typedef struct {
|
|
bx_bool interrupts;
|
|
bx_bool exceptions;
|
|
bx_bool print_timestamps;
|
|
#if BX_DEBUGGER
|
|
bx_bool magic_break_enabled;
|
|
#endif
|
|
#if BX_GDBSTUB
|
|
bx_bool gdbstub_enabled;
|
|
#endif
|
|
#if BX_SUPPORT_APIC
|
|
bx_bool apic;
|
|
#endif
|
|
#if BX_DEBUG_LINUX
|
|
bx_bool linux_syscall;
|
|
#endif
|
|
} bx_debug_t;
|
|
|
|
#if BX_SHOW_IPS
|
|
BOCHSAPI_MSVCONLY void bx_show_ips_handler(void);
|
|
#endif
|
|
void CDECL bx_signal_handler(int signum);
|
|
int bx_atexit(void);
|
|
BOCHSAPI extern bx_debug_t bx_dbg;
|
|
|
|
#if BX_SUPPORT_APIC
|
|
// determinted by XAPIC option
|
|
BOCHSAPI extern Bit32u apic_id_mask;
|
|
#endif
|
|
|
|
// memory access type (read/write/execute/rw)
|
|
#define BX_READ 0
|
|
#define BX_WRITE 1
|
|
#define BX_EXECUTE 2
|
|
#define BX_RW 3
|
|
|
|
// types of reset
|
|
#define BX_RESET_SOFTWARE 10
|
|
#define BX_RESET_HARDWARE 11
|
|
|
|
#include "memory/memory-bochs.h"
|
|
#include "pc_system.h"
|
|
#include "gui/gui.h"
|
|
|
|
/* --- EXTERNS --- */
|
|
|
|
#if BX_GUI_SIGHANDLER
|
|
extern bx_bool bx_gui_sighandler;
|
|
#endif
|
|
|
|
// This value controls how often each I/O device's timer handler
|
|
// gets called. The timer is set up in iodev/devices.cc.
|
|
#define BX_IODEV_HANDLER_PERIOD 1000 // microseconds
|
|
|
|
#define BX_PATHNAME_LEN 512
|
|
|
|
#define BX_KBD_XT_TYPE 0
|
|
#define BX_KBD_AT_TYPE 1
|
|
#define BX_KBD_MF_TYPE 2
|
|
|
|
#define BX_N_OPTROM_IMAGES 4
|
|
#define BX_N_OPTRAM_IMAGES 4
|
|
#define BX_N_SERIAL_PORTS 4
|
|
#define BX_N_PARALLEL_PORTS 2
|
|
#define BX_N_PCI_SLOTS 5
|
|
#define BX_N_USER_PLUGINS 8
|
|
|
|
void bx_center_print(FILE *file, const char *line, unsigned maxwidth);
|
|
|
|
#include "instrument.h"
|
|
|
|
BX_CPP_INLINE Bit16u bx_bswap16(Bit16u val16)
|
|
{
|
|
return (val16<<8) | (val16>>8);
|
|
}
|
|
|
|
#if !defined(__MORPHOS__)
|
|
#if BX_HAVE___BUILTIN_BSWAP32
|
|
#define bx_bswap32 __builtin_bswap32
|
|
#else
|
|
BX_CPP_INLINE Bit32u bx_bswap32(Bit32u val32)
|
|
{
|
|
val32 = ((val32<<8) & 0xFF00FF00) | ((val32>>8) & 0x00FF00FF);
|
|
return (val32<<16) | (val32>>16);
|
|
}
|
|
#endif
|
|
|
|
#if BX_HAVE___BUILTIN_BSWAP64
|
|
#define bx_bswap64 __builtin_bswap64
|
|
#else
|
|
BX_CPP_INLINE Bit64u bx_bswap64(Bit64u val64)
|
|
{
|
|
Bit32u lo = bx_bswap32((Bit32u)(val64 >> 32));
|
|
Bit32u hi = bx_bswap32((Bit32u)(val64 & 0xFFFFFFFF));
|
|
return ((Bit64u)hi << 32) | (Bit64u)lo;
|
|
}
|
|
#endif
|
|
#endif // !MorphOS
|
|
|
|
// These are some convenience macros which abstract out accesses between
|
|
// a variable in native byte ordering to/from guest (x86) memory, which is
|
|
// always in little endian format. You must deal with alignment (if your
|
|
// system cares) and endian rearranging. Don't assume anything. You could
|
|
// put some platform specific asm() statements here, to make use of native
|
|
// instructions to help perform these operations more efficiently than C++.
|
|
|
|
#ifdef BX_LITTLE_ENDIAN
|
|
|
|
#define WriteHostWordToLittleEndian(hostPtr, nativeVar16) \
|
|
*((Bit16u*)(hostPtr)) = (nativeVar16)
|
|
#define WriteHostDWordToLittleEndian(hostPtr, nativeVar32) \
|
|
*((Bit32u*)(hostPtr)) = (nativeVar32)
|
|
#ifdef ANDROID
|
|
// Resolve problems with unaligned access
|
|
#define WriteHostQWordToLittleEndian(hostPtr, nativeVar64) { \
|
|
((Bit8u *)(hostPtr))[0] = (Bit8u) (nativeVar64); \
|
|
((Bit8u *)(hostPtr))[1] = (Bit8u) ((nativeVar64)>>8); \
|
|
((Bit8u *)(hostPtr))[2] = (Bit8u) ((nativeVar64)>>16); \
|
|
((Bit8u *)(hostPtr))[3] = (Bit8u) ((nativeVar64)>>24); \
|
|
((Bit8u *)(hostPtr))[4] = (Bit8u) ((nativeVar64)>>32); \
|
|
((Bit8u *)(hostPtr))[5] = (Bit8u) ((nativeVar64)>>40); \
|
|
((Bit8u *)(hostPtr))[6] = (Bit8u) ((nativeVar64)>>48); \
|
|
((Bit8u *)(hostPtr))[7] = (Bit8u) ((nativeVar64)>>56); \
|
|
}
|
|
#else
|
|
#define WriteHostQWordToLittleEndian(hostPtr, nativeVar64) \
|
|
*((Bit64u*)(hostPtr)) = (nativeVar64)
|
|
#endif
|
|
#define ReadHostWordFromLittleEndian(hostPtr, nativeVar16) \
|
|
(nativeVar16) = *((Bit16u*)(hostPtr))
|
|
#define ReadHostDWordFromLittleEndian(hostPtr, nativeVar32) \
|
|
(nativeVar32) = *((Bit32u*)(hostPtr))
|
|
#ifdef ANDROID
|
|
// Resolve problems with unaligned access
|
|
#define ReadHostQWordFromLittleEndian(hostPtr, nativeVar64) { \
|
|
(nativeVar64) = ((Bit64u) ((Bit8u *)(hostPtr))[0]) | \
|
|
(((Bit64u) ((Bit8u *)(hostPtr))[1])<<8) | \
|
|
(((Bit64u) ((Bit8u *)(hostPtr))[2])<<16) | \
|
|
(((Bit64u) ((Bit8u *)(hostPtr))[3])<<24) | \
|
|
(((Bit64u) ((Bit8u *)(hostPtr))[4])<<32) | \
|
|
(((Bit64u) ((Bit8u *)(hostPtr))[5])<<40) | \
|
|
(((Bit64u) ((Bit8u *)(hostPtr))[6])<<48) | \
|
|
(((Bit64u) ((Bit8u *)(hostPtr))[7])<<56); \
|
|
}
|
|
#else
|
|
#define ReadHostQWordFromLittleEndian(hostPtr, nativeVar64) \
|
|
(nativeVar64) = *((Bit64u*)(hostPtr))
|
|
#endif
|
|
|
|
#else
|
|
|
|
#ifdef __MORPHOS__
|
|
|
|
#define bx_bswap16 bx_ppc_bswap16
|
|
#define bx_bswap32 bx_ppc_bswap32
|
|
#define bx_bswap64 bx_ppc_bswap64
|
|
|
|
#define WriteHostWordToLittleEndian(hostPtr, nativeVar16) { \
|
|
bx_ppc_store_le16((Bit16u *)(hostPtr), (Bit16u)(nativeVar16)); \
|
|
}
|
|
#define WriteHostDWordToLittleEndian(hostPtr, nativeVar32) { \
|
|
bx_ppc_store_le32((Bit32u *)(hostPtr), (Bit32u)(nativeVar32)); \
|
|
}
|
|
#define WriteHostQWordToLittleEndian(hostPtr, nativeVar64) { \
|
|
bx_ppc_store_le64((Bit64u *)(hostPtr), (Bit64u)(nativeVar64)); \
|
|
}
|
|
|
|
#define ReadHostWordFromLittleEndian(hostPtr, nativeVar16) { \
|
|
(nativeVar16) = bx_ppc_load_le16((Bit16u *)(hostPtr)); \
|
|
}
|
|
#define ReadHostDWordFromLittleEndian(hostPtr, nativeVar32) { \
|
|
(nativeVar32) = bx_ppc_load_le32((Bit32u *)(hostPtr)); \
|
|
}
|
|
#define ReadHostQWordFromLittleEndian(hostPtr, nativeVar64) { \
|
|
(nativeVar64) = bx_ppc_load_le64((Bit64u *)(hostPtr)); \
|
|
}
|
|
|
|
#else
|
|
|
|
#define WriteHostWordToLittleEndian(hostPtr, nativeVar16) { \
|
|
*(Bit16u *)(hostPtr) = bx_bswap16((Bit16u)(nativeVar16)); \
|
|
}
|
|
#define WriteHostDWordToLittleEndian(hostPtr, nativeVar32) { \
|
|
*(Bit32u *)(hostPtr) = bx_bswap32((Bit32u)(nativeVar32)); \
|
|
}
|
|
#define WriteHostQWordToLittleEndian(hostPtr, nativeVar64) { \
|
|
*(Bit64u *)(hostPtr) = bx_bswap64((Bit64u)(nativeVar64)); \
|
|
}
|
|
|
|
#define ReadHostWordFromLittleEndian(hostPtr, nativeVar16) { \
|
|
(nativeVar16) = bx_bswap16(*(Bit16u *)(hostPtr)); \
|
|
}
|
|
#define ReadHostDWordFromLittleEndian(hostPtr, nativeVar32) { \
|
|
(nativeVar32) = bx_bswap32(*(Bit32u *)(hostPtr)); \
|
|
}
|
|
#define ReadHostQWordFromLittleEndian(hostPtr, nativeVar64) { \
|
|
(nativeVar64) = bx_bswap64(*(Bit64u *)(hostPtr)); \
|
|
}
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
#define CopyHostWordLittleEndian(hostAddrDst, hostAddrSrc) \
|
|
(* (Bit16u *)(hostAddrDst)) = (* (Bit16u *)(hostAddrSrc));
|
|
#define CopyHostDWordLittleEndian(hostAddrDst, hostAddrSrc) \
|
|
(* (Bit32u *)(hostAddrDst)) = (* (Bit32u *)(hostAddrSrc));
|
|
#define CopyHostQWordLittleEndian(hostAddrDst, hostAddrSrc) \
|
|
(* (Bit64u *)(hostAddrDst)) = (* (Bit64u *)(hostAddrSrc));
|
|
|
|
// multithreading support
|
|
#ifdef WIN32
|
|
#define BX_THREAD_ID(id) DWORD (id)
|
|
#define BX_THREAD_FUNC(name,arg) DWORD WINAPI name(LPVOID arg)
|
|
#define BX_THREAD_EXIT return 0
|
|
#define BX_THREAD_CREATE(name,arg,id) CreateThread(NULL, 0, name, arg, 0, &(id))
|
|
#define BX_LOCK(mutex) EnterCriticalSection(&(mutex))
|
|
#define BX_UNLOCK(mutex) LeaveCriticalSection(&(mutex))
|
|
#define BX_MUTEX(mutex) CRITICAL_SECTION (mutex)
|
|
#define BX_INIT_MUTEX(mutex) InitializeCriticalSection(&(mutex))
|
|
#define BX_FINI_MUTEX(mutex) DeleteCriticalSection(&(mutex))
|
|
#define BX_MSLEEP(val) Sleep(val)
|
|
#else
|
|
#define BX_THREAD_ID(id) pthread_t (id)
|
|
#define BX_THREAD_FUNC(name,arg) void name(void* arg)
|
|
#define BX_THREAD_EXIT pthread_exit(NULL)
|
|
#define BX_THREAD_CREATE(name,arg,id) \
|
|
pthread_create(&(id), NULL, (void *(*)(void *))&(name), arg)
|
|
#define BX_LOCK(mutex) pthread_mutex_lock(&(mutex));
|
|
#define BX_UNLOCK(mutex) pthread_mutex_unlock(&(mutex));
|
|
#define BX_MUTEX(mutex) pthread_mutex_t (mutex)
|
|
#define BX_INIT_MUTEX(mutex) pthread_mutex_init(&(mutex),NULL)
|
|
#define BX_FINI_MUTEX(mutex) pthread_mutex_destroy(&(mutex))
|
|
#define BX_MSLEEP(val) usleep(val*1000)
|
|
#endif
|
|
|
|
#endif /* BX_BOCHS_H */
|