Patchwork [01/15] openpic: fix debug prints

login
register
mail settings
Submitter Scott Wood
Date Dec. 22, 2012, 2:15 a.m.
Message ID <1356142552-13453-2-git-send-email-scottwood@freescale.com>
Download mbox | patch
Permalink /patch/207921/
State New
Headers show

Comments

Scott Wood - Dec. 22, 2012, 2:15 a.m.
Fix various format errors when debug prints are enabled.  Also
cause error checking to happen even when debug prints are not
enabled, and consistently use 0x for hex output.

Signed-off-by: Scott Wood <scottwood@freescale.com>
---
 hw/openpic.c |   40 ++++++++++++++++++++++++----------------
 1 file changed, 24 insertions(+), 16 deletions(-)
Alexander Graf - Jan. 3, 2013, 5:31 p.m.
On 22.12.2012, at 03:15, Scott Wood wrote:

> Fix various format errors when debug prints are enabled.  Also
> cause error checking to happen even when debug prints are not
> enabled, and consistently use 0x for hex output.
> 
> Signed-off-by: Scott Wood <scottwood@freescale.com>
> ---
> hw/openpic.c |   40 ++++++++++++++++++++++++----------------
> 1 file changed, 24 insertions(+), 16 deletions(-)
> 
> diff --git a/hw/openpic.c b/hw/openpic.c
> index 93e8208..72a5bc9 100644
> --- a/hw/openpic.c
> +++ b/hw/openpic.c
> @@ -45,7 +45,11 @@
> #ifdef DEBUG_OPENPIC

static const int debug_openpic = 1;
#else
static const int debug_openpic = 0;

> #define DPRINTF(fmt, ...) do { printf(fmt , ## __VA_ARGS__); } while (0)
> #else
> -#define DPRINTF(fmt, ...) do { } while (0)
> +#define DPRINTF(fmt, ...) do { \
> +        if (0) { \

if (debug_openpic)

> +            printf(fmt , ## __VA_ARGS__); \
> +        } \
> +    } while (0)
> #endif

That way we don't need to duplicate the print define. Let me fix that up for you while applying the patch.


Alex
Scott Wood - Jan. 3, 2013, 7:41 p.m.
On 01/03/2013 11:31:49 AM, Alexander Graf wrote:
> 
> On 22.12.2012, at 03:15, Scott Wood wrote:
> 
> > Fix various format errors when debug prints are enabled.  Also
> > cause error checking to happen even when debug prints are not
> > enabled, and consistently use 0x for hex output.
> >
> > Signed-off-by: Scott Wood <scottwood@freescale.com>
> > ---
> > hw/openpic.c |   40 ++++++++++++++++++++++++----------------
> > 1 file changed, 24 insertions(+), 16 deletions(-)
> >
> > diff --git a/hw/openpic.c b/hw/openpic.c
> > index 93e8208..72a5bc9 100644
> > --- a/hw/openpic.c
> > +++ b/hw/openpic.c
> > @@ -45,7 +45,11 @@
> > #ifdef DEBUG_OPENPIC
> 
> static const int debug_openpic = 1;
> #else
> static const int debug_openpic = 0;
> 
> > #define DPRINTF(fmt, ...) do { printf(fmt , ## __VA_ARGS__); }  
> while (0)
> > #else
> > -#define DPRINTF(fmt, ...) do { } while (0)
> > +#define DPRINTF(fmt, ...) do { \
> > +        if (0) { \
> 
> if (debug_openpic)
> 
> > +            printf(fmt , ## __VA_ARGS__); \
> > +        } \
> > +    } while (0)
> > #endif
> 
> That way we don't need to duplicate the print define. Let me fix that  
> up for you while applying the patch.

OK, thanks.

-Scott

Patch

diff --git a/hw/openpic.c b/hw/openpic.c
index 93e8208..72a5bc9 100644
--- a/hw/openpic.c
+++ b/hw/openpic.c
@@ -45,7 +45,11 @@ 
 #ifdef DEBUG_OPENPIC
 #define DPRINTF(fmt, ...) do { printf(fmt , ## __VA_ARGS__); } while (0)
 #else
-#define DPRINTF(fmt, ...) do { } while (0)
+#define DPRINTF(fmt, ...) do { \
+        if (0) { \
+            printf(fmt , ## __VA_ARGS__); \
+        } \
+    } while (0)
 #endif
 
 #define MAX_CPU     15
@@ -421,7 +425,7 @@  static void openpic_set_irq(void *opaque, int n_IRQ, int level)
     IRQ_src_t *src;
 
     src = &opp->src[n_IRQ];
