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

PDP11, VAX: Fix autoconfigure to properly allocate fixed vectors and addresses

Browse source 
Multiple devices sharing the same pool of fixed and/or vector addresses
need to properly account for earlier devices that may have already consumed
available fixed addresses or vectors.
This commit is contained in:
Mark Pizzolato 2016-05-19 14:47:42 -07:00
parent 385d14ee4f
commit d4ed9da2ff
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
PDP11/pdp11_io_lib.c
View file

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