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

PDP11, VAX: Allow autoconfigure to allocate fixed address and vectors properly.

Browse source 
When an auto configuration table entry contains multiple devices be sure
to account for earlier devices which may be disabled while allocating fixed
address and vector values.  Examples: XQ, XQB, RB, RQB, RQC, RQD, RX, RY
This problem is discussed in #263
This commit is contained in:
Mark Pizzolato 2016-01-05 04:05:04 -08:00
parent 434a367daf
commit c5cf64c439
1 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
PDP11/pdp11_io_lib.c
View file

@ -832,7 +832,7 @@ extern UNIT cpu_unit;
AUTO_CON *autp; AUTO_CON *autp;
DEVICE *dptr; DEVICE *dptr;
DIB *dibp; DIB *dibp;
uint32 j, vmask, amask; uint32 j, k, jdis, vmask, amask;
if (autcon_enb == 0) /* enabled? */ if (autcon_enb == 0) /* enabled? */
return SCPE_OK; return SCPE_OK;
@ -879,16 +879,24 @@ for (autp = auto_tab; autp->numc >= 0; autp++) { /* loop thru table */
return SCPE_IERR; return SCPE_IERR;
ilvl = dibp->vloc / 32; ilvl = dibp->vloc / 32;
ibit = dibp->vloc % 32; ibit = dibp->vloc % 32;
if (autp->fixa[j]) /* fixed csr avail? */ /* Identify how many devices earlier in the device list are
dibp->ba = IOPAGEBASE + autp->fixa[j]; /* use it */ disabled and use that info to determine fixed address assignments */
for (k=jdis=0; k<j; k++) {
DEVICE *kdptr = find_dev (autp->dnam[k]);
if (kdptr->flags & DEV_DIS)
++jdis;
}
if (autp->fixa[j-jdis]) /* fixed csr avail? */
dibp->ba = IOPAGEBASE + autp->fixa[j-jdis]; /* use it */
else { /* no fixed left */ else { /* no fixed left */
dibp->ba = csr; /* set CSR */ dibp->ba = csr; /* set CSR */
csr += (autp->numc * autp->amod); /* next CSR */ csr += (autp->numc * autp->amod); /* next CSR */
} /* end else */ } /* end else */
if (autp->numv) { /* vec needed? */ if (autp->numv) { /* vec needed? */
if (autp->fixv[j]) { /* fixed vec avail? */ if (autp->fixv[j-jdis]) { /* fixed vec avail? */
if (autp->numv > 0) if (autp->numv > 0)
dibp->vec = autp->fixv[j]; /* use it */ dibp->vec = autp->fixv[j-jdis]; /* use it */
} }
else { /* no fixed left */ else { /* no fixed left */
uint32 numv = abs (autp->numv); /* get num vec */ uint32 numv = abs (autp->numv); /* get num vec */