From 329f42a1fc52461464ff34d44f4866a5f9aebd2c Mon Sep 17 00:00:00 2001
From: Mark Pizzolato <mark@infocomm.com>
Date: Wed, 16 Mar 2016 20:33:41 -0700
Subject: [PATCH] SCP: Rework newly added REG macro definitions to avoid
 problems with prior declarations

Fix #288
---
 PDP11/pdp11_td.c |   4 +-
 doc/simh.doc     | Bin 218112 -> 217088 bytes
 sim_defs.h       | 110 +++++++++++++++++++++++------------------------
 3 files changed, 57 insertions(+), 57 deletions(-)

diff --git a/PDP11/pdp11_td.c b/PDP11/pdp11_td.c
index a166ad73..8d05b26c 100644
--- a/PDP11/pdp11_td.c
+++ b/PDP11/pdp11_td.c
@@ -683,8 +683,8 @@ static REG td_reg[] = {
     { DRDATAD (XTIME,  td_xtime,24, "tr set time"), PV_LEFT },
     { DRDATAD (ITIME,  td_itime,24, "init time"), PV_LEFT },
 
-#define RDATA(nm,loc,wd,desc) SRDATAD(nm,td_ctlr[0].loc,16,wd,0,TD_NUMCTLR+1,sizeof(CTLR),REG_RO,desc)
-#define RDATAF(nm,loc,wd,desc,flds) SRDATADF(nm,td_ctlr[0].loc,16,wd,0,TD_NUMCTLR+1,sizeof(CTLR),REG_RO,desc,flds)
+#define RDATA(nm,loc,wd,desc) STRDATAD(nm,td_ctlr[0].loc,16,wd,0,TD_NUMCTLR+1,sizeof(CTLR),REG_RO,desc)
+#define RDATAF(nm,loc,wd,desc,flds) STRDATADF(nm,td_ctlr[0].loc,16,wd,0,TD_NUMCTLR+1,sizeof(CTLR),REG_RO,desc,flds)
 
     { RDATA  (ECODE,  ecode,  16, "end packet success code") },
     { RDATA  (BLOCK,  block,  16, "current block number") },
diff --git a/doc/simh.doc b/doc/simh.doc
index 2d1ece888ade11a8389144da5781acafdd021d06..8147f4827033feee8bc42a071ea8e34953a3b09e 100644
GIT binary patch
delta 19352
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

delta 19651
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

diff --git a/sim_defs.h b/sim_defs.h
index 488cd630..79f1714c 100644
--- a/sim_defs.h
+++ b/sim_defs.h
@@ -586,9 +586,9 @@ struct REG {
     uint32              depth;                          /* save depth */
     const char          *desc;                          /* description */
     BITFIELD            *fields;                        /* bit fields */
-    size_t              str_size;                       /* structure size */
     uint32              flags;                          /* flags */
     uint32              qptr;                           /* circ q ptr */
+    size_t              str_size;                       /* structure size */
     };
 
 /* Register flags */
@@ -770,45 +770,45 @@ struct FILEREF {
 
 #if defined (__STDC__) || defined (_WIN32)
 /* Right Justified Octal Register Data */
-#define ORDATA(nm,loc,wd) #nm, &(loc), 8, (wd), 0, 1, NULL, NULL, 0
+#define ORDATA(nm,loc,wd) #nm, &(loc), 8, (wd), 0, 1, NULL, NULL
 /* Right Justified Decimal Register Data */
-#define DRDATA(nm,loc,wd) #nm, &(loc), 10, (wd), 0, 1, NULL, NULL, 0
+#define DRDATA(nm,loc,wd) #nm, &(loc), 10, (wd), 0, 1, NULL, NULL
 /* Right Justified Hexadecimal Register Data */
-#define HRDATA(nm,loc,wd) #nm, &(loc), 16, (wd), 0, 1, NULL, NULL, 0
+#define HRDATA(nm,loc,wd) #nm, &(loc), 16, (wd), 0, 1, NULL, NULL
 /* One-bit binary flag at an arbitrary offset in a 32-bit word Register */
-#define FLDATA(nm,loc,pos) #nm, &(loc), 2, 1, (pos), 1, NULL, NULL, 0
+#define FLDATA(nm,loc,pos) #nm, &(loc), 2, 1, (pos), 1, NULL, NULL
 /* Arbitrary location and Radix Register */
-#define GRDATA(nm,loc,rdx,wd,pos) #nm, &(loc), (rdx), (wd), (pos), 1, NULL, NULL, 0
+#define GRDATA(nm,loc,rdx,wd,pos) #nm, &(loc), (rdx), (wd), (pos), 1, NULL, NULL
 /* Arrayed register whose data is kept in a standard C array Register */
-#define BRDATA(nm,loc,rdx,wd,dep) #nm, (loc), (rdx), (wd), 0, (dep), NULL, NULL, 0
+#define BRDATA(nm,loc,rdx,wd,dep) #nm, (loc), (rdx), (wd), 0, (dep), NULL, NULL
 /* Arrayed register whose data is part of the UNIT structure */
 #define URDATA(nm,loc,rdx,wd,off,dep,fl) \
-    #nm, &(loc), (rdx), (wd), (off), (dep), NULL, NULL, 0, ((fl) | REG_UNIT)
+    #nm, &(loc), (rdx), (wd), (off), (dep), NULL, NULL, ((fl) | REG_UNIT)
 /* Arrayed register whose data is part of an arbitrary structure */
-#define SRDATA(nm,loc,rdx,wd,off,dep,siz,fl) \
-    #nm, &(loc), (rdx), (wd), (off), (dep), NULL, NULL, (siz), ((fl) | REG_STRUCT)
+#define STRDATA(nm,loc,rdx,wd,off,dep,siz,fl) \
+    #nm, &(loc), (rdx), (wd), (off), (dep), NULL, NULL, ((fl) | REG_STRUCT), (siz)
 /* Same as above, but with additional description initializer */
-#define ORDATAD(nm,loc,wd,desc) #nm, &(loc), 8, (wd), 0, 1, (desc), NULL, 0
-#define DRDATAD(nm,loc,wd,desc) #nm, &(loc), 10, (wd), 0, 1, (desc), NULL, 0
-#define HRDATAD(nm,loc,wd,desc) #nm, &(loc), 16, (wd), 0, 1, (desc), NULL, 0
-#define FLDATAD(nm,loc,pos,desc) #nm, &(loc), 2, 1, (pos), 1, (desc), NULL, 0
-#define GRDATAD(nm,loc,rdx,wd,pos,desc) #nm, &(loc), (rdx), (wd), (pos), 1, (desc), NULL, 0
-#define BRDATAD(nm,loc,rdx,wd,dep,desc) #nm, (loc), (rdx), (wd), 0, (dep), (desc), NULL, 0
+#define ORDATAD(nm,loc,wd,desc) #nm, &(loc), 8, (wd), 0, 1, (desc), NULL
+#define DRDATAD(nm,loc,wd,desc) #nm, &(loc), 10, (wd), 0, 1, (desc), NULL
+#define HRDATAD(nm,loc,wd,desc) #nm, &(loc), 16, (wd), 0, 1, (desc), NULL
+#define FLDATAD(nm,loc,pos,desc) #nm, &(loc), 2, 1, (pos), 1, (desc), NULL
+#define GRDATAD(nm,loc,rdx,wd,pos,desc) #nm, &(loc), (rdx), (wd), (pos), 1, (desc), NULL
+#define BRDATAD(nm,loc,rdx,wd,dep,desc) #nm, (loc), (rdx), (wd), 0, (dep), (desc), NULL
 #define URDATAD(nm,loc,rdx,wd,off,dep,fl,desc) \
-    #nm, &(loc), (rdx), (wd), (off), (dep), (desc), NULL, 0, ((fl) | REG_UNIT)
-#define SRDATAD(nm,loc,rdx,wd,off,dep,siz,fl,desc) \
-    #nm, &(loc), (rdx), (wd), (off), (dep), (desc), NULL, (siz), ((fl) | REG_STRUCT)
+    #nm, &(loc), (rdx), (wd), (off), (dep), (desc), NULL, ((fl) | REG_UNIT)
+#define STRDATAD(nm,loc,rdx,wd,off,dep,siz,fl,desc) \
+    #nm, &(loc), (rdx), (wd), (off), (dep), (desc), NULL, ((fl) | REG_STRUCT), (siz)
 /* Same as above, but with additional description initializer, and bitfields */
-#define ORDATADF(nm,loc,wd,desc,flds) #nm, &(loc), 8, (wd), 0, 1, (desc), (flds), 0
-#define DRDATADF(nm,loc,wd,desc,flds) #nm, &(loc), 10, (wd), 0, 1, (desc), (flds), 0
-#define HRDATADF(nm,loc,wd,desc,flds) #nm, &(loc), 16, (wd), 0, 1, (desc), (flds), 0
-#define FLDATADF(nm,loc,pos,desc,flds) #nm, &(loc), 2, 1, (pos), 1, (desc), (flds), 0
-#define GRDATADF(nm,loc,rdx,wd,pos,desc,flds) #nm, &(loc), (rdx), (wd), (pos), 1, (desc), (flds), 0
-#define BRDATADF(nm,loc,rdx,wd,dep,desc,flds) #nm, (loc), (rdx), (wd), 0, (dep), (desc), (flds), 0
+#define ORDATADF(nm,loc,wd,desc,flds) #nm, &(loc), 8, (wd), 0, 1, (desc), (flds)
+#define DRDATADF(nm,loc,wd,desc,flds) #nm, &(loc), 10, (wd), 0, 1, (desc), (flds)
+#define HRDATADF(nm,loc,wd,desc,flds) #nm, &(loc), 16, (wd), 0, 1, (desc), (flds)
+#define FLDATADF(nm,loc,pos,desc,flds) #nm, &(loc), 2, 1, (pos), 1, (desc), (flds)
+#define GRDATADF(nm,loc,rdx,wd,pos,desc,flds) #nm, &(loc), (rdx), (wd), (pos), 1, (desc), (flds)
+#define BRDATADF(nm,loc,rdx,wd,dep,desc,flds) #nm, (loc), (rdx), (wd), 0, (dep), (desc), (flds)
 #define URDATADF(nm,loc,rdx,wd,off,dep,fl,desc,flds) \
-    #nm, &(loc), (rdx), (wd), (off), (dep), (desc), (flds), 0, ((fl) | REG_UNIT)
-#define SRDATADF(nm,loc,rdx,wd,off,dep,siz,fl,desc,flds) \
-    #nm, &(loc), (rdx), (wd), (off), (dep), (desc), (flds), (siz), ((fl) | REG_STRUCT)
+    #nm, &(loc), (rdx), (wd), (off), (dep), (desc), (flds), ((fl) | REG_UNIT)
+#define STRDATADF(nm,loc,rdx,wd,off,dep,siz,fl,desc,flds) \
+    #nm, &(loc), (rdx), (wd), (off), (dep), (desc), (flds), ((fl) | REG_STRUCT), (siz)
 #define BIT(nm)              {#nm, 0xffffffff, 1}             /* Single Bit definition */
 #define BITNC                {"",  0xffffffff, 1}             /* Don't care Bit definition */
 #define BITF(nm,sz)          {#nm, 0xffffffff, sz}            /* Bit Field definition */
@@ -816,36 +816,36 @@ struct FILEREF {
 #define BITFFMT(nm,sz,fmt)   {#nm, 0xffffffff, sz, NULL, #fmt}/* Bit Field definition with Output format */
 #define BITFNAM(nm,sz,names) {#nm, 0xffffffff, sz, names}     /* Bit Field definition with value->name map */
 #else
-#define ORDATA(nm,loc,wd) "nm", &(loc), 8, (wd), 0, 1, NULL, NULL, 0
-#define DRDATA(nm,loc,wd) "nm", &(loc), 10, (wd), 0, 1, NULL, NULL, 0
-#define HRDATA(nm,loc,wd) "nm", &(loc), 16, (wd), 0, 1, NULL, NULL, 0
-#define FLDATA(nm,loc,pos) "nm", &(loc), 2, 1, (pos), 1, NULL, NULL, 0
-#define GRDATA(nm,loc,rdx,wd,pos) "nm", &(loc), (rdx), (wd), (pos), 1, NULL, NULL, 0
-#define BRDATA(nm,loc,rdx,wd,dep) "nm", (loc), (rdx), (wd), 0, (dep), NULL, NULL, 0
+#define ORDATA(nm,loc,wd) "nm", &(loc), 8, (wd), 0, 1, NULL, NULL
+#define DRDATA(nm,loc,wd) "nm", &(loc), 10, (wd), 0, 1, NULL, NULL
+#define HRDATA(nm,loc,wd) "nm", &(loc), 16, (wd), 0, 1, NULL, NULL
+#define FLDATA(nm,loc,pos) "nm", &(loc), 2, 1, (pos), 1, NULL, NULL
+#define GRDATA(nm,loc,rdx,wd,pos) "nm", &(loc), (rdx), (wd), (pos), 1, NULL, NULL
+#define BRDATA(nm,loc,rdx,wd,dep) "nm", (loc), (rdx), (wd), 0, (dep), NULL, NULL
 #define URDATA(nm,loc,rdx,wd,off,dep,fl) \
-    "nm", &(loc), (rdx), (wd), (off), (dep), NULL, NULL, 0, ((fl) | REG_UNIT)
-#define SRDATA(nm,loc,rdx,wd,off,dep,siz,fl) \
-    "nm", &(loc), (rdx), (wd), (off), (dep), NULL, NULL, (siz), ((fl) | REG_STRUCT)
-#define ORDATAD(nm,loc,wd,desc) "nm", &(loc), 8, (wd), 0, 1, (desc), NULL, 0
-#define DRDATAD(nm,loc,wd,desc) "nm", &(loc), 10, (wd), 0, 1, (desc), NULL, 0
-#define HRDATAD(nm,loc,wd,desc) "nm", &(loc), 16, (wd), 0, 1, (desc), NULL, 0
-#define FLDATAD(nm,loc,pos,desc) "nm", &(loc), 2, 1, (pos), 1, (desc), NULL, 0
-#define GRDATAD(nm,loc,rdx,wd,pos,desc) "nm", &(loc), (rdx), (wd), (pos), 1, (desc), NULL, 0
-#define BRDATAD(nm,loc,rdx,wd,dep,desc) "nm", (loc), (rdx), (wd), 0, (dep), (desc), NULL, 0
+    "nm", &(loc), (rdx), (wd), (off), (dep), NULL, NULL, ((fl) | REG_UNIT)
+#define STRDATA(nm,loc,rdx,wd,off,dep,siz,fl) \
+    "nm", &(loc), (rdx), (wd), (off), (dep), NULL, NULL, ((fl) | REG_STRUCT), (siz)
+#define ORDATAD(nm,loc,wd,desc) "nm", &(loc), 8, (wd), 0, 1, (desc), NULL
+#define DRDATAD(nm,loc,wd,desc) "nm", &(loc), 10, (wd), 0, 1, (desc), NULL
+#define HRDATAD(nm,loc,wd,desc) "nm", &(loc), 16, (wd), 0, 1, (desc), NULL
+#define FLDATAD(nm,loc,pos,desc) "nm", &(loc), 2, 1, (pos), 1, (desc), NULL
+#define GRDATAD(nm,loc,rdx,wd,pos,desc) "nm", &(loc), (rdx), (wd), (pos), 1, (desc), NULL
+#define BRDATAD(nm,loc,rdx,wd,dep,desc) "nm", (loc), (rdx), (wd), 0, (dep), (desc), NULL
 #define URDATAD(nm,loc,rdx,wd,off,dep,fl,desc) \
-    "nm", &(loc), (rdx), (wd), (off), (dep), (desc), NULL, 0, ((fl) | REG_UNIT)
-#define SRDATAD(nm,loc,rdx,wd,off,dep,fl,siz,desc) \
-    "nm", &(loc), (rdx), (wd), (off), (dep), (desc), NULL, (siz), ((fl) | REG_STRUCT)
-#define ORDATADF(nm,loc,wd,desc,flds) "nm", &(loc), 8, (wd), 0, 1, (desc), (flds), 0
-#define DRDATADF(nm,loc,wd,desc,flds) "nm", &(loc), 10, (wd), 0, 1, (desc), (flds), 0
-#define HRDATADF(nm,loc,wd,desc,flds) "nm", &(loc), 16, (wd), 0, 1, (desc), (flds), 0
-#define FLDATADF(nm,loc,pos,desc,flds) "nm", &(loc), 2, 1, (pos), 1, (desc), (flds), 0
-#define GRDATADF(nm,loc,rdx,wd,pos,desc,flds) "nm", &(loc), (rdx), (wd), (pos), 1, (desc), (flds), 0
-#define BRDATADF(nm,loc,rdx,wd,dep,desc,flds) "nm", (loc), (rdx), (wd), 0, (dep), (desc), (flds), 0
+    "nm", &(loc), (rdx), (wd), (off), (dep), (desc), NULL, ((fl) | REG_UNIT)
+#define STRDATAD(nm,loc,rdx,wd,off,dep,fl,siz,desc) \
+    "nm", &(loc), (rdx), (wd), (off), (dep), (desc), NULL, ((fl) | REG_STRUCT), (siz)
+#define ORDATADF(nm,loc,wd,desc,flds) "nm", &(loc), 8, (wd), 0, 1, (desc), (flds)
+#define DRDATADF(nm,loc,wd,desc,flds) "nm", &(loc), 10, (wd), 0, 1, (desc), (flds)
+#define HRDATADF(nm,loc,wd,desc,flds) "nm", &(loc), 16, (wd), 0, 1, (desc), (flds)
+#define FLDATADF(nm,loc,pos,desc,flds) "nm", &(loc), 2, 1, (pos), 1, (desc), (flds)
+#define GRDATADF(nm,loc,rdx,wd,pos,desc,flds) "nm", &(loc), (rdx), (wd), (pos), 1, (desc), (flds)
+#define BRDATADF(nm,loc,rdx,wd,dep,desc,flds) "nm", (loc), (rdx), (wd), 0, (dep), (desc), (flds)
 #define URDATADF(nm,loc,rdx,wd,off,dep,fl,desc,flds) \
-    "nm", &(loc), (rdx), (wd), (off), (dep), (desc), (flds), 0, ((fl) | REG_UNIT)
-#define SRDATADF(nm,loc,rdx,wd,off,dep,fl,siz,desc,flds) \
-    "nm", &(loc), (rdx), (wd), (off), (dep), (desc), (flds), (siz), ((fl) | REG_STRUCT)
+    "nm", &(loc), (rdx), (wd), (off), (dep), (desc), (flds), ((fl) | REG_UNIT)
+#define STRDATADF(nm,loc,rdx,wd,off,dep,fl,siz,desc,flds) \
+    "nm", &(loc), (rdx), (wd), (off), (dep), (desc), (flds), ((fl) | REG_STRUCT), (siz)
 #define BIT(nm)              {"nm", 0xffffffff, 1}              /* Single Bit definition */
 #define BITNC                {"",   0xffffffff, 1}              /* Don't care Bit definition */
 #define BITF(nm,sz)          {"nm", 0xffffffff, sz}             /* Bit Field definition */