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

SCP: Change handling of EXPECT return status to allow message in verbose mode

Browse source 
The previous change in handling or SCPE_EXPECT transformed it to SCPE_OK
to avoid unexpected exiting or condition trapping.  This didn't allow the
SCPE_EXPECT reason to be display if verbose mode was on.
This commit is contained in:
Mark Pizzolato 2016-04-13 15:57:56 -07:00
parent 4a47113faa
commit b502558df7
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
scp.c
View file

@ -2825,9 +2825,7 @@ do {
stat_nomessage = stat & SCPE_NOMESSAGE; /* extract possible message supression flag */ stat_nomessage = stat & SCPE_NOMESSAGE; /* extract possible message supression flag */
stat_nomessage = stat_nomessage || (!sim_show_message);/* Apply global suppression */ stat_nomessage = stat_nomessage || (!sim_show_message);/* Apply global suppression */
stat = SCPE_BARE_STATUS(stat); /* remove possible flag */ stat = SCPE_BARE_STATUS(stat); /* remove possible flag */
if (stat == SCPE_EXPECT) /* EXPECT status is non actionable */ if (((stat != SCPE_OK) && (stat != SCPE_EXPECT)) ||
stat = SCPE_OK; /* so adjust it to SCPE_OK */
if ((stat != SCPE_OK) ||
((cmdp->action != &return_cmd) && ((cmdp->action != &return_cmd) &&
(cmdp->action != &goto_cmd) && (cmdp->action != &goto_cmd) &&
(cmdp->action != &on_cmd) && (cmdp->action != &on_cmd) &&
@ -2862,6 +2860,8 @@ do {
if (stat >= SCPE_BASE) /* report error if not suppressed */ if (stat >= SCPE_BASE) /* report error if not suppressed */
sim_printf ("%s\n", sim_error_text (stat)); sim_printf ("%s\n", sim_error_text (stat));
} }
if (stat == SCPE_EXPECT) /* EXPECT status is non actionable */
stat = SCPE_OK; /* so adjust it to SCPE_OK */
if (staying && if (staying &&
(sim_on_check[sim_do_depth]) && (sim_on_check[sim_do_depth]) &&
(stat != SCPE_OK) && (stat != SCPE_OK) &&