github.com/simh.simh
1
0
Fork 0
mirror of https://github.com/simh/simh.git synced 2026-01-26 04:01:38 +00:00
Code Releases Activity

PDP11: Report detected address/vector conflict information

Browse Source 
Massbus devices are not Qbus or Unibus (RP, TU, RS), so don't disable
them on change of CPU type.
This commit is contained in:
Mark Pizzolato
2022-07-26 11:44:54 -07:00
parent 0be2c735a6
commit b56b0ed98f
4 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
PDP11/pdp11_cpumod.c
View File

@@ -1248,6 +1248,7 @@ if (opt & BUS_U) /* Unibus variant? */
else if (MEMSIZE <= UNIMEMSIZE) /* 18b Qbus devices? */
mask = DEV_QBUS | DEV_Q18;
else mask = DEV_QBUS; /* must be 22b */
mask |= DEV_MBUS; /* leave Massbus devices */
for (i = 0; (dptr = sim_devices[i]) != NULL; i++) {
if ((dptr->flags & DEV_DISABLE) && /* disable-able? */
!(dptr->flags & DEV_DIS) && /* enabled? */

33
PDP11/pdp11_io_lib.c
View File

@@ -37,6 +37,10 @@
#include "sim_tmxr.h"
#include "sim_ether.h"
#if !defined(DEV_MBUS)
#define DEV_MBUS 0
#endif
extern int32 int_vec[IPL_HLVL][32];
#if !defined(VEC_SET)
#define VEC_SET 0
@@ -321,6 +325,7 @@ int32 i, idx, vec, hivec, ilvl, ibit;
DEVICE *cdptr;
size_t j;
const char *cdname;
t_stat r = SCPE_OK;
if ((dptr == NULL) || (dibp == NULL)) /* validate args */
return SCPE_IERR;
@@ -369,10 +374,10 @@ if (vec && !(sim_switches & SWMASK ('P'))) {
if (!cdname) {
cdname = "CPU";
}
return sim_messagef (SCPE_STOP, (DEV_RDX == 16) ?
"Device %s interrupt vector conflict with %s at 0x%X\n" :
"Device %s interrupt vector conflict with %s at 0%o\n",
sim_dname (dptr), cdname, (int)dibp->vec);
r = sim_messagef (SCPE_STOP, (DEV_RDX == 16) ?
"Device %s interrupt vector at 0x%X through 0x%X conflict with %s at 0x%X through 0x%X\n" :
"Device %s interrupt vector at 0%o through 0%o conflict with %s at 0%o through 0%o\n",
sim_dname (dptr), vec, hivec, cdname, (int)dibp->vec, (int)cdhivec);
}
}
/* Interrupt slot assignment and conflict check. */
@@ -389,8 +394,8 @@ for (i = 0; i < dibp->vnum; i++) { /* loop thru vec */
(int_ack[ilvl][ibit] != dibp->ack[i])) ||
(int_vec[ilvl][ibit] && vec &&
(int_vec[ilvl][ibit] != vec))) {
return sim_messagef (SCPE_STOP, "Device %s interrupt slot conflict at %d\n",
sim_dname (dptr), idx);
r = sim_messagef (SCPE_STOP, "Device %s interrupt slot conflict at %d\n",
sim_dname (dptr), idx);
}
if (dibp->ack[i])
int_ack[ilvl][ibit] = dibp->ack[i];
@@ -424,10 +429,10 @@ for (i = 0; i < (int32) dibp->lnt; i = i + 2) { /* create entries */
if (!cdname) {
cdname = "CPU";
}
return sim_messagef (SCPE_STOP, (DEV_RDX == 16) ?
"Device %s address conflict with %s at 0x%X\n" :
"Device %s address conflict with %s at 0%o\n",
sim_dname (dptr), cdname, (int)dibp->ba);
r = sim_messagef (SCPE_STOP, (DEV_RDX == 16) ?
"Device %s address conflict with %s at 0x%X\n" :
"Device %s address conflict with %s at 0%o\n",
sim_dname (dptr), cdname, (int)dibp->ba);
}
if ((dibp->rd == NULL) && (dibp->wr == NULL) && (dibp->vnum == 0)) {
iodibp[idx] = NULL; /* deregister DIB */
@@ -449,12 +454,13 @@ for (j = 0; (cdptr = sim_devices[j]) != NULL; j++) { /* Look for enabled but una
(cdptr->flags & DEV_DIS) ||
(cdibp == NULL) ||
((cdptr->flags & (DEV_UBUS | DEV_QBUS)) == 0) ||
((cdptr->flags & DEV_MBUS) != 0) ||
((cdptr->flags & DEV_NOAUTOCON) != 0) ||
(cdibp->ba != IOBA_AUTO))
continue;
return sim_messagef (SCPE_STOP, "%s: Missing Address\n", cdptr->name);
r = sim_messagef (SCPE_STOP, "%s: Missing Address\n", cdptr->name);
}
return SCPE_OK;
return r;
}
/* Show IO space */
@@ -478,8 +484,7 @@ if ((sim_switches & SWMASK('H')) || (sim_switch_number == 16))
rdx = 16;
vec_fmt = (rdx == 16) ? "X" : "o";
if (build_dib_tab ()) /* build IO page */
return SCPE_OK;
build_dib_tab (); /* build IO page */
maxaddr = 0;
maxvec = 0;

2
PDP11/pdp11_rs.c
View File

@@ -261,7 +261,7 @@ DEVICE rs_dev = {
RS_NUMDR, DEV_RADIX, 19, 1, DEV_RADIX, 16,
NULL, NULL, &rs_reset,
&rs_boot, &rs_attach, &rs_detach,
&rs_dib, DEV_DISABLE|DEV_DIS|DEV_UBUS|DEV_QBUS|DEV_MBUS|DEV_DEBUG, 0,
&rs_dib, DEV_DISABLE|DEV_DIS|DEV_MBUS|DEV_DEBUG, 0,
NULL, NULL, NULL, &rs_help, NULL, NULL,
&rs_description
};

2
PDP11/pdp11_tu.c
View File

@@ -333,7 +333,7 @@ DEVICE tu_dev = {
TU_NUMDR, 10, T_ADDR_W, 1, DEV_RDX, 8,
NULL, NULL, &tu_reset,
&tu_boot, &tu_attach, &tu_detach,
&tu_dib, DEV_MBUS|DEV_UBUS|DEV_QBUS|DEV_DEBUG|DEV_DISABLE|DEV_DIS_INIT|DEV_TM03|DEV_TAPE,
&tu_dib, DEV_MBUS|DEV_DEBUG|DEV_DISABLE|DEV_DIS_INIT|DEV_TM03|DEV_TAPE,
0, NULL, NULL, NULL, &tu_help, NULL, NULL,
&tu_description
};