[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-trivial] [PATCH 3/6] hw/dma/puv3_intc: Convert from DPRINTF() macr
From: |
Laurent Vivier |
Subject: |
[Qemu-trivial] [PATCH 3/6] hw/dma/puv3_intc: Convert from DPRINTF() macro to trace event |
Date: |
Wed, 12 Dec 2018 18:30:04 +0100 |
Signed-off-by: Laurent Vivier <address@hidden>
---
hw/intc/puv3_intc.c | 13 ++++++-------
hw/intc/trace-events | 7 +++++++
2 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/hw/intc/puv3_intc.c b/hw/intc/puv3_intc.c
index ef8488aacc..6c1f36bba6 100644
--- a/hw/intc/puv3_intc.c
+++ b/hw/intc/puv3_intc.c
@@ -10,9 +10,8 @@
*/
#include "qemu/osdep.h"
#include "hw/sysbus.h"
-
-#undef DEBUG_PUV3
#include "hw/unicore32/puv3.h"
+#include "trace.h"
#define TYPE_PUV3_INTC "puv3_intc"
#define PUV3_INTC(obj) OBJECT_CHECK(PUV3INTCState, (obj), TYPE_PUV3_INTC)
@@ -42,7 +41,7 @@ static void puv3_intc_handler(void *opaque, int irq, int
level)
{
PUV3INTCState *s = opaque;
- DPRINTF("irq 0x%x, level 0x%x\n", irq, level);
+ trace_puv3_intc_handler(irq, level);
if (level) {
s->reg_ICPR |= (1 << irq);
} else {
@@ -65,9 +64,9 @@ static uint64_t puv3_intc_read(void *opaque, hwaddr offset,
ret = s->reg_ICPR; /* the same value with ICPR */
break;
default:
- DPRINTF("Bad offset %x\n", (int)offset);
+ trace_puv3_intc_read_bad(offset);
}
- DPRINTF("offset 0x%x, value 0x%x\n", offset, ret);
+ trace_puv3_intc_read(offset, ret);
return ret;
}
@@ -76,7 +75,7 @@ static void puv3_intc_write(void *opaque, hwaddr offset,
{
PUV3INTCState *s = opaque;
- DPRINTF("offset 0x%x, value 0x%x\n", offset, value);
+ trace_puv3_intc_write(offset, value);
switch (offset) {
case 0x00: /* INTC_ICLR */
case 0x14: /* INTC_ICCR */
@@ -85,7 +84,7 @@ static void puv3_intc_write(void *opaque, hwaddr offset,
s->reg_ICMR = value;
break;
default:
- DPRINTF("Bad offset 0x%x\n", (int)offset);
+ trace_puv3_intc_write_bad(offset);
return;
}
puv3_intc_update(s);
diff --git a/hw/intc/trace-events b/hw/intc/trace-events
index 7769869a13..e42d0cfb2d 100644
--- a/hw/intc/trace-events
+++ b/hw/intc/trace-events
@@ -200,3 +200,10 @@ nvic_sysreg_write(uint64_t addr, uint32_t value, unsigned
size) "NVIC sysreg wri
heathrow_write(uint64_t addr, unsigned int n, uint64_t value) "0x%"PRIx64" %u:
0x%"PRIx64
heathrow_read(uint64_t addr, unsigned int n, uint64_t value) "0x%"PRIx64" %u:
0x%"PRIx64
heathrow_set_irq(int num, int level) "set_irq: num=0x%02x level=%d"
+
+# hw/intc/puv3_intc.c
+puv3_intc_handler(int irq, int level) "irq 0x%x, level 0x%x"
+puv3_intc_read_bad(uint32_t offset) "Bad offset 0x%x"
+puv3_intc_read(uint32_t offset, uint32_t value) "offset 0x%x, value 0x%x"
+puv3_intc_write(uint32_t offset, uint64_t value) "offset 0x%x, value 0x%"
PRIx64
+puv3_intc_write_bad(uint32_t offset) "Bad offset 0x%x"
--
2.19.2
- [Qemu-trivial] [PATCH 0/6] unicore32/puv3: Convert from DPRINTF() macro to trace event, Laurent Vivier, 2018/12/12
- [Qemu-trivial] [PATCH 1/6] hw/dma/puv3_dma: Convert from DPRINTF() macro to trace event, Laurent Vivier, 2018/12/12
- [Qemu-trivial] [PATCH 3/6] hw/dma/puv3_intc: Convert from DPRINTF() macro to trace event,
Laurent Vivier <=
- [Qemu-trivial] [PATCH 5/6] hw/timer/puv3_ost: Convert from DPRINTF() macro to trace event, Laurent Vivier, 2018/12/12
- [Qemu-trivial] [PATCH 6/6] unicore32/puv3: remove definition of DPRINTF, Laurent Vivier, 2018/12/12
- [Qemu-trivial] [PATCH 2/6] hw/dma/puv3_gpio: Convert from DPRINTF() macro to trace event, Laurent Vivier, 2018/12/12
- [Qemu-trivial] [PATCH 4/6] hw/misc/puv3_pm: Convert from DPRINTF() macro to trace event, Laurent Vivier, 2018/12/12