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

Changed examine register range to summarize redundant (duplicate) output.

Browse source
This commit is contained in:
Mark Pizzolato 2013-01-22 16:01:44 -08:00
parent 9fc6aa73d6
commit b7066fea3a
1 changed files with 30 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
scp.c
View file

@ -2003,6 +2003,12 @@ if (cptr && (*cptr != 0))
return SCPE_2MARG; return SCPE_2MARG;
#ifdef SIM_ASYNCH_IO #ifdef SIM_ASYNCH_IO
fprintf (st, "Asynchronous I/O is %sabled, %s\n", (sim_asynch_enabled) ? "en" : "dis", AIO_QUEUE_MODE); fprintf (st, "Asynchronous I/O is %sabled, %s\n", (sim_asynch_enabled) ? "en" : "dis", AIO_QUEUE_MODE);
#if defined(SIM_ASYNCH_MUX)
fprintf (st, "Asynchronous Multiplexer support is available\n");
#endif
#if defined(SIM_ASYNCH_CLOCKS)
fprintf (st, "Asynchronous Clock is %sabled\n", (sim_asynch_timer) ? "en" : "dis");
#endif
#else #else
fprintf (st, "Asynchronous I/O is not available in this simulator\n"); fprintf (st, "Asynchronous I/O is not available in this simulator\n");
#endif #endif
@ -4214,8 +4220,8 @@ t_stat exdep_reg_loop (FILE *ofile, SCHTAB *schptr, int32 flag, char *cptr,
REG *lowr, REG *highr, uint32 lows, uint32 highs) REG *lowr, REG *highr, uint32 lows, uint32 highs)
{ {
t_stat reason; t_stat reason;
uint32 idx; uint32 idx, val_start=lows;
t_value val; t_value val, last_val;
REG *rptr; REG *rptr;
if ((lowr == NULL) || (highr == NULL)) if ((lowr == NULL) || (highr == NULL))
@ -4233,6 +4239,19 @@ for (rptr = lowr; rptr <= highr; rptr++) {
if (schptr && !test_search (val, schptr)) if (schptr && !test_search (val, schptr))
continue; continue;
if (flag != EX_D) { if (flag != EX_D) {
if ((idx > lows) && (val == last_val))
continue;
if (idx > val_start+1) {
if (idx-1 == val_start+1) {
reason = ex_reg (ofile, val, flag, rptr, idx-1);
if (reason != SCPE_OK)
return reason;
}
else
fprintf (ofile, "%s[%d]-%s[%d]: same as above\n", rptr->name, val_start+1, rptr->name, idx-1);
}
last_val = val;
val_start = idx;
reason = ex_reg (ofile, val, flag, rptr, idx); reason = ex_reg (ofile, val, flag, rptr, idx);
if (reason != SCPE_OK) if (reason != SCPE_OK)
return reason; return reason;
@ -4245,6 +4264,15 @@ for (rptr = lowr; rptr <= highr; rptr++) {
return reason; return reason;
} }
} }
if ((flag != EX_D) && (val_start != highs)) {
if (highs == val_start+1) {
reason = ex_reg (ofile, val, flag, rptr, highs);
if (reason != SCPE_OK)
return reason;
}
else
fprintf (ofile, "%s[%d]-%s[%d]: same as above\n", rptr->name, val_start+1, rptr->name, highs);
}
} }
return SCPE_OK; return SCPE_OK;
} }