[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-ppc] [PATCH 2/2] hw/timer/m48t59: Convert debug printf()s to trace
From: |
Philippe Mathieu-Daudé |
Subject: |
[Qemu-ppc] [PATCH 2/2] hw/timer/m48t59: Convert debug printf()s to trace events |
Date: |
Wed, 26 Jun 2019 14:20:42 +0200 |
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
---
hw/timer/m48t59-internal.h | 5 -----
hw/timer/m48t59.c | 11 +++++------
hw/timer/trace-events | 6 ++++++
3 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/hw/timer/m48t59-internal.h b/hw/timer/m48t59-internal.h
index 4d4f2a6fed..cd648241e9 100644
--- a/hw/timer/m48t59-internal.h
+++ b/hw/timer/m48t59-internal.h
@@ -26,11 +26,6 @@
#ifndef HW_M48T59_INTERNAL_H
#define HW_M48T59_INTERNAL_H
-#define M48T59_DEBUG 0
-
-#define NVRAM_PRINTF(fmt, ...) do { \
- if (M48T59_DEBUG) { printf(fmt , ## __VA_ARGS__); } } while (0)
-
/*
* The M48T02, M48T08 and M48T59 chips are very similar. The newer '59 has
* alarm and a watchdog timer and related control registers. In the
diff --git a/hw/timer/m48t59.c b/hw/timer/m48t59.c
index 030c8872a2..d50b4ddea2 100644
--- a/hw/timer/m48t59.c
+++ b/hw/timer/m48t59.c
@@ -33,6 +33,7 @@
#include "exec/address-spaces.h"
#include "qemu/bcd.h"
#include "qemu/module.h"
+#include "trace.h"
#include "m48t59-internal.h"
@@ -189,8 +190,7 @@ void m48t59_write(M48t59State *NVRAM, uint32_t addr,
uint32_t val)
struct tm tm;
int tmp;
- if (addr > 0x1FF8 && addr < 0x2000)
- NVRAM_PRINTF("%s: 0x%08x => 0x%08x\n", __func__, addr, val);
+ trace_m48txx_nvram_mem_write(addr, val);
/* check for NVRAM access */
if ((NVRAM->model == 2 && addr < 0x7f8) ||
@@ -447,8 +447,7 @@ uint32_t m48t59_read(M48t59State *NVRAM, uint32_t addr)
}
break;
}
- if (addr > 0x1FF9 && addr < 0x2000)
- NVRAM_PRINTF("%s: 0x%08x <= 0x%08x\n", __func__, addr, retval);
+ trace_m48txx_nvram_mem_read(addr, retval);
return retval;
}
@@ -459,7 +458,7 @@ static void NVRAM_writeb(void *opaque, hwaddr addr,
uint64_t val,
{
M48t59State *NVRAM = opaque;
- NVRAM_PRINTF("%s: 0x%"HWADDR_PRIx" => 0x%"PRIx64"\n", __func__, addr, val);
+ trace_m48txx_nvram_io_write(addr, val);
switch (addr) {
case 0:
NVRAM->addr &= ~0x00FF;
@@ -491,7 +490,7 @@ static uint64_t NVRAM_readb(void *opaque, hwaddr addr,
unsigned size)
retval = -1;
break;
}
- NVRAM_PRINTF("%s: 0x%"HWADDR_PRIx" <= 0x%08x\n", __func__, addr, retval);
+ trace_m48txx_nvram_io_read(addr, retval);
return retval;
}
diff --git a/hw/timer/trace-events b/hw/timer/trace-events
index dcaf3d6da6..66ccdd0974 100644
--- a/hw/timer/trace-events
+++ b/hw/timer/trace-events
@@ -83,3 +83,9 @@ pl031_read(uint32_t addr, uint32_t value) "addr 0x%08x value
0x%08x"
pl031_write(uint32_t addr, uint32_t value) "addr 0x%08x value 0x%08x"
pl031_alarm_raised(void) "alarm raised"
pl031_set_alarm(uint32_t ticks) "alarm set for %u ticks"
+
+# m48t59.c
+m48txx_nvram_io_read(uint64_t addr, uint64_t value) "io read addr:0x%04"
PRIx64 " value:0x%02" PRIx64
+m48txx_nvram_io_write(uint64_t addr, uint64_t value) "io write addr:0x%04"
PRIx64 " value:0x%02" PRIx64
+m48txx_nvram_mem_read(uint32_t addr, uint32_t value) "mem read addr:0x%04x
value:0x%02x"
+m48txx_nvram_mem_write(uint32_t addr, uint32_t value) "mem write addr:0x%04x
value:0x%02x"
--
2.20.1