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

Added a mechanism for commands to optionally handle their message printing via a separate dispatch in the command table. This is currently used by run_cmd to handle unsuppressed status returns.

Browse source
This commit is contained in:
Mark Pizzolato 2012-04-25 05:24:53 -07:00
parent 72be72c472
commit 31df5e8db2
2 changed files with 41 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
scp.c
View file

@ -412,7 +412,7 @@ t_stat set_quiet (int32 flag, char *cptr);
t_stat set_asynch (int32 flag, char *cptr); t_stat set_asynch (int32 flag, char *cptr);
t_stat do_cmd_label (int32 flag, char *cptr, char *label); t_stat do_cmd_label (int32 flag, char *cptr, char *label);
void int_handler (int signal); void int_handler (int signal);
void run_cmd_message (const char *unechod_cmdline, t_stat r);
/* Global data */ /* Global data */
@ -578,15 +578,15 @@ static CTAB cmd_table[] = {
{ "EVALUATE", &eval_cmd, 0, { "EVALUATE", &eval_cmd, 0,
"ev{aluate} <expr> evaluate symbolic expression\n" }, "ev{aluate} <expr> evaluate symbolic expression\n" },
{ "RUN", &run_cmd, RU_RUN, { "RUN", &run_cmd, RU_RUN,
"ru{n} {new PC} reset and start simulation\n" }, "ru{n} {new PC} reset and start simulation\n", &run_cmd_message },
{ "GO", &run_cmd, RU_GO, { "GO", &run_cmd, RU_GO,
"go {new PC} start simulation\n" }, "go {new PC} start simulation\n", &run_cmd_message },
{ "STEP", &run_cmd, RU_STEP, { "STEP", &run_cmd, RU_STEP,
"s{tep} {n} simulate n instructions\n" }, "s{tep} {n} simulate n instructions\n", &run_cmd_message },
{ "CONT", &run_cmd, RU_CONT, { "CONT", &run_cmd, RU_CONT,
"c{ont} continue simulation\n" }, "c{ont} continue simulation\n", &run_cmd_message },
{ "BOOT", &run_cmd, RU_BOOT, { "BOOT", &run_cmd, RU_BOOT,
"b{oot} <unit> bootstrap unit\n" }, "b{oot} <unit> bootstrap unit\n", &run_cmd_message },
{ "BREAK", &brk_cmd, SSH_ST, { "BREAK", &brk_cmd, SSH_ST,
"br{eak} <list> set breakpoints\n" }, "br{eak} <list> set breakpoints\n" },
{ "NOBREAK", &brk_cmd, SSH_CL, { "NOBREAK", &brk_cmd, SSH_CL,
@ -874,10 +874,14 @@ while (stat != SCPE_EXIT) { /* in case exit */
stat = SCPE_BARE_STATUS(stat); /* remove possible flag */ stat = SCPE_BARE_STATUS(stat); /* remove possible flag */
sim_last_cmd_stat = stat; /* save command error status */ sim_last_cmd_stat = stat; /* save command error status */
if ((stat >= SCPE_BASE) && (!stat_nomessage)) { /* error? */ if ((stat >= SCPE_BASE) && (!stat_nomessage)) { /* error? */
if (cmdp->message) /* special message handler? */
cmdp->message (NULL, stat);
else {
printf ("%s\n", sim_error_text (stat)); printf ("%s\n", sim_error_text (stat));
if (sim_log) if (sim_log)
fprintf (sim_log, "%s\n", sim_error_text (stat)); fprintf (sim_log, "%s\n", sim_error_text (stat));
} }
}
if (sim_vm_post != NULL) if (sim_vm_post != NULL)
(*sim_vm_post) (TRUE); (*sim_vm_post) (TRUE);
} /* end while */ } /* end while */
@ -1184,7 +1188,8 @@ do {
if ((stat >= SCPE_BASE) && (stat != SCPE_EXIT) && /* error from cmd? */ if ((stat >= SCPE_BASE) && (stat != SCPE_EXIT) && /* error from cmd? */
(stat != SCPE_STEP)) { (stat != SCPE_STEP)) {
if (!echo && !sim_quiet && /* report if not echoing */ if (!echo && !sim_quiet && /* report if not echoing */
!stat_nomessage) { /* and not suppressing messages */ !stat_nomessage && /* and not suppressing messages */
!cmdp->message) { /* and not handling them specially */
printf("%s> %s\n", do_position(), ocptr); printf("%s> %s\n", do_position(), ocptr);
if (sim_log) if (sim_log)
fprintf (sim_log, "%s> %s\n", do_position(), ocptr); fprintf (sim_log, "%s> %s\n", do_position(), ocptr);
@ -1192,10 +1197,15 @@ do {
} }
if ((flag <= 0) && /* report error if in cmdline/init file */ if ((flag <= 0) && /* report error if in cmdline/init file */
(stat >= SCPE_BASE) && !stat_nomessage) { (stat >= SCPE_BASE) && !stat_nomessage) {
if (cmdp->message) { /* special message handler */
cmdp->message ((!echo && !sim_quiet) ? ocptr : NULL, stat);
}
else {
printf ("%s\n", sim_error_text (stat)); printf ("%s\n", sim_error_text (stat));
if (sim_log) if (sim_log)
fprintf (sim_log, "%s\n", sim_error_text (stat)); fprintf (sim_log, "%s\n", sim_error_text (stat));
} }
}
if (staying && if (staying &&
(sim_on_check[sim_do_depth]) && (sim_on_check[sim_do_depth]) &&
(stat != SCPE_OK) && (stat != SCPE_OK) &&
@ -3580,16 +3590,26 @@ if (sim_clock_queue != NULL) { /* update sim time */
else { else {
UPDATE_SIM_TIME (noqueue_time); UPDATE_SIM_TIME (noqueue_time);
} }
return r;
}
/* run command message handler */
void
run_cmd_message (const char *unechoed_cmdline, t_stat r)
{
#if defined (VMS) #if defined (VMS)
printf ("\n"); printf ("\n");
#endif #endif
if (!(r & SCPE_NOMESSAGE)) { if (unechoed_cmdline) {
printf("%s> %s\n", do_position(), unechoed_cmdline);
if (sim_log)
fprintf (sim_log, "%s> %s\n", do_position(), unechoed_cmdline);
}
fprint_stopped (stdout, r); /* print msg */ fprint_stopped (stdout, r); /* print msg */
if (sim_log) /* log if enabled */ if (sim_log) /* log if enabled */
fprint_stopped (sim_log, r); fprint_stopped (sim_log, r);
} }
return r | SCPE_NOMESSAGE;
}
/* Common setup for RUN or BOOT */ /* Common setup for RUN or BOOT */

2
sim_defs.h
View file

@ -432,6 +432,8 @@ struct sim_ctab {
/* action routine */ /* action routine */
int32 arg; /* argument */ int32 arg; /* argument */
char *help; /* help string */ char *help; /* help string */
void (*message)(const char *unechoed_cmdline, t_stat stat);
/* message printing routine */
}; };
struct sim_c1tab { struct sim_c1tab {