From 72ca9de1809b448f2406ce9a7874d47251e5033b Mon Sep 17 00:00:00 2001
From: Mark Pizzolato <mark@infocomm.com>
Date: Thu, 6 Dec 2012 08:15:14 -0800
Subject: [PATCH] Clang compiler cleanup for new sim_debug_bits

---
 scp.c      |  2 +-
 sim_defs.h | 24 ++++++++++++------------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/scp.c b/scp.c
index be1ab30e..5b73b9eb 100644
--- a/scp.c
+++ b/scp.c
@@ -5897,7 +5897,7 @@ if (sim_deb && (dptr->dctrl & dbits)) {
                 fprintf(sim_deb, "%s=%s%s ", bitdefs[i].name, delta, bitdefs[i].valuenames[value]);
             else
                 if (bitdefs[i].format) {
-                    fprintf(sim_deb, "%s=%s", bitdefs[i].name, delta, value);
+                    fprintf(sim_deb, "%s=%s", bitdefs[i].name, delta);
                     fprintf(sim_deb, bitdefs[i].format, value);
                     }
                 else
diff --git a/sim_defs.h b/sim_defs.h
index a83f77d5..fb187506 100644
--- a/sim_defs.h
+++ b/sim_defs.h
@@ -534,12 +534,12 @@ struct sim_fileref {
 #define BRDATA(nm,loc,rdx,wd,dep) #nm, (loc), (rdx), (wd), 0, (dep)
 #define URDATA(nm,loc,rdx,wd,off,dep,fl) \
     #nm, &(loc), (rdx), (wd), (off), (dep), ((fl) | REG_UNIT)
-#define BIT(nm)              {#nm, -1, 1}
-#define BITNC                {"",  -1, 1}
-#define BITF(nm,sz)          {#nm, -1, sz}
-#define BITNCF(sz)           {"",  -1, sz}
-#define BITFFMT(nm,sz,fmt)   {#nm, -1, sz, NULL, #fmt}
-#define BITFNAM(nm,sz,names) {#nm, -1, sz, names}
+#define BIT(nm)              {#nm, -1, 1}             /* Single Bit definition */
+#define BITNC                {"",  -1, 1}             /* Don't care Bit definition */
+#define BITF(nm,sz)          {#nm, -1, sz}            /* Bit Field definition */
+#define BITNCF(sz)           {"",  -1, sz}            /* Don't care Bit Field definition */
+#define BITFFMT(nm,sz,fmt)   {#nm, -1, sz, NULL, #fmt}/* Bit Field definition with Output format */
+#define BITFNAM(nm,sz,names) {#nm, -1, sz, names}     /* Bit Field definition with value->name map */
 #else
 #define ORDATA(nm,loc,wd) "nm", &(loc), 8, (wd), 0, 1
 #define DRDATA(nm,loc,wd) "nm", &(loc), 10, (wd), 0, 1
@@ -549,12 +549,12 @@ struct sim_fileref {
 #define BRDATA(nm,loc,rdx,wd,dep) "nm", (loc), (rdx), (wd), 0, (dep)
 #define URDATA(nm,loc,rdx,wd,off,dep,fl) \
     "nm", &(loc), (rdx), (wd), (off), (dep), ((fl) | REG_UNIT)
-#define BIT(nm)              {"nm", -1, 1}
-#define BITNC                {"",  -1, 1}
-#define BITF(nm,sz)          {"nm", -1, sz}
-#define BITNCF(sz)           {"",  -1, sz}
-#define BITFFMT(nm,sz,fmt)   {"nm", -1, sz, NULL, "fmt"}
-#define BITFNAM(nm,sz,names) {"nm", -1, sz, names}
+#define BIT(nm)              {"nm", -1, 1}              /* Single Bit definition */
+#define BITNC                {"",  -1, 1}               /* Don't care Bit definition */
+#define BITF(nm,sz)          {"nm", -1, sz}             /* Bit Field definition */
+#define BITNCF(sz)           {"",  -1, sz}              /* Don't care Bit Field definition */
+#define BITFFMT(nm,sz,fmt)   {"nm", -1, sz, NULL, "fmt"}/* Bit Field definition with Output format */
+#define BITFNAM(nm,sz,names) {"nm", -1, sz, names}      /* Bit Field definition with value->name map */
 #endif
 #define ENDBITS {NULL}  /* end of bitfield list */