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

SCP: Add ability to "DO <stdin>"

Browse source 
This allows a running script to nest a procedure call get input from
stdin and return to the running script (or executing simulator).
This commit is contained in:
Mark Pizzolato 2020-03-08 09:52:41 -07:00
parent aa72b1e0ab
commit b2272c8cd6
1 changed files with 25 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
scp.c
View file

@ -2584,7 +2584,7 @@ return 0;
} }
#endif #endif
t_stat process_stdin_commands (t_stat stat, char *argv[]); t_stat process_stdin_commands (t_stat stat, char *argv[], t_bool do_called);
/* Main command loop */ /* Main command loop */
@ -2791,7 +2791,7 @@ if (SCPE_BARE_STATUS(stat) == SCPE_OPENERR) /* didn't exist/can't op
stat = SCPE_OK; stat = SCPE_OK;
if (SCPE_BARE_STATUS(stat) != SCPE_EXIT) if (SCPE_BARE_STATUS(stat) != SCPE_EXIT)
process_stdin_commands (SCPE_BARE_STATUS(stat), argv); process_stdin_commands (SCPE_BARE_STATUS(stat), argv, FALSE);
detach_all (0, TRUE); /* close files */ detach_all (0, TRUE); /* close files */
sim_set_deboff (0, NULL); /* close debug */ sim_set_deboff (0, NULL); /* close debug */
@ -2806,7 +2806,7 @@ free (targv); /* release any argv copy
return sim_exit_status; return sim_exit_status;
} }
t_stat process_stdin_commands (t_stat stat, char *argv[]) t_stat process_stdin_commands (t_stat stat, char *argv[], t_bool do_called)
{ {
char cbuf[4*CBUFSIZE], gbuf[CBUFSIZE]; char cbuf[4*CBUFSIZE], gbuf[CBUFSIZE];
CONST char *cptr; CONST char *cptr;
@ -2862,8 +2862,11 @@ while (stat != SCPE_EXIT) { /* in case exit */
} }
cptr = get_glyph_cmd (cptr, gbuf); /* get command glyph */ cptr = get_glyph_cmd (cptr, gbuf); /* get command glyph */
sim_switches = 0; /* init switches */ sim_switches = 0; /* init switches */
if ((cmdp = find_cmd (gbuf))) /* lookup command */ if ((cmdp = find_cmd (gbuf))) { /* lookup command */
if (do_called && (cmdp->action == &return_cmd)) /* RETURN command? */
break;
stat = cmdp->action (cmdp->arg, cptr); /* if found, exec */ stat = cmdp->action (cmdp->arg, cptr); /* if found, exec */
}
else else
stat = SCPE_UNK; stat = SCPE_UNK;
stat_nomessage = stat & SCPE_NOMESSAGE; /* extract possible message supression flag */ stat_nomessage = stat & SCPE_NOMESSAGE; /* extract possible message supression flag */
@ -2880,6 +2883,14 @@ while (stat != SCPE_EXIT) { /* in case exit */
if (sim_vm_post != NULL) if (sim_vm_post != NULL)
(*sim_vm_post) (TRUE); (*sim_vm_post) (TRUE);
} /* end while */ } /* end while */
if (do_called && cmdp &&
(cmdp->action == &return_cmd) && (0 != *cptr)) { /* return command with argument? */
sim_string_to_stat (cptr, &stat);
sim_last_cmd_stat = stat; /* save explicit status as command error status */
if (sim_switches & SWMASK ('Q'))
stat |= SCPE_NOMESSAGE; /* suppress error message display (in caller) if requested */
return stat; /* return with explicit return status */
}
return stat; return stat;
} }
@ -3652,7 +3663,7 @@ t_stat do_cmd_label (int32 flag, CONST char *fcptr, CONST char *label)
{ {
char cbuf[4*CBUFSIZE], gbuf[CBUFSIZE], abuf[4*CBUFSIZE], quote, *c, *do_arg[11]; char cbuf[4*CBUFSIZE], gbuf[CBUFSIZE], abuf[4*CBUFSIZE], quote, *c, *do_arg[11];
CONST char *cptr; CONST char *cptr;
FILE *fpin; FILE *fpin = NULL;
CTAB *cmdp = NULL; CTAB *cmdp = NULL;
int32 echo, nargs, errabort, i; int32 echo, nargs, errabort, i;
int32 saved_sim_do_echo = sim_do_echo, int32 saved_sim_do_echo = sim_do_echo,
@ -3695,7 +3706,8 @@ for (nargs = 0; nargs < 10; ) { /* extract arguments */
if (do_arg [0] == NULL) /* need at least 1 */ if (do_arg [0] == NULL) /* need at least 1 */
return SCPE_2FARG; return SCPE_2FARG;
if ((fpin = fopen (do_arg[0], "r")) == NULL) { /* file failed to open? */ if ((strcasecmp (do_arg[0], "<stdin>") != 0) &&
((fpin = fopen (do_arg[0], "r")) == NULL)) { /* file failed to open? */
strlcpy (cbuf, do_arg[0], sizeof (cbuf)); /* try again with .sim extension */ strlcpy (cbuf, do_arg[0], sizeof (cbuf)); /* try again with .sim extension */
strlcat (cbuf, ".sim", sizeof (cbuf)); strlcat (cbuf, ".sim", sizeof (cbuf));
if ((fpin = fopen (cbuf, "r")) == NULL) { /* failed a second time? */ if ((fpin = fopen (cbuf, "r")) == NULL) { /* failed a second time? */
@ -3754,6 +3766,11 @@ if (label) {
if (errabort) /* -e flag? */ if (errabort) /* -e flag? */
set_on (1, NULL); /* equivalent to ON ERROR RETURN */ set_on (1, NULL); /* equivalent to ON ERROR RETURN */
if (strcasecmp (do_arg[0], "<stdin>") == 0) {
stat = process_stdin_commands (SCPE_OK, do_arg, TRUE);
goto Cleanup_Return;
}
do { do {
if (stop_cpu) { /* SIGINT? */ if (stop_cpu) { /* SIGINT? */
if (sim_on_actions[sim_do_depth][ON_SIGINT_ACTION]) { if (sim_on_actions[sim_do_depth][ON_SIGINT_ACTION]) {
@ -3868,6 +3885,7 @@ do {
(*sim_vm_post) (TRUE); (*sim_vm_post) (TRUE);
} while (staying); } while (staying);
Cleanup_Return: Cleanup_Return:
if (fpin)
fclose (fpin); /* close file */ fclose (fpin); /* close file */
sim_gotofile = NULL; sim_gotofile = NULL;
if (flag >= 0) { if (flag >= 0) {