From: Laurent Vivier <laurent@vivier.eu>
To: qemu-devel@nongnu.org
Cc: "Mark Cave-Ayland" <mark.cave-ayland@ilande.co.uk>,
"Laurent Vivier" <laurent@vivier.eu>,
"Philippe Mathieu-Daudé" <f4bug@amsat.org>
Subject: [PULL 06/13] macfb: add trace events for reading and writing the control registers
Date: Fri, 8 Oct 2021 13:45:11 +0200 [thread overview]
Message-ID: <20211008114518.757615-7-laurent@vivier.eu> (raw)
In-Reply-To: <20211008114518.757615-1-laurent@vivier.eu>
From: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Message-Id: <20211007221253.29024-7-mark.cave-ayland@ilande.co.uk>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
hw/display/macfb.c | 8 +++++++-
hw/display/trace-events | 4 ++++
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/hw/display/macfb.c b/hw/display/macfb.c
index f88f5a652394..1128a51c9836 100644
--- a/hw/display/macfb.c
+++ b/hw/display/macfb.c
@@ -20,6 +20,7 @@
#include "qapi/error.h"
#include "hw/qdev-properties.h"
#include "migration/vmstate.h"
+#include "trace.h"
#define VIDEO_BASE 0x00001000
#define DAFB_BASE 0x00800000
@@ -289,7 +290,10 @@ static uint64_t macfb_ctrl_read(void *opaque,
hwaddr addr,
unsigned int size)
{
- return 0;
+ uint64_t val = 0;
+
+ trace_macfb_ctrl_read(addr, val, size);
+ return val;
}
static void macfb_ctrl_write(void *opaque,
@@ -311,6 +315,8 @@ static void macfb_ctrl_write(void *opaque,
}
break;
}
+
+ trace_macfb_ctrl_write(addr, val, size);
}
static const MemoryRegionOps macfb_ctrl_ops = {
diff --git a/hw/display/trace-events b/hw/display/trace-events
index f03f6655bcb7..f227de1bb96b 100644
--- a/hw/display/trace-events
+++ b/hw/display/trace-events
@@ -167,3 +167,7 @@ sm501_disp_ctrl_read(uint32_t addr, uint32_t val) "addr=0x%x, val=0x%x"
sm501_disp_ctrl_write(uint32_t addr, uint32_t val) "addr=0x%x, val=0x%x"
sm501_2d_engine_read(uint32_t addr, uint32_t val) "addr=0x%x, val=0x%x"
sm501_2d_engine_write(uint32_t addr, uint32_t val) "addr=0x%x, val=0x%x"
+
+# macfb.c
+macfb_ctrl_read(uint64_t addr, uint64_t value, unsigned int size) "addr 0x%"PRIx64 " value 0x%"PRIx64 " size %u"
+macfb_ctrl_write(uint64_t addr, uint64_t value, unsigned int size) "addr 0x%"PRIx64 " value 0x%"PRIx64 " size %u"
--
2.31.1
next prev parent reply other threads:[~2021-10-08 11:54 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-08 11:45 [PULL 00/13] M68k next patches Laurent Vivier
2021-10-08 11:45 ` [PULL 01/13] macfb: handle errors that occur during realize Laurent Vivier
2021-10-08 11:45 ` [PULL 02/13] macfb: update macfb.c to use the Error API best practices Laurent Vivier
2021-10-08 11:45 ` [PULL 03/13] macfb: fix invalid object reference in macfb_common_realize() Laurent Vivier
2021-10-08 11:45 ` [PULL 04/13] macfb: fix overflow of color_palette array Laurent Vivier
2021-10-08 11:45 ` [PULL 05/13] macfb: use memory_region_init_ram() in macfb_common_realize() for the framebuffer Laurent Vivier
2021-10-08 11:45 ` Laurent Vivier [this message]
2021-10-08 11:45 ` [PULL 07/13] macfb: implement mode sense to allow display type to be detected Laurent Vivier
2021-10-08 11:45 ` [PULL 08/13] macfb: add qdev property to specify display type Laurent Vivier
2021-10-08 11:45 ` [PULL 09/13] macfb: add common monitor modes supported by the MacOS toolbox ROM Laurent Vivier
2021-11-05 15:56 ` Peter Maydell
2021-11-05 16:43 ` Laurent Vivier
2021-10-08 11:45 ` [PULL 10/13] macfb: fix up 1-bit pixel encoding Laurent Vivier
2021-10-08 11:45 ` [PULL 11/13] macfb: fix 24-bit RGB " Laurent Vivier
2021-10-08 11:45 ` [PULL 12/13] macfb: add vertical blank interrupt Laurent Vivier
2021-10-08 11:45 ` [PULL 13/13] q800: wire macfb IRQ to separate video interrupt on VIA2 Laurent Vivier
2021-10-08 13:29 ` [PULL 00/13] M68k next patches Richard Henderson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211008114518.757615-7-laurent@vivier.eu \
--to=laurent@vivier.eu \
--cc=f4bug@amsat.org \
--cc=mark.cave-ayland@ilande.co.uk \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).