From 2c1d2b9a886ac8bbb9c2aeeb233689e5998016df Mon Sep 17 00:00:00 2001
From: Mark Pizzolato <mark@infocomm.com>
Date: Wed, 5 Dec 2012 20:47:34 -0800
Subject: [PATCH] Fixed minor sim_debug_bits issues.

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

diff --git a/scp.c b/scp.c
index a406deaf..be1ab30e 100644
--- a/scp.c
+++ b/scp.c
@@ -5880,14 +5880,14 @@ if (sim_deb && (dptr->dctrl & dbits)) {
         if (bitdefs[i].name[0] == '\0')
             continue;
         if ((bitdefs[i].width == 1) && (bitdefs[i].valuenames == NULL)) {
-            int off = ((after >> bitdefs[i].offset) & 1) + (((before ^ after) >> i) & 1) * 2;
+            int off = ((after >> bitdefs[i].offset) & 1) + (((before ^ after) >> bitdefs[i].offset) & 1) * 2;
             fprintf(sim_deb, "%s%c ", bitdefs[i].name, debug_bstates[off]);
             }
         else {
             char *delta = "";
 
             mask = 0xFFFFFFFF >> (32-bitdefs[i].width);
-            value = ((after >> bitdefs[i].offset) & mask) + (((before ^ after) >> bitdefs[i].offset) & mask) * 2;
+            value = ((after >> bitdefs[i].offset) & mask);
             beforevalue = ((before >> bitdefs[i].offset) & mask);
             if (value < beforevalue)
                 delta = "_";
diff --git a/sim_defs.h b/sim_defs.h
index ccb4b78d..a83f77d5 100644
--- a/sim_defs.h
+++ b/sim_defs.h
@@ -510,8 +510,8 @@ struct sim_bitfield {
     char            *name;                              /* field name */
     uint32          offset;                             /* starting bit */
     uint32          width;                              /* width */
-    char            **valuenames;                       /* map of values to strings */
-    char            *format;                            /* value format string */
+    const char      **valuenames;                       /* map of values to strings */
+    const char      *format;                            /* value format string */
     };
 
 /* File Reference */