1
0
mirror of https://github.com/simh/simh.git synced 2026-01-11 23:52:58 +00:00

Interdata, SAGE, various VAXen: Fix devices with duplicate/ambiguous register names

Discovered by recent extension of register sanity check logic
This commit is contained in:
Mark Pizzolato 2022-07-07 08:12:10 -10:00
parent a6f9d02cff
commit a28da088be
4 changed files with 5 additions and 5 deletions

View File

@ -252,10 +252,10 @@ UNIT idc_unit[] = {
REG idc_reg[] = {
{ HRDATA (STA, idc_sta, 8) },
{ HRDATA (BUF, idc_db, 8) },
{ HRDATA (BUFC, idc_db, 8) },
{ HRDATA (SEC, idc_sec, 8) },
{ HRDATA (HCYL, idc_hcyl, 16) },
{ HRDATA (BUF, idd_db, 8) },
{ HRDATA (BUFD, idd_db, 8) },
{ HRDATA (SVUN, idc_svun, 2), REG_HIDDEN },
{ BRDATA (DBUF, idcxb, 16, 8, IDC_NUMBY * 3) },
{ HRDATA (DBPTR, idc_bptr, 10), REG_RO },

View File

@ -81,7 +81,7 @@ REG sio_reg[] = {
{ HRDATA(IBUF, u58.ibuf, 8) },
{ HRDATA(OBUF, u58.obuf, 8) },
{ HRDATA(STATUS, u58.status, 8) },
{ HRDATA(STATUS, u58.bitmask, 8), REG_HRO },
{ HRDATA(BITMASK, u58.bitmask, 8), REG_HRO },
{ 0 }
};

View File

@ -189,7 +189,7 @@ REG sysd_reg[] = {
{ HRDATAD (CONPC, conpc, 32, "console PD") },
{ HRDATAD (CONPSL, conpsl, 32, "console PSL") },
{ HRDATAD (HLTCOD, ka_hltcod, 16, "KA420 halt code") },
{ HRDATAD (MSER, ka_mser, 8, "KA420 mem sys err") },
{ HRDATAD (MSERKA, ka_mser, 8, "KA420 mem sys err") },
{ HRDATAD (MEAR, ka_mear, 8, "KA420 mem err") },
{ HRDATAD (CFGTST, ka_cfgtst, 8, "KA420 config/test register") },
{ NULL }

View File

@ -106,7 +106,7 @@ REG xs_reg[] = {
{ GRDATA ( RXNEXT, xs_var.rxnext, DEV_RDX, 32, 0), REG_FIT },
{ BRDATA ( RXHDR, xs_var.rxhdr, DEV_RDX, 16, 4), REG_HRO },
{ BRDATA ( TXHDR, xs_var.txhdr, DEV_RDX, 16, 4), REG_HRO },
{ FLDATAD ( INT, int_req[IPL_XS1], INT_V_XS1, "interrupt pending flag") },
{ FLDATAD ( INTREQ, int_req[IPL_XS1], INT_V_XS1, "interrupt pending flag") },
{ NULL }
};