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

PDP11, Qbus and Unibus VAX: Add radix switch (-O or -H) to SHOW bus IOSPACE

Browse source
This commit is contained in:
Mark Pizzolato 2019-11-14 23:55:33 -08:00
parent 7c1c04d9a9
commit 9fc982242c
1 changed files with 23 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
PDP11/pdp11_io_lib.c
View file

@ -127,9 +127,9 @@ if (dptr == NULL)
dibp = (DIB *) dptr->ctxt; dibp = (DIB *) dptr->ctxt;
if ((dibp == NULL) || (dibp->ba <= IOPAGEBASE)) if ((dibp == NULL) || (dibp->ba <= IOPAGEBASE))
return SCPE_IERR; return SCPE_IERR;
if (sim_switches & SWMASK ('H')) if ((sim_switches & SWMASK('H')) || (sim_switch_number == 16))
radix = 16; radix = 16;
if (sim_switches & SWMASK ('O')) if ((sim_switches & SWMASK('O')) || (sim_switch_number == 8))
radix = 8; radix = 8;
fprintf (st, "address="); fprintf (st, "address=");
fprint_val (st, (t_value) dibp->ba, DEV_RDX, 32, PV_LEFT); fprint_val (st, (t_value) dibp->ba, DEV_RDX, 32, PV_LEFT);
@ -221,9 +221,9 @@ if (dptr == NULL)
dibp = (DIB *) dptr->ctxt; dibp = (DIB *) dptr->ctxt;
if (dibp == NULL) if (dibp == NULL)
return SCPE_IERR; return SCPE_IERR;
if (sim_switches & SWMASK ('H')) if ((sim_switches & SWMASK('H')) || (sim_switch_number == 16))
radix = 16; radix = 16;
if (sim_switches & SWMASK ('O')) if ((sim_switches & SWMASK('O')) || (sim_switch_number == 8))
radix = 8; radix = 8;
vec = dibp->vec; vec = dibp->vec;
if (arg) if (arg)
@ -434,13 +434,16 @@ DIB *dibp;
uint32 maxaddr, maxname, maxdev; uint32 maxaddr, maxname, maxdev;
int32 maxvec, vecwid; int32 maxvec, vecwid;
int32 brbase = 0; int32 brbase = 0;
uint32 rdx = DEV_RDX;
char valbuf[40]; char valbuf[40];
char *vec_fmt = NULL;
char vec_fmt_buf[16];
#if defined DEV_RDX && DEV_RDX == 16 if ((sim_switches & SWMASK('O')) || (sim_switch_number == 8))
#define VEC_FMT "X" rdx = 8;
#else if ((sim_switches & SWMASK('H')) || (sim_switch_number == 16))
#define VEC_FMT "o" rdx = 16;
#endif vec_fmt = (rdx == 16) ? "X" : "o";
if (build_dib_tab ()) /* build IO page */ if (build_dib_tab ()) /* build IO page */
return SCPE_OK; return SCPE_OK;
@ -471,8 +474,9 @@ for (i = 0, dibp = NULL; i < (IOPAGESIZE >> 1); i++) { /* loop thru entries */
maxdev = j; maxdev = j;
} /* end if */ } /* end if */
} /* end for i */ } /* end for i */
maxaddr = fprint_val (NULL, (t_value) dibp->ba, DEV_RDX, 32, PV_LEFT); maxaddr = fprint_val (NULL, (t_value) dibp->ba, rdx, 32, PV_LEFT);
sprintf (valbuf, "%03" VEC_FMT, maxvec); sprintf (vec_fmt_buf, "%s%s", "%03", vec_fmt);
sprintf (valbuf, vec_fmt_buf, maxvec);
vecwid = maxvec = (int32) strlen (valbuf); vecwid = maxvec = (int32) strlen (valbuf);
if (vecwid < 3) if (vecwid < 3)
vecwid = 3; vecwid = 3;
@ -522,19 +526,22 @@ for (i = 0, dibp = NULL; i < (IOPAGESIZE >> 1); i++) { /* loop thru entries */
if (iodibp[i] && (iodibp[i] != dibp)) { /* new block? */ if (iodibp[i] && (iodibp[i] != dibp)) { /* new block? */
dibp = iodibp[i]; /* DIB for block */ dibp = iodibp[i]; /* DIB for block */
dptr = dibp->dptr; /* locate device */ dptr = dibp->dptr; /* locate device */
fprint_val (st, (t_value) dibp->ba, DEV_RDX, 32, PV_LEFT); fprint_val (st, (t_value) dibp->ba, rdx, 32, PV_LEFT);
fprintf (st, " - "); fprintf (st, " - ");
fprint_val (st, (t_value) dibp->ba + dibp->lnt - 1, DEV_RDX, 32, PV_LEFT); fprint_val (st, (t_value) dibp->ba + dibp->lnt - 1, rdx, 32, PV_LEFT);
fprintf (st, "%c ", /* print block entry */ fprintf (st, "%c ", /* print block entry */
(dibp->ba < IOPAGEBASE + AUTO_CSRBASE + AUTO_CSRMAX)? '*': ' '); (dibp->ba < IOPAGEBASE + AUTO_CSRBASE + AUTO_CSRMAX)? '*': ' ');
if (dibp->vec == 0) if (dibp->vec == 0)
fprintf (st, "%*s", ((vecwid*2)+1+1), " "); fprintf (st, "%*s", ((vecwid*2)+1+1), " ");
else { else {
fprintf (st, "%0*" VEC_FMT, vecwid, dibp->vec); sprintf (vec_fmt_buf, "%s%s", "%0*", vec_fmt);
if (dibp->vnum > 1) fprintf (st, vec_fmt_buf, vecwid, dibp->vec);
fprintf (st, "-%0*" VEC_FMT, vecwid, dibp->vec + (4 * if (dibp->vnum > 1) {
sprintf (vec_fmt_buf, "%s%s", "-%0*", vec_fmt);
fprintf (st, vec_fmt_buf, vecwid, dibp->vec + (4 *
(dibp->ulnt? dibp->lnt/dibp->ulnt: (dibp->ulnt? dibp->lnt/dibp->ulnt:
(dptr? dptr->numunits: 1)) * dibp->vnum) - 4); (dptr? dptr->numunits: 1)) * dibp->vnum) - 4);
}
else else
fprintf (st, " %*s", vecwid, " "); fprintf (st, " %*s", vecwid, " ");
fprintf (st, "%1s", (dibp->vnum >= AUTO_VECBASE)? "*": " "); fprintf (st, "%1s", (dibp->vnum >= AUTO_VECBASE)? "*": " ");
@ -549,7 +556,6 @@ for (i = 0, dibp = NULL; i < (IOPAGESIZE >> 1); i++) { /* loop thru entries */
} /* end if */ } /* end if */
} /* end for i */ } /* end for i */
return SCPE_OK; return SCPE_OK;
#undef VEC_FMT
} }
/* Autoconfiguration /* Autoconfiguration