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
691 lines
17 KiB
C++
691 lines
17 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 02110-1301 USA
|
|
//
|
|
/////////////////////////////////////////////////////////////////////////
|
|
|
|
#include "bochs.h"
|
|
#include "cpu/cpu.h"
|
|
#include <assert.h>
|
|
|
|
#ifndef WIN32
|
|
#include <pthread.h>
|
|
#endif
|
|
|
|
#if BX_WITH_CARBON
|
|
#include <Carbon/Carbon.h>
|
|
#endif
|
|
|
|
// Just for the iofunctions
|
|
|
|
static int Allocio=0;
|
|
BX_MUTEX(logio_mutex);
|
|
|
|
const char* iofunctions::getlevel(int i) const
|
|
{
|
|
static const char *loglevel[N_LOGLEV] = {
|
|
"DEBUG",
|
|
"INFO",
|
|
"ERROR",
|
|
"PANIC"
|
|
};
|
|
|
|
if (i>=0 && i<N_LOGLEV) return loglevel[i];
|
|
else return "?";
|
|
}
|
|
|
|
static const char *act_name[N_ACT] = { "ignore", "report", "warn", "ask", "fatal" };
|
|
|
|
const char* iofunctions::getaction(int i) const
|
|
{
|
|
assert (i>=ACT_IGNORE && i<N_ACT);
|
|
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)
|
|
{
|
|
if(logfd && magic == MAGIC_LOGNUM) {
|
|
fflush(logfd);
|
|
}
|
|
}
|
|
|
|
void iofunctions::init(void)
|
|
{
|
|
// iofunctions methods must not be called before this magic
|
|
// number is set.
|
|
magic=MAGIC_LOGNUM;
|
|
|
|
BX_INIT_MUTEX(logio_mutex);
|
|
|
|
// sets the default logprefix
|
|
strcpy(logprefix,"%t%e%d");
|
|
n_logfn = 0;
|
|
init_log(stderr);
|
|
log = new logfunc_t(this);
|
|
log->put("logio", "IO");
|
|
log->ldebug("Init(log file: '%s').",logfn);
|
|
}
|
|
|
|
void iofunctions::add_logfn(logfunc_t *fn)
|
|
{
|
|
assert(n_logfn < MAX_LOGFNS);
|
|
logfn_list[n_logfn++] = fn;
|
|
}
|
|
|
|
void iofunctions::remove_logfn(logfunc_t *fn)
|
|
{
|
|
assert(n_logfn > 0);
|
|
int i = 0;
|
|
while ((i < n_logfn) && (fn != logfn_list[i])) {
|
|
i++;
|
|
};
|
|
if (i < n_logfn) {
|
|
for (int j=i; j<n_logfn-1; j++) {
|
|
logfn_list[j] = logfn_list[j+1];
|
|
}
|
|
n_logfn--;
|
|
}
|
|
}
|
|
|
|
void iofunctions::set_log_action(int loglevel, int action)
|
|
{
|
|
for(int i=0; i<n_logfn; i++)
|
|
logfn_list[i]->setonoff(loglevel, action);
|
|
}
|
|
|
|
void iofunctions::init_log(const char *fn)
|
|
{
|
|
assert(magic==MAGIC_LOGNUM);
|
|
// use newfd/newfn so that we can log the message to the OLD log
|
|
// file descriptor.
|
|
FILE *newfd = stderr;
|
|
const char *newfn = "/dev/stderr";
|
|
if(strcmp(fn, "-") != 0) {
|
|
newfd = fopen(fn, "w");
|
|
if(newfd != NULL) {
|
|
newfn = strdup(fn);
|
|
log->ldebug("Opened log file '%s'.", fn);
|
|
} else {
|
|
// in constructor, genlog might not exist yet, so do it the safe way.
|
|
log->error("Couldn't open log file: %s, using stderr instead", fn);
|
|
newfd = stderr;
|
|
}
|
|
}
|
|
logfd = newfd;
|
|
logfn = newfn;
|
|
}
|
|
|
|
void iofunctions::init_log(FILE *fs)
|
|
{
|
|
assert(magic==MAGIC_LOGNUM);
|
|
logfd = fs;
|
|
|
|
if(fs == stderr) {
|
|
logfn = "/dev/stderr";
|
|
} else if(fs == stdout) {
|
|
logfn = "/dev/stdout";
|
|
} else {
|
|
logfn = "(unknown)";
|
|
}
|
|
}
|
|
|
|
void iofunctions::init_log(int fd)
|
|
{
|
|
assert(magic==MAGIC_LOGNUM);
|
|
FILE *tmpfd;
|
|
if((tmpfd = fdopen(fd,"w")) == NULL) {
|
|
log->panic("Couldn't open fd %d as a stream for writing", fd);
|
|
return;
|
|
}
|
|
|
|
init_log(tmpfd);
|
|
};
|
|
|
|
void iofunctions::exit_log()
|
|
{
|
|
flush();
|
|
if (logfd != stderr) {
|
|
fclose(logfd);
|
|
logfd = stderr;
|
|
free((char *)logfn);
|
|
logfn = "/dev/stderr";
|
|
}
|
|
}
|
|
|
|
// all other functions may use genlog safely.
|
|
#define LOG_THIS genlog->
|
|
|
|
// This converts the option string to a printf style string with the following args:
|
|
// 1. timer, 2. event, 3. cpu0 eip, 4. device
|
|
void iofunctions::set_log_prefix(const char* prefix)
|
|
{
|
|
strcpy(logprefix, prefix);
|
|
}
|
|
|
|
// iofunctions::out(level, prefix, fmt, ap)
|
|
// DO NOT nest out() from ::info() and the like.
|
|
// fmt and ap retained for direct printinf from iofunctions only!
|
|
|
|
void iofunctions::out(int level, const char *prefix, const char *fmt, va_list ap)
|
|
{
|
|
char c = ' ', *s;
|
|
char tmpstr[80], msgpfx[80], msg[1024];
|
|
|
|
assert(magic==MAGIC_LOGNUM);
|
|
assert(this != NULL);
|
|
assert(logfd != NULL);
|
|
|
|
BX_LOCK(logio_mutex);
|
|
|
|
switch (level) {
|
|
case LOGLEV_INFO: c='i'; break;
|
|
case LOGLEV_PANIC: c='p'; break;
|
|
case LOGLEV_ERROR: c='e'; break;
|
|
case LOGLEV_DEBUG: c='d'; break;
|
|
default: break;
|
|
}
|
|
|
|
s = logprefix;
|
|
msgpfx[0] = 0;
|
|
while (*s) {
|
|
switch (*s) {
|
|
case '%':
|
|
if(*(s+1)) s++;
|
|
else break;
|
|
switch(*s) {
|
|
case 'd':
|
|
sprintf(tmpstr, "%s", prefix==NULL?"":prefix);
|
|
break;
|
|
case 't':
|
|
sprintf(tmpstr, FMT_TICK, bx_pc_system.time_ticks());
|
|
break;
|
|
case 'i':
|
|
#if BX_SUPPORT_SMP == 0
|
|
sprintf(tmpstr, "%08x", BX_CPU(0)->get_eip());
|
|
#endif
|
|
break;
|
|
case 'e':
|
|
sprintf(tmpstr, "%c", c);
|
|
break;
|
|
case '%':
|
|
sprintf(tmpstr,"%%");
|
|
break;
|
|
default:
|
|
sprintf(tmpstr,"%%%c",*s);
|
|
}
|
|
break;
|
|
default:
|
|
sprintf(tmpstr,"%c",*s);
|
|
}
|
|
strcat(msgpfx, tmpstr);
|
|
s++;
|
|
}
|
|
|
|
fprintf(logfd,"%s ", msgpfx);
|
|
|
|
if(level==LOGLEV_PANIC)
|
|
fprintf(logfd, ">>PANIC<< ");
|
|
|
|
vsnprintf(msg, sizeof(msg), fmt, ap);
|
|
fprintf(logfd, "%s\n", msg);
|
|
fflush(logfd);
|
|
if (SIM->has_log_viewer()) {
|
|
SIM->log_msg(msgpfx, level, msg);
|
|
}
|
|
BX_UNLOCK(logio_mutex);
|
|
}
|
|
|
|
iofunctions::iofunctions(FILE *fs)
|
|
{
|
|
init();
|
|
init_log(fs);
|
|
}
|
|
|
|
iofunctions::iofunctions(const char *fn)
|
|
{
|
|
init();
|
|
init_log(fn);
|
|
}
|
|
|
|
iofunctions::iofunctions(int fd)
|
|
{
|
|
init();
|
|
init_log(fd);
|
|
}
|
|
|
|
iofunctions::iofunctions()
|
|
{
|
|
init();
|
|
}
|
|
|
|
iofunctions::~iofunctions(void)
|
|
{
|
|
BX_FINI_MUTEX(logio_mutex);
|
|
|
|
// flush before erasing magic number, or flush does nothing.
|
|
flush();
|
|
magic=0;
|
|
}
|
|
|
|
#define LOG_THIS genlog->
|
|
|
|
int logfunctions::default_onoff[N_LOGLEV] =
|
|
{
|
|
ACT_IGNORE, // ignore debug
|
|
ACT_REPORT, // report info
|
|
ACT_REPORT, // report error
|
|
#if BX_WITH_SDL2 || BX_WITH_WX || BX_WITH_WIN32 || BX_WITH_X11
|
|
ACT_ASK // on panic, ask user what to do
|
|
#else
|
|
ACT_FATAL // on panic, quit
|
|
#endif
|
|
};
|
|
|
|
logfunctions::logfunctions(void)
|
|
{
|
|
name = NULL;
|
|
prefix = NULL;
|
|
put("?", " ");
|
|
if (io == NULL && Allocio == 0) {
|
|
Allocio = 1;
|
|
io = new iofunc_t(stderr);
|
|
}
|
|
setio(io);
|
|
// BUG: unfortunately this can be called before the bochsrc is read,
|
|
// which means that the bochsrc has no effect on the actions.
|
|
for (int i=0; i<N_LOGLEV; i++)
|
|
onoff[i] = get_default_action(i);
|
|
}
|
|
|
|
logfunctions::logfunctions(iofunc_t *iofunc)
|
|
{
|
|
name = NULL;
|
|
prefix = NULL;
|
|
put("?", " ");
|
|
setio(iofunc);
|
|
// BUG: unfortunately this can be called before the bochsrc is read,
|
|
// which means that the bochsrc has no effect on the actions.
|
|
for (int i=0; i<N_LOGLEV; i++)
|
|
onoff[i] = get_default_action(i);
|
|
}
|
|
|
|
logfunctions::~logfunctions()
|
|
{
|
|
logio->remove_logfn(this);
|
|
if (name) free(name);
|
|
if (prefix) free(prefix);
|
|
}
|
|
|
|
void logfunctions::setio(iofunc_t *i)
|
|
{
|
|
// add pointer to iofunction object to use
|
|
logio = i;
|
|
// give iofunction a pointer to me
|
|
i->add_logfn(this);
|
|
}
|
|
|
|
void logfunctions::put(const char *p)
|
|
{
|
|
char *n = strdup(p);
|
|
|
|
for (unsigned i=0; i<strlen(p); i++)
|
|
n[i] = tolower(p[i]);
|
|
|
|
put((const char*)n, p);
|
|
free(n);
|
|
}
|
|
|
|
void logfunctions::put(const char *n, const char *p)
|
|
{
|
|
char *tmpbuf=strdup(BX_NULL_PREFIX); // if we ever have more than 32 chars,
|
|
// we need to rethink this
|
|
if (tmpbuf == NULL)
|
|
return; // allocation not successful
|
|
|
|
if (name != NULL) {
|
|
free(name); // free previously allocated memory
|
|
name = NULL;
|
|
}
|
|
name = strdup(n);
|
|
|
|
if (prefix != NULL) {
|
|
free(prefix); // free previously allocated memory
|
|
prefix = NULL;
|
|
}
|
|
|
|
size_t len=strlen(p);
|
|
if (len > (strlen(tmpbuf) - 2)) {
|
|
len = strlen(tmpbuf) - 2;
|
|
}
|
|
for(size_t i=1;i <= len;i++) {
|
|
tmpbuf[i]=p[i-1];
|
|
}
|
|
|
|
prefix = tmpbuf;
|
|
}
|
|
|
|
void logfunctions::info(const char *fmt, ...)
|
|
{
|
|
va_list ap;
|
|
|
|
assert(logio != NULL);
|
|
|
|
if (!onoff[LOGLEV_INFO]) return;
|
|
|
|
va_start(ap, fmt);
|
|
logio->out(LOGLEV_INFO, prefix, fmt, ap);
|
|
va_end(ap);
|
|
|
|
if (onoff[LOGLEV_INFO] == ACT_ASK) {
|
|
va_start(ap, fmt);
|
|
ask(LOGLEV_INFO, prefix, fmt, ap);
|
|
va_end(ap);
|
|
}
|
|
if (onoff[LOGLEV_INFO] == ACT_FATAL) {
|
|
va_start(ap, fmt);
|
|
fatal(prefix, fmt, ap, 1);
|
|
}
|
|
}
|
|
|
|
void logfunctions::error(const char *fmt, ...)
|
|
{
|
|
va_list ap;
|
|
|
|
assert(logio != NULL);
|
|
|
|
if(!onoff[LOGLEV_ERROR]) return;
|
|
|
|
va_start(ap, fmt);
|
|
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);
|
|
va_end(ap);
|
|
}
|
|
if (onoff[LOGLEV_ERROR] == ACT_FATAL) {
|
|
va_start(ap, fmt);
|
|
fatal(prefix, fmt, ap, 1);
|
|
}
|
|
}
|
|
|
|
void logfunctions::panic(const char *fmt, ...)
|
|
{
|
|
va_list ap;
|
|
|
|
assert(logio != NULL);
|
|
|
|
// Special case for panics since they are so important. Always print
|
|
// the panic to the log, no matter what the log action says.
|
|
|
|
va_start(ap, fmt);
|
|
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);
|
|
va_end(ap);
|
|
}
|
|
if (onoff[LOGLEV_PANIC] == ACT_FATAL) {
|
|
va_start(ap, fmt);
|
|
fatal(prefix, fmt, ap, 1);
|
|
va_end(ap);
|
|
}
|
|
}
|
|
|
|
void logfunctions::ldebug(const char *fmt, ...)
|
|
{
|
|
va_list ap;
|
|
|
|
assert(logio != NULL);
|
|
|
|
if(!onoff[LOGLEV_DEBUG]) return;
|
|
|
|
va_start(ap, fmt);
|
|
logio->out(LOGLEV_DEBUG, prefix, fmt, ap);
|
|
va_end(ap);
|
|
|
|
// 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
|
|
// function that's called within ask() could trigger another
|
|
// BX_PANIC that could call ask() again, leading to infinite
|
|
// recursion and infinite asks.
|
|
static char in_ask_already = 0;
|
|
char buf1[1024];
|
|
if (in_ask_already) {
|
|
fprintf(stderr, "logfunctions::ask() should not reenter!!\n");
|
|
return;
|
|
}
|
|
in_ask_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);
|
|
int val = SIM->log_ask(prefix, level, buf1);
|
|
switch(val)
|
|
{
|
|
case BX_LOG_ASK_CHOICE_CONTINUE:
|
|
break;
|
|
case BX_LOG_ASK_CHOICE_CONTINUE_ALWAYS:
|
|
// user said continue, and don't "ask" for this facility again.
|
|
setonoff(level, ACT_REPORT);
|
|
break;
|
|
case BX_LOG_ASK_CHOICE_DIE:
|
|
case BX_LOG_NOTIFY_FAILED:
|
|
bx_user_quit = (val==BX_LOG_ASK_CHOICE_DIE)?1:0;
|
|
// fatal() quits the simulation in the calling method
|
|
setonoff(level, ACT_FATAL);
|
|
in_ask_already = 0;
|
|
return;
|
|
case BX_LOG_ASK_CHOICE_DUMP_CORE:
|
|
fprintf(stderr, "User chose to dump core...\n");
|
|
#if BX_HAVE_ABORT
|
|
abort();
|
|
#else
|
|
// do something highly illegal that should kill the process.
|
|
// Hey, this is fun!
|
|
{
|
|
char *crashptr = (char *)0; char c = *crashptr;
|
|
}
|
|
fprintf(stderr, "Sorry, I couldn't find your abort() function. Exiting.");
|
|
exit(0);
|
|
#endif
|
|
#if BX_DEBUGGER
|
|
case BX_LOG_ASK_CHOICE_ENTER_DEBUG:
|
|
// user chose debugger. To "drop into the debugger" we just set the
|
|
// interrupt_requested bit and continue execution. Before the next
|
|
// instruction, it should notice the user interrupt and return to
|
|
// the debugger.
|
|
bx_debug_break();
|
|
break;
|
|
#elif BX_GDBSTUB
|
|
case BX_LOG_ASK_CHOICE_ENTER_DEBUG:
|
|
bx_gdbstub_break();
|
|
break;
|
|
#endif
|
|
default:
|
|
// this happens if panics happen before the callback is initialized
|
|
// in gui/control.cc.
|
|
fprintf(stderr, "WARNING: log_msg returned unexpected value %d\n", val);
|
|
}
|
|
// return to simulation mode
|
|
SIM->set_display_mode(DISP_MODE_SIM);
|
|
in_ask_already = 0;
|
|
}
|
|
|
|
#if BX_WITH_CARBON
|
|
/* Panic button to display fatal errors.
|
|
Completely self contained, can't rely on carbon.cc being available */
|
|
static void carbonFatalDialog(const char *error, const char *exposition)
|
|
{
|
|
DialogRef alertDialog;
|
|
CFStringRef cfError;
|
|
CFStringRef cfExposition;
|
|
DialogItemIndex index;
|
|
AlertStdCFStringAlertParamRec alertParam = {0};
|
|
|
|
// Init libraries
|
|
InitCursor();
|
|
// Assemble dialog
|
|
cfError = CFStringCreateWithCString(NULL, error, kCFStringEncodingASCII);
|
|
if(exposition != NULL)
|
|
{
|
|
cfExposition = CFStringCreateWithCString(NULL, exposition, kCFStringEncodingASCII);
|
|
}
|
|
else {
|
|
cfExposition = NULL;
|
|
}
|
|
alertParam.version = kStdCFStringAlertVersionOne;
|
|
alertParam.defaultText = CFSTR("Quit");
|
|
alertParam.position = kWindowDefaultPosition;
|
|
alertParam.defaultButton = kAlertStdAlertOKButton;
|
|
// Display Dialog
|
|
CreateStandardAlert(
|
|
kAlertStopAlert,
|
|
cfError,
|
|
cfExposition, /* can be NULL */
|
|
&alertParam, /* can be NULL */
|
|
&alertDialog);
|
|
RunStandardAlert(alertDialog, NULL, &index);
|
|
// Cleanup
|
|
CFRelease(cfError);
|
|
if(cfExposition != NULL) { CFRelease(cfExposition); }
|
|
}
|
|
#endif
|
|
|
|
void logfunctions::fatal(const char *prefix, const char *fmt, va_list ap, int exit_status)
|
|
{
|
|
char tmpbuf[1024];
|
|
char exit_msg[1024];
|
|
|
|
if (!SIM->is_wx_selected()) {
|
|
// store prefix and message in 'exit_msg' before unloading device plugins
|
|
vsnprintf(tmpbuf, sizeof(tmpbuf), fmt, ap);
|
|
va_end(ap);
|
|
sprintf(exit_msg, "%s %s", prefix, tmpbuf);
|
|
}
|
|
#if !BX_DEBUGGER
|
|
bx_atexit();
|
|
#endif
|
|
#if BX_WITH_CARBON
|
|
if(!isatty(STDIN_FILENO) && !SIM->get_init_done())
|
|
{
|
|
char buf1[1024];
|
|
char buf2[1024];
|
|
vsnprintf(buf1, sizeof(buf1), fmt, ap);
|
|
snprintf(buf2, sizeof(buf2), "Bochs startup error\n%s", buf1);
|
|
carbonFatalDialog(buf2,
|
|
"For more information, try running Bochs within Terminal by clicking on \"bochs.scpt\".");
|
|
}
|
|
#endif
|
|
if (!SIM->is_wx_selected()) {
|
|
static const char *divider = "========================================================================";
|
|
fprintf(stderr, "%s\n", divider);
|
|
fprintf(stderr, "Bochs is exiting with the following message:\n");
|
|
fprintf(stderr, "%s", exit_msg);
|
|
fprintf(stderr, "\n%s\n", divider);
|
|
}
|
|
#if !BX_DEBUGGER
|
|
BX_EXIT(exit_status);
|
|
#else
|
|
bx_dbg_exit(exit_status);
|
|
#endif
|
|
// not safe to use BX_* log functions in here.
|
|
fprintf(stderr, "fatal() should never return, but it just did\n");
|
|
}
|
|
|
|
iofunc_t *io = NULL;
|
|
logfunc_t *genlog = NULL;
|
|
|
|
void bx_center_print(FILE *file, const char *line, unsigned maxwidth)
|
|
{
|
|
size_t len = strlen(line);
|
|
if (len > maxwidth)
|
|
BX_PANIC(("bx_center_print: line is too long: '%s'", line));
|
|
size_t imax = (maxwidth - len) >> 1;
|
|
for (size_t i=0; i<imax; i++) fputc(' ', file);
|
|
fputs(line, file);
|
|
}
|