qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Yoshinori Sato <ysato@users.sourceforge.jp>
To: qemu-devel@nongnu.org
Cc: peter.maydell@linaro.org,
	"Yoshinori Sato" <ysato@users.sourceforge.jp>,
	richard.henderson@linaro.org,
	"Alistair Francis" <alistair.francis@wdc.com>,
	imammedo@redhat.com, "Philippe Mathieu-Daudé" <philmd@redhat.com>
Subject: [PATCH v25 03/22] hw/registerfields.h: Add 8bit and 16bit register macros
Date: Fri, 27 Sep 2019 15:22:43 +0900	[thread overview]
Message-ID: <20190927062302.110144-4-ysato@users.sourceforge.jp> (raw)
In-Reply-To: <20190927062302.110144-1-ysato@users.sourceforge.jp>

From: Philippe Mathieu-Daudé <philmd@redhat.com>

Some RX peripheral using 8bit and 16bit registers.
Added 8bit and 16bit APIs.

Signed-off-by: Yoshinori Sato <ysato@users.sourceforge.jp>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20190607091116.49044-11-ysato@users.sourceforge.jp>
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
 include/hw/registerfields.h | 32 +++++++++++++++++++++++++++++++-
 1 file changed, 31 insertions(+), 1 deletion(-)

diff --git a/include/hw/registerfields.h b/include/hw/registerfields.h
index 2659a58737..a0bb0654d6 100644
--- a/include/hw/registerfields.h
+++ b/include/hw/registerfields.h
@@ -22,6 +22,14 @@
     enum { A_ ## reg = (addr) };                                          \
     enum { R_ ## reg = (addr) / 4 };
 
+#define REG8(reg, addr)                                                  \
+    enum { A_ ## reg = (addr) };                                          \
+    enum { R_ ## reg = (addr) };
+
+#define REG16(reg, addr)                                                  \
+    enum { A_ ## reg = (addr) };                                          \
+    enum { R_ ## reg = (addr) / 2 };
+
 /* Define SHIFT, LENGTH and MASK constants for a field within a register */
 
 /* This macro will define R_FOO_BAR_MASK, R_FOO_BAR_SHIFT and R_FOO_BAR_LENGTH
@@ -34,6 +42,12 @@
                                         MAKE_64BIT_MASK(shift, length)};
 
 /* Extract a field from a register */
+#define FIELD_EX8(storage, reg, field)                                    \
+    extract8((storage), R_ ## reg ## _ ## field ## _SHIFT,                \
+              R_ ## reg ## _ ## field ## _LENGTH)
+#define FIELD_EX16(storage, reg, field)                                   \
+    extract16((storage), R_ ## reg ## _ ## field ## _SHIFT,               \
+              R_ ## reg ## _ ## field ## _LENGTH)
 #define FIELD_EX32(storage, reg, field)                                   \
     extract32((storage), R_ ## reg ## _ ## field ## _SHIFT,               \
               R_ ## reg ## _ ## field ## _LENGTH)
@@ -49,6 +63,22 @@
  * Assigning values larger then the target field will result in
  * compilation warnings.
  */
+#define FIELD_DP8(storage, reg, field, val) ({                            \
+    struct {                                                              \
+        unsigned int v:R_ ## reg ## _ ## field ## _LENGTH;                \
+    } v = { .v = val };                                                   \
+    uint8_t d;                                                            \
+    d = deposit32((storage), R_ ## reg ## _ ## field ## _SHIFT,           \
+                  R_ ## reg ## _ ## field ## _LENGTH, v.v);               \
+    d; })
+#define FIELD_DP16(storage, reg, field, val) ({                           \
+    struct {                                                              \
+        unsigned int v:R_ ## reg ## _ ## field ## _LENGTH;                \
+    } v = { .v = val };                                                   \
+    uint16_t d;                                                           \
+    d = deposit32((storage), R_ ## reg ## _ ## field ## _SHIFT,           \
+                  R_ ## reg ## _ ## field ## _LENGTH, v.v);               \
+    d; })
 #define FIELD_DP32(storage, reg, field, val) ({                           \
     struct {                                                              \
         unsigned int v:R_ ## reg ## _ ## field ## _LENGTH;                \
@@ -57,7 +87,7 @@
     d = deposit32((storage), R_ ## reg ## _ ## field ## _SHIFT,           \
                   R_ ## reg ## _ ## field ## _LENGTH, v.v);               \
     d; })
-#define FIELD_DP64(storage, reg, field, val) ({                           \
+#define FIELD_DP64(storage, reg, field, val) ({                         \
     struct {                                                              \
         unsigned int v:R_ ## reg ## _ ## field ## _LENGTH;                \
     } v = { .v = val };                                                   \
-- 
2.20.1



  parent reply	other threads:[~2019-09-27  6:52 UTC|newest]

Thread overview: 31+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-09-27  6:22 [PATCH v25 00/22] Add RX archtecture support Yoshinori Sato
2019-09-27  6:22 ` [PATCH v25 01/22] MAINTAINERS: Add RX Yoshinori Sato
2019-09-27  6:22 ` [PATCH v25 02/22] qemu/bitops.h: Add extract8 and extract16 Yoshinori Sato
2019-09-27  6:22 ` Yoshinori Sato [this message]
2019-09-27  6:22 ` [PATCH v25 04/22] target/rx: TCG translation Yoshinori Sato
2019-09-27  6:22 ` [PATCH v25 05/22] target/rx: TCG helper Yoshinori Sato
2019-09-27  6:22 ` [PATCH v25 06/22] target/rx: CPU definition Yoshinori Sato
2019-10-10 16:03   ` Philippe Mathieu-Daudé
2019-09-27  6:22 ` [PATCH v25 07/22] target/rx: RX disassembler Yoshinori Sato
2019-09-27  6:22 ` [PATCH v25 08/22] target/rx: Disassemble rx_index_addr into a string Yoshinori Sato
2019-09-27  6:22 ` [PATCH v25 09/22] target/rx: Replace operand with prt_ldmi in disassembler Yoshinori Sato
2019-09-27  6:22 ` [PATCH v25 10/22] target/rx: Use prt_ldmi for XCHG_mr disassembly Yoshinori Sato
2019-09-27  6:22 ` [PATCH v25 11/22] target/rx: Emit all disassembly in one prt() Yoshinori Sato
2019-09-27  6:22 ` [PATCH v25 12/22] target/rx: Collect all bytes during disassembly Yoshinori Sato
2019-09-27  6:22 ` [PATCH v25 13/22] target/rx: Dump bytes for each insn " Yoshinori Sato
2019-09-27  6:22 ` [PATCH v25 14/22] hw/intc: RX62N interrupt controller (ICUa) Yoshinori Sato
2019-09-27  6:22 ` [PATCH v25 15/22] hw/timer: RX62N internal timer modules Yoshinori Sato
2019-09-27  6:22 ` [PATCH v25 16/22] hw/char: RX62N serial communication interface (SCI) Yoshinori Sato
2019-09-27  6:22 ` [PATCH v25 17/22] hw/rx: RX Target hardware definition Yoshinori Sato
2019-10-10 16:05   ` Philippe Mathieu-Daudé
2019-09-27  6:22 ` [PATCH v25 18/22] hw/rx: Honor -accel qtest Yoshinori Sato
2019-09-27  6:22 ` [PATCH v25 19/22] hw/rx: Restrict the RX62N microcontroller to the RX62N CPU core Yoshinori Sato
2019-09-27  6:23 ` [PATCH v25 20/22] Add rx-softmmu Yoshinori Sato
2019-09-27  6:23 ` [PATCH v25 21/22] BootLinuxConsoleTest: Test the RX-Virt machine Yoshinori Sato
2019-10-10 16:06   ` Philippe Mathieu-Daudé
2019-09-27  6:23 ` [PATCH v25 22/22] qapi/machine.json: Add RX cpu Yoshinori Sato
2019-10-10 16:09   ` Philippe Mathieu-Daudé
2019-09-27 21:39 ` [PATCH v25 00/22] Add RX archtecture support no-reply
2019-09-28 18:04 ` no-reply
2019-09-28 18:47 ` no-reply
2019-10-10 16:12 ` Philippe Mathieu-Daudé

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=20190927062302.110144-4-ysato@users.sourceforge.jp \
    --to=ysato@users.sourceforge.jp \
    --cc=alistair.francis@wdc.com \
    --cc=imammedo@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=philmd@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=richard.henderson@linaro.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).