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

Reworked the MTAB flags to force Extended mode when any extended flag is set and to then handle any references properly

Browse source
This commit is contained in:
Mark Pizzolato 2013-02-02 12:33:17 -08:00
parent a036f40a80
commit ecf913f9a5
2 changed files with 31 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
scp.c
View file

@ -1101,10 +1101,10 @@ char buf[CBUFSIZE];
if (dptr->modifiers) { if (dptr->modifiers) {
for (mptr = dptr->modifiers; mptr->mask != 0; mptr++) { for (mptr = dptr->modifiers; mptr->mask != 0; mptr++) {
if (!(mptr->mask & MTAB_VDV) && (mptr->mask & MTAB_VUN)) if (!MMASK(mptr,MTAB_VDV) && MMASK(mptr,MTAB_VUN))
continue; continue; /* skip unit only modifiers */
if (mptr->mstring) { if (mptr->mstring) {
sprintf (buf, "set %s %s%s", sim_dname (dptr), mptr->mstring, (strchr(mptr->mstring, '=')) ? "" : ((mptr->mask & MTAB_VALR) ? "=val" : ((mptr->mask & MTAB_VALO) ? "{=val}": ""))); sprintf (buf, "set %s %s%s", sim_dname (dptr), mptr->mstring, (strchr(mptr->mstring, '=')) ? "" : (MMASK(mptr,MTAB_VALR) ? "=val" : (MMASK(mptr,MTAB_VALO) ? "{=val}" : "")));
fprintf (st, "%-30s\t%s\n", buf, (strchr(mptr->mstring, '=')) ? "" : (mptr->help ? mptr->help : "")); fprintf (st, "%-30s\t%s\n", buf, (strchr(mptr->mstring, '=')) ? "" : (mptr->help ? mptr->help : ""));
} }
} }
@ -1126,20 +1126,22 @@ if (dptr->flags & DEV_DEBUG) {
for (dep = dptr->debflags; dep->name != NULL; dep++) for (dep = dptr->debflags; dep->name != NULL; dep++)
fprintf (st, "%s%s", ((dep == dptr->debflags) ? "" : ";"), dep->name); fprintf (st, "%s%s", ((dep == dptr->debflags) ? "" : ";"), dep->name);
fprintf (st, "\n"); fprintf (st, "\n");
fprintf (st, "%-30s\tEnables detailed debugging for device %s\n", buf, sim_dname (dptr)); fprintf (st, "%-30s\tEnables specific debugging for device %s\n", buf, sim_dname (dptr));
fprintf (st, "set %s NODEBUG=", sim_dname (dptr)); fprintf (st, "set %s NODEBUG=", sim_dname (dptr));
for (dep = dptr->debflags; dep->name != NULL; dep++) for (dep = dptr->debflags; dep->name != NULL; dep++)
fprintf (st, "%s%s", ((dep == dptr->debflags) ? "" : ";"), dep->name); fprintf (st, "%s%s", ((dep == dptr->debflags) ? "" : ";"), dep->name);
fprintf (st, "\n"); fprintf (st, "\n");
fprintf (st, "%-30s\tDisables detailed debugging for device %s\n", buf, sim_dname (dptr)); fprintf (st, "%-30s\tDisables specific debugging for device %s\n", buf, sim_dname (dptr));
} }
} }
if (dptr->modifiers) { if (dptr->modifiers) {
for (mptr = dptr->modifiers; mptr->mask != 0; mptr++) { for (mptr = dptr->modifiers; mptr->mask != 0; mptr++) {
if ((!(mptr->mask & MTAB_VUN)) && (mptr->mask & MTAB_XTD)) if ((!MMASK(mptr,MTAB_VUN)) && MMASK(mptr,MTAB_XTD))
continue; /* skip device only modifiers */
if ((dptr == sim_dflt_dev) && (dptr->numunits == 1) && !(mptr->mask & MTAB_XTD))
continue; continue;
if (mptr->mstring) { if (mptr->mstring) {
sprintf (buf, "set %s%s %s%s", sim_dname (dptr), (dptr->numunits > 1) ? "n" : "0", mptr->mstring, (strchr(mptr->mstring, '=')) ? "" : ((mptr->mask & MTAB_VALR) ? "=val" : ((mptr->mask & MTAB_VALO) ? "{=val}": ""))); sprintf (buf, "set %s%s %s%s", sim_dname (dptr), (dptr->numunits > 1) ? "n" : "0", mptr->mstring, (strchr(mptr->mstring, '=')) ? "" : (MMASK(mptr,MTAB_VALR) ? "=val" : (MMASK(mptr,MTAB_VALO) ? "{=val}": "")));
fprintf (st, "%-30s\t%s\n", buf, (strchr(mptr->mstring, '=')) ? "" : (mptr->help ? mptr->help : "")); fprintf (st, "%-30s\t%s\n", buf, (strchr(mptr->mstring, '=')) ? "" : (mptr->help ? mptr->help : ""));
} }
} }
@ -1153,11 +1155,11 @@ char buf[CBUFSIZE];
if (dptr->modifiers) { if (dptr->modifiers) {
for (mptr = dptr->modifiers; mptr->mask != 0; mptr++) { for (mptr = dptr->modifiers; mptr->mask != 0; mptr++) {
if (!(mptr->mask & MTAB_VDV) && (mptr->mask & MTAB_VUN)) if (!MMASK(mptr,MTAB_VDV) && MMASK(mptr,MTAB_VUN))
continue; /* skip unit only modifiers */
if ((!mptr->disp) || (!mptr->pstring) || !(*mptr->pstring))
continue; continue;
if ((!mptr->disp) || (!mptr->pstring)) sprintf (buf, "show %s %s%s", sim_dname (dptr), mptr->pstring, MMASK(mptr,MTAB_SHP) ? "=arg" : "");
continue;
sprintf (buf, "show %s %s%s", sim_dname (dptr), mptr->pstring, (mptr->mask & MTAB_SHP) ? "=arg" : "");
fprintf (st, "%-30s\t%s\n", buf, mptr->help ? mptr->help : ""); fprintf (st, "%-30s\t%s\n", buf, mptr->help ? mptr->help : "");
} }
} }
@ -1167,11 +1169,13 @@ if (dptr->flags & DEV_DEBUG) {
} }
if (dptr->modifiers) { if (dptr->modifiers) {
for (mptr = dptr->modifiers; mptr->mask != 0; mptr++) { for (mptr = dptr->modifiers; mptr->mask != 0; mptr++) {
if ((!(mptr->mask & MTAB_VUN)) && (mptr->mask & MTAB_XTD)) if ((!MMASK(mptr,MTAB_VUN)) && MMASK(mptr,MTAB_XTD))
continue; continue; /* skip device only modifiers */
if ((!mptr->disp) || (!mptr->pstring)) if ((!mptr->disp) || (!mptr->pstring))
continue; continue;
sprintf (buf, "show %s%s %s", sim_dname (dptr), (dptr->numunits > 1) ? "n" : "0", mptr->pstring, (mptr->mask & MTAB_SHP) ? "=arg" : ""); if ((dptr == sim_dflt_dev) && (dptr->numunits == 1) && !(mptr->mask & MTAB_XTD))
continue;
sprintf (buf, "show %s%s %s%s", sim_dname (dptr), (dptr->numunits > 1) ? "n" : "0", mptr->pstring, MMASK(mptr,MTAB_SHP) ? "=arg" : "");
fprintf (st, "%-30s\t%s\n", buf, mptr->help ? mptr->help : ""); fprintf (st, "%-30s\t%s\n", buf, mptr->help ? mptr->help : "");
} }
} }
@ -1360,9 +1364,9 @@ if (*cptr) {
helps[i].attach_help (sim_log, dptr, uptr, 0, cptr); helps[i].attach_help (sim_log, dptr, uptr, 0, cptr);
} }
else { else {
fprintf (stdout, "No help available for the %s device ATTACH command\n", dptr->name, cmdp->name); fprintf (stdout, "No help available for the %s device %s command\n", dptr->name, cmdp->name);
if (sim_log) if (sim_log)
fprintf (sim_log, "No help available for the %s device ATTACH command\n", dptr->name, cmdp->name); fprintf (sim_log, "No help available for the %s device %s command\n", dptr->name, cmdp->name);
} }
} }
} }
@ -2278,12 +2282,12 @@ while (*cptr != 0) { /* do all mods */
if ((mptr->mstring) && /* match string */ if ((mptr->mstring) && /* match string */
(MATCH_CMD (gbuf, mptr->mstring) == 0)) { /* matches option? */ (MATCH_CMD (gbuf, mptr->mstring) == 0)) { /* matches option? */
if (mptr->mask & MTAB_XTD) { /* extended? */ if (mptr->mask & MTAB_XTD) { /* extended? */
if ((lvl & mptr->mask) == 0) if (((lvl & mptr->mask) & ~MTAB_XTD) == 0)
return SCPE_ARG; return SCPE_ARG;
if ((lvl & MTAB_VUN) && (uptr->flags & UNIT_DIS)) if ((lvl == MTAB_VUN) && (uptr->flags & UNIT_DIS))
return SCPE_UDIS; /* unit disabled? */ return SCPE_UDIS; /* unit disabled? */
if (mptr->valid) { /* validation rtn? */ if (mptr->valid) { /* validation rtn? */
if (cvptr && (mptr->mask & MTAB_NC)) { if (cvptr && MMASK(mptr,MTAB_NC)) {
get_glyph_nc (svptr, gbuf, ','); get_glyph_nc (svptr, gbuf, ',');
if ((cvptr = strchr (gbuf, '='))) if ((cvptr = strchr (gbuf, '=')))
*cvptr++ = 0; *cvptr++ = 0;

15
sim_defs.h
View file

@ -535,13 +535,14 @@ struct sim_mtab {
/* mtab mask flag bits */ /* mtab mask flag bits */
/* NOTE: MTAB_VALR and MTAB_VALO are only used to display help */ /* NOTE: MTAB_VALR and MTAB_VALO are only used to display help */
#define MTAB_XTD (1u << UNIT_V_RSV) /* ext entry flag */ #define MTAB_XTD (1u << UNIT_V_RSV) /* ext entry flag */
#define MTAB_VDV 0001 /* valid for dev */ #define MTAB_VDV (0001 | MTAB_XTD) /* valid for dev */
#define MTAB_VUN 0002 /* valid for unit */ #define MTAB_VUN (0002 | MTAB_XTD) /* valid for unit */
#define MTAB_VALR 0004 /* takes a value (required) */ #define MTAB_VALR (0004 | MTAB_XTD) /* takes a value (required) */
#define MTAB_VALO 0010 /* takes a value (optional) */ #define MTAB_VALO (0010 | MTAB_XTD) /* takes a value (optional) */
#define MTAB_NMO 0020 /* only if named */ #define MTAB_NMO (0020 | MTAB_XTD) /* only if named */
#define MTAB_NC 0040 /* no UC conversion */ #define MTAB_NC (0040 | MTAB_XTD) /* no UC conversion */
#define MTAB_SHP 0100 /* show takes parameter */ #define MTAB_SHP (0100 | MTAB_XTD) /* show takes parameter */
#define MMASK(mptr,flag) (((mptr)->mask & flag) == flag)/* flag mask test */
/* Search table */ /* Search table */