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

PDP11, VAX: Use standard error status reporting with richer message text in auto-config

Browse source
This commit is contained in:
Mark Pizzolato 2016-04-05 15:01:11 -07:00
parent 46465d3348
commit cb96abef96
1 changed files with 11 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
PDP11/pdp11_io_lib.c
View file

@ -340,11 +340,10 @@ if (vec && !(sim_switches & SWMASK ('P'))) {
if (!cdname) { if (!cdname) {
cdname = "CPU"; cdname = "CPU";
} }
sim_printf ("Device %s interrupt vector conflict with %s at ", return sim_messagef (SCPE_STOP, (DEV_RDX == 16) ?
sim_dname (dptr), cdname); "Device %s interrupt vector conflict with %s at 0x%X\n" :
sim_print_val ((t_value) dibp->vec, DEV_RDX, 32, PV_LEFT); "Device %s interrupt vector conflict with %s at 0%o\n",
sim_printf ("\n"); sim_dname (dptr), cdname, (int)dibp->vec);
return SCPE_STOP;
} }
} }
/* Interrupt slot assignment and conflict check. */ /* Interrupt slot assignment and conflict check. */
@ -361,9 +360,8 @@ for (i = 0; i < dibp->vnum; i++) { /* loop thru vec */
(int_ack[ilvl][ibit] != dibp->ack[i])) || (int_ack[ilvl][ibit] != dibp->ack[i])) ||
(int_vec[ilvl][ibit] && vec && (int_vec[ilvl][ibit] && vec &&
(int_vec[ilvl][ibit] != vec))) { (int_vec[ilvl][ibit] != vec))) {
sim_printf ("Device %s interrupt slot conflict at %d\n", return sim_messagef (SCPE_STOP, "Device %s interrupt slot conflict at %d\n",
sim_dname (dptr), idx); sim_dname (dptr), idx);
return SCPE_STOP;
} }
if (dibp->ack[i]) if (dibp->ack[i])
int_ack[ilvl][ibit] = dibp->ack[i]; int_ack[ilvl][ibit] = dibp->ack[i];
@ -397,10 +395,10 @@ for (i = 0; i < (int32) dibp->lnt; i = i + 2) { /* create entries */
if (!cdname) { if (!cdname) {
cdname = "CPU"; cdname = "CPU";
} }
sim_printf ("Device %s address conflict with %s at ", sim_dname (dptr), cdname); return sim_messagef (SCPE_STOP, (DEV_RDX == 16) ?
sim_print_val ((t_value) dibp->ba, DEV_RDX, 32, PV_LEFT); "Device %s address conflict with %s at 0x%X\n" :
sim_printf ("\n"); "Device %s address conflict with %s at 0%o\n",
return SCPE_STOP; sim_dname (dptr), cdname, (int)dibp->ba);
} }
if (dibp->rd) /* set rd dispatch */ if (dibp->rd) /* set rd dispatch */
iodispR[idx] = dibp->rd; iodispR[idx] = dibp->rd;
@ -861,8 +859,7 @@ for (autp = auto_tab; autp->valid >= 0; autp++) { /* loop thru table */
dptr->flags |= DEV_DIS; dptr->flags |= DEV_DIS;
if (sim_switches & SWMASK ('P')) if (sim_switches & SWMASK ('P'))
continue; continue;
sim_printf ("%s device not compatible with system bus\n", sim_dname(dptr)); return sim_messagef (SCPE_NOFNC, "%s device not compatible with system bus\n", sim_dname(dptr));
return SCPE_NOFNC;
} }
dibp = (DIB *) dptr->ctxt; /* get DIB */ dibp = (DIB *) dptr->ctxt; /* get DIB */
if (dibp == NULL) /* not there??? */ if (dibp == NULL) /* not there??? */