From 09ce5a62e3b07cc062e3fa06b3e236c60cc1467d Mon Sep 17 00:00:00 2001
From: Mark Pizzolato <mark@infocomm.com>
Date: Sat, 7 Mar 2020 20:01:26 -0800
Subject: [PATCH] PDP6, KA10, KI10: Update register definitions for checking

---
 PDP10/kx10_cp.c  |  2 +-
 PDP10/kx10_cpu.c |  4 ++--
 PDP10/kx10_cr.c  |  2 +-
 PDP10/kx10_dp.c  | 12 ++++++------
 PDP10/kx10_mt.c  |  2 +-
 PDP10/kx10_rc.c  |  4 ++--
 PDP10/kx10_rp.c  |  8 ++++----
 PDP10/kx10_rs.c  |  2 +-
 PDP10/kx10_tu.c  |  2 +-
 PDP10/pdp6_dct.c |  4 ++--
 PDP10/pdp6_dsk.c |  2 +-
 11 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/PDP10/kx10_cp.c b/PDP10/kx10_cp.c
index a0e910a1..ff8ebdea 100644
--- a/PDP10/kx10_cp.c
+++ b/PDP10/kx10_cp.c
@@ -101,7 +101,7 @@ MTAB                cp_mod[] = {
 };
 
 REG                 cp_reg[] = {
-    {BRDATA(BUFF, cp_buffer, 16, 16, sizeof(cp_buffer)), REG_HRO},
+    {BRDATA(BUFF, cp_buffer, 16, 16, sizeof(cp_buffer)/sizeof(uint16)), REG_HRO},
     {0}
 };
 
