folkert/simh-testsetgenerator
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SCP: Report name of device that returns an error from its initial reset call

Browse source
This commit is contained in:
Mark Pizzolato 2020-10-05 17:48:37 -07:00
parent 18472dc666
commit 9ef15802f0
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
scp.c
View file

@ -654,6 +654,7 @@ static t_bool sim_if_cmd_last[MAX_DO_NEST_LVL+1];
static t_bool sim_if_result[MAX_DO_NEST_LVL+1]; static t_bool sim_if_result[MAX_DO_NEST_LVL+1];
static t_bool sim_if_result_last[MAX_DO_NEST_LVL+1]; static t_bool sim_if_result_last[MAX_DO_NEST_LVL+1];
static t_bool sim_cptr_is_action[MAX_DO_NEST_LVL+1]; static t_bool sim_cptr_is_action[MAX_DO_NEST_LVL+1];
static DEVICE *sim_failed_reset_dptr = NULL;
t_stat sim_last_cmd_stat; /* Command Status */ t_stat sim_last_cmd_stat; /* Command Status */
struct timespec cmd_time; /* */ struct timespec cmd_time; /* */
@ -2764,8 +2765,8 @@ if ((sim_eval = (t_value *) calloc (sim_emax, sizeof (t_value))) == NULL) {
if (sim_dflt_dev == NULL) /* if no default */ if (sim_dflt_dev == NULL) /* if no default */
sim_dflt_dev = sim_devices[0]; sim_dflt_dev = sim_devices[0];
if ((stat = reset_all_p (0)) != SCPE_OK) { if ((stat = reset_all_p (0)) != SCPE_OK) {
fprintf (stderr, "Fatal simulator initialization error\n%s\n", fprintf (stderr, "Fatal simulator initialization error\nDevice %s initial reset call returned: %s\n",
sim_error_text (stat)); sim_failed_reset_dptr->name, sim_error_text (stat));
if (sim_ttisatty()) if (sim_ttisatty())
read_line_p ("Hit Return to exit: ", cbuf, sizeof (cbuf) - 1, stdin); read_line_p ("Hit Return to exit: ", cbuf, sizeof (cbuf) - 1, stdin);
return EXIT_FAILURE; return EXIT_FAILURE;
@ -7303,8 +7304,10 @@ for (i = start; (dptr = sim_devices[i]) != NULL; i++) {
} }
if (dptr->reset != NULL) { if (dptr->reset != NULL) {
reason = dptr->reset (dptr); reason = dptr->reset (dptr);
if (reason != SCPE_OK) if (reason != SCPE_OK) {
sim_failed_reset_dptr = dptr;
return reason; return reason;
}
} }
} }
for (i = 0; sim_internal_device_count && (dptr = sim_internal_devices[i]); ++i) { for (i = 0; sim_internal_device_count && (dptr = sim_internal_devices[i]); ++i) {