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

SCP: Allow the presence of DEVICE DEBTAB array to imply the DEV_DEBUG flag

Browse source
This commit is contained in:
Mark Pizzolato 2017-06-07 18:56:06 -07:00
parent 921c012784
commit c470d1e5e2
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
scp.c
View file

@ -2459,7 +2459,7 @@ if (dptr->flags & DEV_DISABLE) {
sprintf (buf, "set %s DISABLE", sim_dname (dptr)); sprintf (buf, "set %s DISABLE", sim_dname (dptr));
fprintf (st, "%-30s\tDisables device %s\n", buf, sim_dname (dptr)); fprintf (st, "%-30s\tDisables device %s\n", buf, sim_dname (dptr));
} }
if (dptr->flags & DEV_DEBUG) { if ((dptr->flags & DEV_DEBUG) || (dptr->debflags)) {
fprint_header (st, &found, header); fprint_header (st, &found, header);
sprintf (buf, "set %s DEBUG", sim_dname (dptr)); sprintf (buf, "set %s DEBUG", sim_dname (dptr));
fprintf (st, "%-30s\tEnables debugging for device %s\n", buf, sim_dname (dptr)); fprintf (st, "%-30s\tEnables debugging for device %s\n", buf, sim_dname (dptr));
@ -2537,7 +2537,7 @@ if (dptr->modifiers) {
fprintf (st, "%-30s\t%s\n", buf, mptr->help ? mptr->help : ""); fprintf (st, "%-30s\t%s\n", buf, mptr->help ? mptr->help : "");
} }
} }
if (dptr->flags & DEV_DEBUG) { if ((dptr->flags & DEV_DEBUG) || (dptr->debflags)) {
fprint_header (st, &found, header); fprint_header (st, &found, header);
sprintf (buf, "show %s DEBUG", sim_dname (dptr)); sprintf (buf, "show %s DEBUG", sim_dname (dptr));
fprintf (st, "%-30s\tDisplays debugging status for device %s\n", buf, sim_dname (dptr)); fprintf (st, "%-30s\tDisplays debugging status for device %s\n", buf, sim_dname (dptr));
@ -4904,7 +4904,7 @@ t_stat show_dev_debug (FILE *st, DEVICE *dptr, UNIT *uptr, int32 flag, CONST cha
int32 any = 0; int32 any = 0;
DEBTAB *dep; DEBTAB *dep;
if (dptr->flags & DEV_DEBUG) { if ((dptr->flags & DEV_DEBUG) || (dptr->debflags)) {
if (dptr->dctrl == 0) if (dptr->dctrl == 0)
fputs ("Debugging disabled", st); fputs ("Debugging disabled", st);
else if (dptr->debflags == NULL) else if (dptr->debflags == NULL)

4
sim_console.c
View file

@ -2206,7 +2206,7 @@ if (sim_deb) {
fprintf (st, " Debug messages display time of day as seconds.msec%s\n", sim_deb_switches & SWMASK ('R') ? " relative to the start of debugging" : ""); fprintf (st, " Debug messages display time of day as seconds.msec%s\n", sim_deb_switches & SWMASK ('R') ? " relative to the start of debugging" : "");
for (i = 0; (dptr = sim_devices[i]) != NULL; i++) { for (i = 0; (dptr = sim_devices[i]) != NULL; i++) {
if (!(dptr->flags & DEV_DIS) && if (!(dptr->flags & DEV_DIS) &&
(dptr->flags & DEV_DEBUG) && ((dptr->flags & DEV_DEBUG) || (dptr->debflags)) &&
(dptr->dctrl)) { (dptr->dctrl)) {
fprintf (st, "Device: %-6s ", dptr->name); fprintf (st, "Device: %-6s ", dptr->name);
show_dev_debug (st, dptr, NULL, 0, NULL); show_dev_debug (st, dptr, NULL, 0, NULL);
@ -2214,7 +2214,7 @@ if (sim_deb) {
} }
for (i = 0; sim_internal_device_count && (dptr = sim_internal_devices[i]); ++i) { for (i = 0; sim_internal_device_count && (dptr = sim_internal_devices[i]); ++i) {
if (!(dptr->flags & DEV_DIS) && if (!(dptr->flags & DEV_DIS) &&
(dptr->flags & DEV_DEBUG) && ((dptr->flags & DEV_DEBUG) || (dptr->debflags)) &&
(dptr->dctrl)) { (dptr->dctrl)) {
fprintf (st, "Device: %-6s ", dptr->name); fprintf (st, "Device: %-6s ", dptr->name);
show_dev_debug (st, dptr, NULL, 0, NULL); show_dev_debug (st, dptr, NULL, 0, NULL);

2
sim_tape.c
View file

@ -457,7 +457,7 @@ DEVICE *dptr;
if ((dptr = find_dev_from_unit (uptr)) == NULL) if ((dptr = find_dev_from_unit (uptr)) == NULL)
return SCPE_NOATT; return SCPE_NOATT;
return sim_tape_attach_ex (uptr, cptr, (dptr->flags & DEV_DEBUG) ? 0xFFFFFFFF : 0, 0); return sim_tape_attach_ex (uptr, cptr, ((dptr->flags & DEV_DEBUG) || (dptr->debflags)) ? 0xFFFFFFFF : 0, 0);
} }
t_stat sim_tape_attach_ex (UNIT *uptr, const char *cptr, uint32 dbit, int completion_delay) t_stat sim_tape_attach_ex (UNIT *uptr, const char *cptr, uint32 dbit, int completion_delay)