diff --git a/PDP10/kx10_cpu.c b/PDP10/kx10_cpu.c
index d23ddb14..dae9f7a6 100644
--- a/PDP10/kx10_cpu.c
+++ b/PDP10/kx10_cpu.c
@@ -323,9 +323,9 @@ REG cpu_reg[] = {
     { ORDATA (FM16, FM[016], 36) },
     { ORDATA (FM17, FM[017], 36) },
 #if KI
-    { BRDATA (FM, &FM[0], 8, 36, 64)},
+    { BRDATA (FM, FM, 8, 36, 64)},
 #else
-    { BRDATA (FM, &FM[0], 8, 36, 16)},
+    { BRDATA (FM, FM, 8, 36, 16)},
 #endif
     { ORDATAD (PIR, PIR, 8, "Priority Interrupt Request") },
     { ORDATAD (PIH, PIH, 8, "Priority Interrupt Hold") },
diff --git a/PDP10/kx10_cr.c b/PDP10/kx10_cr.c
index be886cbf..66a9820f 100644
--- a/PDP10/kx10_cr.c
+++ b/PDP10/kx10_cr.c
@@ -104,7 +104,7 @@ MTAB                cr_mod[] = {
 };
 
 REG                 cr_reg[] = {
-    {BRDATA(BUFF, cr_buffer, 16, 16, sizeof(cr_buffer)), REG_HRO},
+    {BRDATA(BUFF, cr_buffer, 16, 16, sizeof(cr_buffer)/sizeof(uint16)), REG_HRO},
     {0}
 };
 
diff --git a/PDP10/kx10_dp.c b/PDP10/kx10_dp.c
index 2f41a4f5..6810203e 100644
--- a/PDP10/kx10_dp.c
+++ b/PDP10/kx10_dp.c
@@ -275,8 +275,8 @@ MTAB                dp_mod[] = {
 };
 
 REG                 dpa_reg[] = {
-    {BRDATA(BUFF, &dp_buf[0][0], 16, 64, RP_NUMWD), REG_HRO},
-    {BRDATA(UNIT, &dp_cur_unit[0], 16, 8, 1), REG_HRO},
+    {BRDATA(BUFF, dp_buf[0], 16, 64, RP_NUMWD), REG_HRO},
+    {HRDATA(UNIT, dp_cur_unit[0], 32), REG_HRO},
     {FLDATA(READIN, readin_flag, 0), REG_HRO},
     {ORDATA(STATUS, dp_df10[0].status, 18), REG_RO},
     {ORDATA(CIA, dp_df10[0].cia, 18)},
@@ -300,8 +300,8 @@ DEVICE              dpa_dev = {
 
 #if (NUM_DEVS_DP > 1)
 REG                 dpb_reg[] = {
-    {BRDATA(BUFF, &dp_buf[1][0], 16, 64, RP_NUMWD), REG_HRO},
-    {BRDATA(DF10, &dp_cur_unit[1], 16, 8, 1), REG_HRO},
+    {BRDATA(BUFF, dp_buf[1], 16, 64, RP_NUMWD), REG_HRO},
+    {HRDATA(UNIT, dp_cur_unit[1], 32), REG_HRO},
     {ORDATA(STATUS, dp_df10[1].status, 18), REG_RO},
     {ORDATA(CIA, dp_df10[1].cia, 18)},
     {ORDATA(CCW, dp_df10[1].ccw, 18)},
@@ -324,7 +324,7 @@ DEVICE              dpb_dev = {
 
 #if (NUM_DEVS_DP > 2)
 REG                 dpc_reg[] = {
-    {BRDATA(BUFF, &dp_buf[2][0], 16, 64, RP_NUMWD), REG_HRO},
+    {BRDATA(BUFF, dp_buf[2], 16, 64, RP_NUMWD), REG_HRO},
     {BRDATA(DF10, &dp_cur_unit[2], 16, 8, 1), REG_HRO},
     {ORDATA(STATUS, dp_df10[2].status, 18), REG_RO},
     {ORDATA(CIA, dp_df10[2].cia, 18)},
@@ -348,7 +348,7 @@ DEVICE              dpc_dev = {
 
 #if (NUM_DEVS_DP > 3)
 REG                 dpd_reg[] = {
-    {BRDATA(BUFF, &dp_buf[3][0], 16, 64, RP_NUMWD), REG_HRO},
+    {BRDATA(BUFF, dp_buf[3], 16, 64, RP_NUMWD), REG_HRO},
     {BRDATA(DF10, &dp_cur_unit[3], 16, 8, 1), REG_HRO},
     {ORDATA(STATUS, dp_df10[3].status, 18), REG_RO},
     {ORDATA(CIA, dp_df10[3].cia, 18)},
diff --git a/PDP10/kx10_mt.c b/PDP10/kx10_mt.c
index 3c0fbc28..2d2151e0 100644
--- a/PDP10/kx10_mt.c
+++ b/PDP10/kx10_mt.c
@@ -197,7 +197,7 @@ MTAB                mt_mod[] = {
 };
 
 REG                 mt_reg[] = {
-    {BRDATA(BUFF, &mt_buffer[0], 16, 8, BUFFSIZE), REG_HRO},
+    {BRDATA(BUFF, mt_buffer, 16, 8, BUFFSIZE), REG_HRO},
     {ORDATA(PIA, mt_pia, 3)},
     {ORDATA(UNIT, mt_sel_unit, 3)},
     {ORDATA(NUNIT, mt_next_unit, 3)},
diff --git a/PDP10/kx10_rc.c b/PDP10/kx10_rc.c
index 5ddeeade..36f3e4a3 100644
--- a/PDP10/kx10_rc.c
+++ b/PDP10/kx10_rc.c
@@ -163,7 +163,7 @@ MTAB                rc_mod[] = {
 };
 
 REG                 rca_reg[] = {
-    {BRDATA(BUFF, &rc_buf[0][0], 16, 64, RM10_WDS), REG_HRO},
+    {BRDATA(BUFF, rc_buf[0], 16, 64, RM10_WDS), REG_HRO},
     {ORDATA(IPR, rc_ipr[0], 2), REG_HRO},
     {ORDATA(STATUS, rc_df10[0].status, 18), REG_RO},
     {ORDATA(CIA, rc_df10[0].cia, 18)},
@@ -187,7 +187,7 @@ DEVICE              rca_dev = {
 
 #if (NUM_DEVS_RC > 1)
 REG                 rcb_reg[] = {
-    {BRDATA(BUFF, &rc_buf[1][0], 16, 64, RM10_WDS), REG_HRO},
+    {BRDATA(BUFF, rc_buf[1], 16, 64, RM10_WDS), REG_HRO},
     {ORDATA(IPR, rc_ipr[1], 2), REG_HRO},
     {ORDATA(STATUS, rc_df10[1].status, 18), REG_RO},
     {ORDATA(CIA, rc_df10[1].cia, 18)},
diff --git a/PDP10/kx10_rp.c b/PDP10/kx10_rp.c
index 29ec6b4b..fe6a77f0 100644
--- a/PDP10/kx10_rp.c
+++ b/PDP10/kx10_rp.c
@@ -420,7 +420,7 @@ REG                 rpa_reg[] = {
     {ORDATA(BUF, rp_df10[0].buf, 36), REG_HRO},
     {ORDATA(NXM, rp_df10[0].nxmerr, 8), REG_HRO},
     {ORDATA(COMP, rp_df10[0].ccw_comp, 8), REG_HRO},
-    {BRDATA(BUFF, &rp_buf[0][0], 16, 64, RP_NUMWD), REG_HRO},
+    {BRDATA(BUFF, rp_buf[0], 16, 64, RP_NUMWD), REG_HRO},
     {0}
 };  
 
@@ -450,7 +450,7 @@ REG                 rpb_reg[] = {
     {ORDATA(BUF, rp_df10[1].buf, 36), REG_HRO},
     {ORDATA(NXM, rp_df10[1].nxmerr, 8), REG_HRO},
     {ORDATA(COMP, rp_df10[1].ccw_comp, 8), REG_HRO},
-    {BRDATA(BUFF, &rp_buf[1][0], 16, 64, RP_NUMWD), REG_HRO},
+    {BRDATA(BUFF, rp_buf[1], 16, 64, RP_NUMWD), REG_HRO},
     {0}
 };  
 
@@ -480,7 +480,7 @@ REG                 rpc_reg[] = {
     {ORDATA(BUF, rp_df10[2].buf, 36), REG_HRO},
     {ORDATA(NXM, rp_df10[2].nxmerr, 8), REG_HRO},
     {ORDATA(COMP, rp_df10[2].ccw_comp, 8), REG_HRO},
-    {BRDATA(BUFF, &rp_buf[2][0], 16, 64, RP_NUMWD), REG_HRO},
+    {BRDATA(BUFF, rp_buf[2], 16, 64, RP_NUMWD), REG_HRO},
     {0}
 };  
 
@@ -510,7 +510,7 @@ REG                 rpd_reg[] = {
     {ORDATA(BUF, rp_df10[3].buf, 36), REG_HRO},
     {ORDATA(NXM, rp_df10[3].nxmerr, 8), REG_HRO},
     {ORDATA(COMP, rp_df10[3].ccw_comp, 8), REG_HRO},
-    {BRDATA(BUFF, &rp_buf[3][0], 16, 64, RP_NUMWD), REG_HRO},
+    {BRDATA(BUFF, rp_buf[3], 16, 64, RP_NUMWD), REG_HRO},
     {0}
 };  
 
diff --git a/PDP10/kx10_rs.c b/PDP10/kx10_rs.c
index d550c27e..0b589546 100644
--- a/PDP10/kx10_rs.c
+++ b/PDP10/kx10_rs.c
@@ -305,7 +305,7 @@ REG                 rsa_reg[] = {
     {ORDATA(BUF, rs_df10[0].buf, 36), REG_HRO},
     {ORDATA(NXM, rs_df10[0].nxmerr, 8), REG_HRO},
     {ORDATA(COMP, rs_df10[0].ccw_comp, 8), REG_HRO},
-    {BRDATA(BUFF, &rs_buf[0][0], 16, 64, RS_NUMWD), REG_HRO},
+    {BRDATA(BUFF, rs_buf[0], 16, 64, RS_NUMWD), REG_HRO},
     {0}
 };  
 
diff --git a/PDP10/kx10_tu.c b/PDP10/kx10_tu.c
index d22ab75a..11da775a 100644
--- a/PDP10/kx10_tu.c
+++ b/PDP10/kx10_tu.c
@@ -290,7 +290,7 @@ REG                 tua_reg[] = {
     {ORDATA(BUF, tu_df10[0].buf, 36), REG_HRO},
     {ORDATA(NXM, tu_df10[0].nxmerr, 8), REG_HRO},
     {ORDATA(COMP, tu_df10[0].ccw_comp, 8), REG_HRO},
-    {BRDATA(BUFF, &tu_buf[0][0], 16, 8, TU_NUMFR), REG_HRO},
+    {BRDATA(BUFF, tu_buf[0], 16, 8, TU_NUMFR), REG_HRO},
     {0}
 };  
 
diff --git a/PDP10/pdp6_dct.c b/PDP10/pdp6_dct.c
index 9ca0fd57..787794bd 100644
--- a/PDP10/pdp6_dct.c
+++ b/PDP10/pdp6_dct.c
@@ -71,8 +71,8 @@ DIB                 dct_dib[] = {
 };
 
 REG                 dct_reg[] = {
-    {BRDATA(BUFF, &dct_buf[0], 16, 36, NUM_DEVS_DCT), REG_HRO},
-    {BRDATA(BUFF, &dct_acc[0], 16, 36, NUM_DEVS_DCT), REG_HRO},
+    {BRDATA(BUFF, dct_buf, 16, 36, NUM_DEVS_DCT), REG_HRO},
+    {BRDATA(BUFF, dct_acc, 16, 36, NUM_DEVS_DCT), REG_HRO},
     {0}
 };
 
diff --git a/PDP10/pdp6_dsk.c b/PDP10/pdp6_dsk.c
index f55e4804..72f9a16f 100644
--- a/PDP10/pdp6_dsk.c
+++ b/PDP10/pdp6_dsk.c
@@ -172,7 +172,7 @@ MTAB                dsk_mod[] = {
 };
 
 REG                 dsk_reg[] = {
-    {BRDATA(BUFF, &dsk_buf[0], 16, 64, DSK_WDS), REG_HRO},
+    {BRDATA(BUFF, dsk_buf, 16, 64, DSK_WDS), REG_HRO},
     {0}
 };