-    DPRINTF("openpic: set irq %d = %d ipvp=%08x\n",
+    DPRINTF("openpic: set irq %d = %d ipvp=0x%08x\n",
             n_IRQ, level, src->ipvp);
     if (src->ipvp & IPVP_SENSE_MASK) {
         /* level-sensitive irq */
@@ -511,7 +515,8 @@  static void openpic_gbl_write(void *opaque, hwaddr addr, uint64_t val,
     IRQ_dst_t *dst;
     int idx;
 
-    DPRINTF("%s: addr " TARGET_FMT_plx " <= %08x\n", __func__, addr, val);
+    DPRINTF("%s: addr %#" HWADDR_PRIx " <= 0x%08" PRIx64 "\n",
+            __func__, addr, val);
     if (addr & 0xF)
         return;
     switch (addr) {
@@ -573,7 +578,7 @@  static uint64_t openpic_gbl_read(void *opaque, hwaddr addr, unsigned len)
     OpenPICState *opp = opaque;
     uint32_t retval;
 
-    DPRINTF("%s: addr " TARGET_FMT_plx "\n", __func__, addr);
+    DPRINTF("%s: addr %#" HWADDR_PRIx "\n", __func__, addr);
     retval = 0xFFFFFFFF;
     if (addr & 0xF)
         return retval;
@@ -619,7 +624,7 @@  static uint64_t openpic_gbl_read(void *opaque, hwaddr addr, unsigned len)
     default:
         break;
     }
-    DPRINTF("%s: => %08x\n", __func__, retval);
+    DPRINTF("%s: => 0x%08x\n", __func__, retval);
 
     return retval;
 }
@@ -630,7 +635,8 @@  static void openpic_tmr_write(void *opaque, hwaddr addr, uint64_t val,
     OpenPICState *opp = opaque;
     int idx;
 
-    DPRINTF("%s: addr %08x <= %08x\n", __func__, addr, val);
+    DPRINTF("%s: addr %#" HWADDR_PRIx " <= 0x%08" PRIx64 "\n",
+            __func__, addr, val);
     if (addr & 0xF)
         return;
     idx = (addr >> 6) & 0x3;
@@ -667,7 +673,7 @@  static uint64_t openpic_tmr_read(void *opaque, hwaddr addr, unsigned len)
     uint32_t retval = -1;
     int idx;
 
-    DPRINTF("%s: addr %08x\n", __func__, addr);
+    DPRINTF("%s: addr %#" HWADDR_PRIx "\n", __func__, addr);
     if (addr & 0xF) {
         goto out;
     }
@@ -693,7 +699,7 @@  static uint64_t openpic_tmr_read(void *opaque, hwaddr addr, unsigned len)
     }
 
 out:
-    DPRINTF("%s: => %08x\n", __func__, retval);
+    DPRINTF("%s: => 0x%08x\n", __func__, retval);
 
     return retval;
 }
@@ -704,7 +710,8 @@  static void openpic_src_write(void *opaque, hwaddr addr, uint64_t val,
     OpenPICState *opp = opaque;
     int idx;
 
-    DPRINTF("%s: addr %08x <= %08x\n", __func__, addr, val);
+    DPRINTF("%s: addr %#" HWADDR_PRIx " <= 0x%08" PRIx64 "\n",
+            __func__, addr, val);
     if (addr & 0xF)
         return;
     addr = addr & 0xFFF0;
@@ -724,7 +731,7 @@  static uint64_t openpic_src_read(void *opaque, uint64_t addr, unsigned len)
     uint32_t retval;
     int idx;
 
-    DPRINTF("%s: addr %08x\n", __func__, addr);
+    DPRINTF("%s: addr %#" HWADDR_PRIx "\n", __func__, addr);
     retval = 0xFFFFFFFF;
     if (addr & 0xF)
         return retval;
@@ -737,7 +744,7 @@  static uint64_t openpic_src_read(void *opaque, uint64_t addr, unsigned len)
         /* EXVP / IFEVP / IEEVP */
         retval = read_IRQreg_ipvp(opp, idx);
     }
-    DPRINTF("%s: => %08x\n", __func__, retval);
+    DPRINTF("%s: => 0x%08x\n", __func__, retval);
 
     return retval;
 }
@@ -749,7 +756,8 @@  static void openpic_msi_write(void *opaque, hwaddr addr, uint64_t val,
     int idx = opp->irq_msi;
     int srs, ibs;
 
-    DPRINTF("%s: addr " TARGET_FMT_plx " <= %08x\n", __func__, addr, val);
+    DPRINTF("%s: addr %#" HWADDR_PRIx " <= 0x%08" PRIx64 "\n",
+            __func__, addr, val);
     if (addr & 0xF) {
         return;
     }
@@ -774,7 +782,7 @@  static uint64_t openpic_msi_read(void *opaque, hwaddr addr, unsigned size)
     uint64_t r = 0;
     int i, srs;
 
-    DPRINTF("%s: addr " TARGET_FMT_plx "\n", __func__, addr);
+    DPRINTF("%s: addr %#" HWADDR_PRIx "\n", __func__, addr);
     if (addr & 0xF) {
         return -1;
     }
@@ -812,7 +820,7 @@  static void openpic_cpu_write_internal(void *opaque, hwaddr addr,
     IRQ_dst_t *dst;
     int s_IRQ, n_IRQ;
 
-    DPRINTF("%s: cpu %d addr " TARGET_FMT_plx " <= %08x\n", __func__, idx,
+    DPRINTF("%s: cpu %d addr %#" HWADDR_PRIx " <= 0x%08x\n", __func__, idx,
             addr, val);
 
     if (idx < 0) {
@@ -882,7 +890,7 @@  static uint32_t openpic_cpu_read_internal(void *opaque, hwaddr addr,
     uint32_t retval;
     int n_IRQ;
 
-    DPRINTF("%s: cpu %d addr " TARGET_FMT_plx "\n", __func__, idx, addr);
+    DPRINTF("%s: cpu %d addr %#" HWADDR_PRIx "\n", __func__, idx, addr);
     retval = 0xFFFFFFFF;
 
     if (idx < 0) {
@@ -949,7 +957,7 @@  static uint32_t openpic_cpu_read_internal(void *opaque, hwaddr addr,
     default:
         break;
     }
-    DPRINTF("%s: => %08x\n", __func__, retval);
+    DPRINTF("%s: => 0x%08x\n", __func__, retval);
 
     return retval;
 }