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

Enhanced 'HELP dev REGISTERS' to indicate register arrays uniquely

Browse source
This commit is contained in:
Mark Pizzolato 2013-01-23 05:09:21 -08:00
parent e3207c2009
commit a59eb7fa37
1 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
scp.c
View file

@ -1040,10 +1040,14 @@ void fprint_reg_help (FILE *st, DEVICE *dptr)
REG *rptr, *trptr; REG *rptr, *trptr;
t_bool found = FALSE; t_bool found = FALSE;
t_bool all_unique = TRUE; t_bool all_unique = TRUE;
size_t max_namelen = 0;
DEVICE *tdptr; DEVICE *tdptr;
char *tptr; char *tptr;
char *namebuf;
for (rptr = dptr->registers; rptr->name != NULL; rptr++) { for (rptr = dptr->registers; rptr->name != NULL; rptr++) {
if (max_namelen < (strlen(rptr->name) + ((rptr->depth > 1) ? 5 : 0)))
max_namelen = strlen(rptr->name) + ((rptr->depth > 1) ? 5 : 0);
if (rptr->desc) { if (rptr->desc) {
found = TRUE; found = TRUE;
trptr = find_reg_glob (rptr->name, &tptr, &tdptr); trptr = find_reg_glob (rptr->name, &tptr, &tdptr);
@ -1054,20 +1058,26 @@ for (rptr = dptr->registers; rptr->name != NULL; rptr++) {
if (!found) if (!found)
fprintf (st, "No register help is available for the %s device\n", dptr->name); fprintf (st, "No register help is available for the %s device\n", dptr->name);
else { else {
namebuf = calloc (max_namelen + 1, sizeof (*namebuf));
fprintf (st, "%s device registers:\n", dptr->name); fprintf (st, "%s device registers:\n", dptr->name);
for (rptr = dptr->registers; rptr->name != NULL; rptr++) { for (rptr = dptr->registers; rptr->name != NULL; rptr++) {
if (rptr->desc) { if (rptr->desc) {
if (rptr->depth <= 1)
sprintf (namebuf, "%*s", -((int)max_namelen), rptr->name);
else
sprintf (namebuf, "%s%*s", rptr->name, (int)(strlen(rptr->name))-((int)max_namelen), "[ALL]");
if (all_unique) { if (all_unique) {
fprintf (st, " %-9s %s\n", rptr->name, rptr->desc); fprintf (st, " %s %s\n", namebuf, rptr->desc);
continue; continue;
} }
trptr = find_reg_glob (rptr->name, &tptr, &tdptr); trptr = find_reg_glob (rptr->name, &tptr, &tdptr);
if ((trptr == NULL) || (tdptr != dptr)) if ((trptr == NULL) || (tdptr != dptr))
fprintf (st, " %s %-9s %s\n", dptr->name, rptr->name, rptr->desc); fprintf (st, " %s %s %s\n", dptr->name, namebuf, rptr->desc);
else else
fprintf (st, " %*s %-9s %s\n", (int)strlen(dptr->name), "", rptr->name, rptr->desc); fprintf (st, " %*s %s %s\n", (int)strlen(dptr->name), "", namebuf, rptr->desc);
} }
} }
free (namebuf);
} }
} }
@ -4232,13 +4242,14 @@ for (rptr = lowr; rptr <= highr; rptr++) {
if ((sim_switches & SIM_SW_HIDE) && if ((sim_switches & SIM_SW_HIDE) &&
(rptr->flags & REG_HIDDEN)) (rptr->flags & REG_HIDDEN))
continue; continue;
val = last_val = 0;
for (idx = lows; idx <= highs; idx++) { for (idx = lows; idx <= highs; idx++) {
if (idx >= rptr->depth) if (idx >= rptr->depth)
return SCPE_SUB; return SCPE_SUB;
val = get_rval (rptr, idx); val = get_rval (rptr, idx);
if (schptr && !test_search (val, schptr)) if (schptr && !test_search (val, schptr))
continue; continue;
if (flag != EX_D) { if (flag == EX_E) {
if ((idx > lows) && (val == last_val)) if ((idx > lows) && (val == last_val))
continue; continue;
if (idx > val_start+1) { if (idx > val_start+1) {
@ -4264,7 +4275,7 @@ for (rptr = lowr; rptr <= highr; rptr++) {
return reason; return reason;
} }
} }
if ((flag != EX_D) && (val_start != highs)) { if ((flag == EX_E) && (val_start != highs)) {
if (highs == val_start+1) { if (highs == val_start+1) {
reason = ex_reg (ofile, val, flag, rptr, highs); reason = ex_reg (ofile, val, flag, rptr, highs);
if (reason != SCPE_OK) if (reason != SCPE_OK)