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

PDP8: Fix device conflict warnings to report problems correctly

Browse source 
As reported in #1084
This commit is contained in:
Bob Supnik 2021-10-23 15:09:10 -07:00 • committed by Mark Pizzolato
parent 74021166d3
commit 89cd2d458f
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
PDP8/pdp8_cpu.c
View file

@ -1,6 +1,6 @@
/* pdp8_cpu.c: PDP-8 CPU simulator /* pdp8_cpu.c: PDP-8 CPU simulator
Copyright (c) 1993-2017, Robert M Supnik Copyright (c) 1993-2021, Robert M Supnik
Permission is hereby granted, free of charge, to any person obtaining a Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"), copy of this software and associated documentation files (the "Software"),
@ -1533,7 +1533,7 @@ for (i = 0; (dptr = sim_devices[i]) != NULL; i++) { /* add devices */
if (dspp->dsp) { /* any dispatch? */ if (dspp->dsp) { /* any dispatch? */
if (dev_tab[dspp->dev]) { /* already filled? */ if (dev_tab[dspp->dev]) { /* already filled? */
sim_printf ("%s device number conflict at %02o\n", sim_printf ("%s device number conflict at %02o\n",
sim_dname (dptr), dibp->dev + j); sim_dname (dptr), dspp->dev);
return TRUE; return TRUE;
} }
dev_tab[dspp->dev] = dspp->dsp; /* fill */ dev_tab[dspp->dev] = dspp->dsp; /* fill */

10
PDP8/pdp8_fpp.c
View file

@ -1,6 +1,6 @@
/* pdp8_fpp.c: PDP-8 floating point processor (FPP8A) /* pdp8_fpp.c: PDP-8 floating point processor (FPP8A)
Copyright (c) 2007-2011, Robert M Supnik Copyright (c) 2007-2021, Robert M Supnik
Permission is hereby granted, free of charge, to any person obtaining a Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"), copy of this software and associated documentation files (the "Software"),
@ -25,6 +25,7 @@
fpp FPP8A floating point processor fpp FPP8A floating point processor
21-Oct-21 RMS Added device number display
03-Jan-10 RMS Initialized variables statically, for VMS compiler 03-Jan-10 RMS Initialized variables statically, for VMS compiler
19-Apr-09 RHM FPICL does not clear all command and status reg bits 19-Apr-09 RHM FPICL does not clear all command and status reg bits
modify fpp_reset to conform with FPP modify fpp_reset to conform with FPP
@ -242,8 +243,13 @@ REG fpp_reg[] = {
{ NULL } { NULL }
}; };
MTAB fpp_mod[] = {
{ MTAB_XTD|MTAB_VDV, 0, "DEVNO", NULL, NULL, &show_dev },
{ 0 }
};
DEVICE fpp_dev = { DEVICE fpp_dev = {
"FPP", &fpp_unit, fpp_reg, NULL, "FPP", &fpp_unit, fpp_reg, fpp_mod,
1, 10, 31, 1, 8, 8, 1, 10, 31, 1, 8, 8,
NULL, NULL, &fpp_reset, NULL, NULL, &fpp_reset,
NULL, NULL, NULL, NULL, NULL, NULL,