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

SCP: Cleanup output produced by SHOW CONSOLE command

Browse source
This commit is contained in:
Mark Pizzolato 2017-05-27 20:25:50 -07:00
parent 4053a6f481
commit df627b0cb1
2 changed files with 26 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
scp.c
View file

@ -10504,7 +10504,7 @@ t_stat sim_exp_show_tab (FILE *st, const EXPECT *exp, const EXPTAB *ep)
{ {
if (!ep) if (!ep)
return SCPE_OK; return SCPE_OK;
fprintf (st, "EXPECT"); fprintf (st, " EXPECT");
if (ep->switches & EXP_TYP_PERSIST) if (ep->switches & EXP_TYP_PERSIST)
fprintf (st, " -p"); fprintf (st, " -p");
if (ep->switches & EXP_TYP_CLEARALL) if (ep->switches & EXP_TYP_CLEARALL)
@ -10529,20 +10529,20 @@ CONST EXPTAB *ep = (CONST EXPTAB *)sim_exp_fnd (exp, match, 0);
if (exp->buf_size) { if (exp->buf_size) {
char *bstr = sim_encode_quoted_string (exp->buf, exp->buf_ins); char *bstr = sim_encode_quoted_string (exp->buf, exp->buf_ins);
fprintf (st, "Match Buffer Size: %d\n", exp->buf_size); fprintf (st, " Match Buffer Size: %d\n", exp->buf_size);
fprintf (st, "Buffer Insert Offset: %d\n", exp->buf_ins); fprintf (st, " Buffer Insert Offset: %d\n", exp->buf_ins);
fprintf (st, "Buffer Contents: %s\n", bstr); fprintf (st, " Buffer Contents: %s\n", bstr);
free (bstr); free (bstr);
} }
if (exp->after) if (exp->after)
fprintf (st, "Halt After: %d instructions\n", exp->after); fprintf (st, " Halt After: %d instructions\n", exp->after);
if (exp->dptr && exp->dbit) if (exp->dptr && (exp->dbit & exp->dptr->dctrl))
fprintf (st, "Debugging via: SET %s DEBUG%s%s\n", sim_dname(exp->dptr), exp->dptr->debflags ? "=" : "", exp->dptr->debflags ? get_dbg_verb (exp->dbit, exp->dptr) : ""); fprintf (st, " Expect Debugging via: SET %s DEBUG%s%s\n", sim_dname(exp->dptr), exp->dptr->debflags ? "=" : "", exp->dptr->debflags ? get_dbg_verb (exp->dbit, exp->dptr) : "");
fprintf (st, "Match Rules:\n"); fprintf (st, " Match Rules:\n");
if (!*match) if (!*match)
return sim_exp_showall (st, exp); return sim_exp_showall (st, exp);
if (!ep) { if (!ep) {
fprintf (st, "No Rules match '%s'\n", match); fprintf (st, " No Rules match '%s'\n", match);
return SCPE_ARG; return SCPE_ARG;
} }
do { do {
@ -10771,25 +10771,25 @@ return SCPE_OK;
t_stat sim_show_send_input (FILE *st, const SEND *snd) t_stat sim_show_send_input (FILE *st, const SEND *snd)
{ {
if (snd->extoff < snd->insoff) { if (snd->extoff < snd->insoff) {
fprintf (st, "%d bytes of pending input Data:\n ", snd->insoff-snd->extoff); fprintf (st, " %d bytes of pending input Data:\n ", snd->insoff-snd->extoff);
fprint_buffer_string (st, snd->buffer+snd->extoff, snd->insoff-snd->extoff); fprint_buffer_string (st, snd->buffer+snd->extoff, snd->insoff-snd->extoff);
fprintf (st, "\n"); fprintf (st, "\n");
} }
else else
fprintf (st, "No Pending Input Data\n"); fprintf (st, " No Pending Input Data\n");
if ((snd->next_time - sim_gtime()) > 0) { if ((snd->next_time - sim_gtime()) > 0) {
if ((snd->next_time - sim_gtime()) > (sim_timer_inst_per_sec()/1000000.0)) if (((snd->next_time - sim_gtime()) > (sim_timer_inst_per_sec()/1000000.0)) && ((sim_timer_inst_per_sec()/1000000.0) > 0.0))
fprintf (st, "Minimum of %d instructions (%d microseconds) before sending first character\n", (int)(snd->next_time - sim_gtime()), fprintf (st, " Minimum of %d instructions (%d microseconds) before sending first character\n", (int)(snd->next_time - sim_gtime()),
(int)((snd->next_time - sim_gtime())/(sim_timer_inst_per_sec()/1000000.0))); (int)((snd->next_time - sim_gtime())/(sim_timer_inst_per_sec()/1000000.0)));
else else
fprintf (st, "Minimum of %d instructions before sending first character\n", (int)(snd->next_time - sim_gtime())); fprintf (st, " Minimum of %d instructions before sending first character\n", (int)(snd->next_time - sim_gtime()));
} }
if (snd->delay > (sim_timer_inst_per_sec()/1000000.0)) if ((snd->delay > (sim_timer_inst_per_sec()/1000000.0)) && ((sim_timer_inst_per_sec()/1000000.0) > 0.0))
fprintf (st, "Minimum of %d instructions (%d microseconds) between characters\n", (int)snd->delay, (int)(snd->delay/(sim_timer_inst_per_sec()/1000000.0))); fprintf (st, " Minimum of %d instructions (%d microseconds) between characters\n", (int)snd->delay, (int)(snd->delay/(sim_timer_inst_per_sec()/1000000.0)));
else else
fprintf (st, "Minimum of %d instructions between characters\n", (int)snd->delay); fprintf (st, " Minimum of %d instructions between characters\n", (int)snd->delay);
if (snd->dptr && snd->dbit) if (snd->dptr && (snd->dbit & snd->dptr->dctrl))
fprintf (st, "Debugging via: SET %s DEBUG%s%s\n", sim_dname(snd->dptr), snd->dptr->debflags ? "=" : "", snd->dptr->debflags ? get_dbg_verb (snd->dbit, snd->dptr) : ""); fprintf (st, " Send Debugging via: SET %s DEBUG%s%s\n", sim_dname(snd->dptr), snd->dptr->debflags ? "=" : "", snd->dptr->debflags ? get_dbg_verb (snd->dbit, snd->dptr) : "");
return SCPE_OK; return SCPE_OK;
} }

9
sim_console.c
View file

@ -340,10 +340,10 @@ static SHTAB show_con_tab[] = {
{ "DEBUG", &sim_show_cons_debug, 0 }, { "DEBUG", &sim_show_cons_debug, 0 },
{ "BUFFERED", &sim_show_cons_buff, 0 }, { "BUFFERED", &sim_show_cons_buff, 0 },
{ "EXPECT", &sim_show_cons_expect, 0 }, { "EXPECT", &sim_show_cons_expect, 0 },
{ "HALT", &sim_show_cons_expect, 0 }, { "HALT", &sim_show_cons_expect, -1 },
{ "INPUT", &sim_show_cons_send_input, 0 }, { "INPUT", &sim_show_cons_send_input, 0 },
{ "RESPONSE", &sim_show_cons_send_input, 0 }, { "RESPONSE", &sim_show_cons_send_input, -1 },
{ "DELAY", &sim_show_cons_expect, 0 }, { "DELAY", &sim_show_cons_expect, -1 },
{ NULL, NULL, 0 } { NULL, NULL, 0 }
}; };
@ -411,6 +411,7 @@ int32 i;
if (*cptr == 0) { /* show all */ if (*cptr == 0) { /* show all */
for (i = 0; show_con_tab[i].name; i++) for (i = 0; show_con_tab[i].name; i++)
if (show_con_tab[i].arg != -1)
show_con_tab[i].action (st, dptr, uptr, show_con_tab[i].arg, cptr); show_con_tab[i].action (st, dptr, uptr, show_con_tab[i].arg, cptr);
return SCPE_OK; return SCPE_OK;
} }
@ -2432,6 +2433,7 @@ return tmxr_close_master (&sim_con_tmxr); /* close master socket *
t_stat sim_show_cons_expect (FILE *st, DEVICE *dunused, UNIT *uunused, int32 flag, CONST char *cptr) t_stat sim_show_cons_expect (FILE *st, DEVICE *dunused, UNIT *uunused, int32 flag, CONST char *cptr)
{ {
fprintf (st, "Console Expect processing:\n");
return sim_exp_show (st, &sim_con_expect, cptr); return sim_exp_show (st, &sim_con_expect, cptr);
} }
@ -2627,6 +2629,7 @@ return &sim_con_expect;
t_stat sim_show_cons_send_input (FILE *st, DEVICE *dptr, UNIT *uptr, int32 flag, CONST char *cptr) t_stat sim_show_cons_send_input (FILE *st, DEVICE *dptr, UNIT *uptr, int32 flag, CONST char *cptr)
{ {
fprintf (st, "Console Send processing:\n");
return sim_show_send_input (st, &sim_con_send); return sim_show_send_input (st, &sim_con_send);
} }