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

Added explicit array bounds and field width for HELP dev REGISTER output

Browse source
This commit is contained in:
Mark Pizzolato 2013-01-23 19:52:32 -08:00
parent f4dd30709f
commit b18e1312df
1 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
scp.c
View file

@ -1044,10 +1044,15 @@ size_t max_namelen = 0;
DEVICE *tdptr; DEVICE *tdptr;
char *tptr; char *tptr;
char *namebuf; char *namebuf;
char rangebuf[32];
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))) if (rptr->depth > 1)
max_namelen = strlen(rptr->name) + ((rptr->depth > 1) ? 5 : 0); sprintf (rangebuf, "[%d:%d]", 0, rptr->depth-1);
else
strcpy (rangebuf, "");
if (max_namelen < (strlen(rptr->name) + strlen (rangebuf)))
max_namelen = strlen(rptr->name) + strlen (rangebuf);
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);
@ -1064,17 +1069,19 @@ else {
if (rptr->desc) { if (rptr->desc) {
if (rptr->depth <= 1) if (rptr->depth <= 1)
sprintf (namebuf, "%*s", -((int)max_namelen), rptr->name); sprintf (namebuf, "%*s", -((int)max_namelen), rptr->name);
else else {
sprintf (namebuf, "%s%*s", rptr->name, (int)(strlen(rptr->name))-((int)max_namelen), "[ALL]"); sprintf (rangebuf, "[%d:%d]", 0, rptr->depth-1);
sprintf (namebuf, "%s%*s", rptr->name, (int)(strlen(rptr->name))-((int)max_namelen), rangebuf);
}
if (all_unique) { if (all_unique) {
fprintf (st, " %s %s\n", namebuf, rptr->desc); fprintf (st, " %s %4d %s\n", namebuf, rptr->width, 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 %s %s\n", dptr->name, namebuf, rptr->desc); fprintf (st, " %s %s %4d %s\n", dptr->name, namebuf, rptr->width, rptr->desc);
else else
fprintf (st, " %*s %s %s\n", (int)strlen(dptr->name), "", namebuf, rptr->desc); fprintf (st, " %*s %s %4d %s\n", (int)strlen(dptr->name), "", namebuf, rptr->width, rptr->desc);
} }
} }
free (namebuf); free (namebuf);