[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 10/13] hw/registerfields.h: Add 8bit and 16bit regist
From: |
Richard Henderson |
Subject: |
[Qemu-devel] [PULL 10/13] hw/registerfields.h: Add 8bit and 16bit register macros |
Date: |
Thu, 23 May 2019 10:00:56 -0400 |
From: Yoshinori Sato <address@hidden>
Some RX peripheral using 8bit and 16bit registers.
Added 8bit and 16bit APIs.
Signed-off-by: Yoshinori Sato <address@hidden>
Reviewed-by: Richard Henderson <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Richard Henderson <address@hidden>
---
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.17.1
- [Qemu-devel] [PULL 00/13] Add RX architecture, Richard Henderson, 2019/05/23
- [Qemu-devel] [PULL 03/13] target/rx: CPU definition, Richard Henderson, 2019/05/23
- [Qemu-devel] [PULL 11/13] target/rx: Convert to CPUClass::tlb_fill, Richard Henderson, 2019/05/23
- [Qemu-devel] [PULL 07/13] hw/char: RX62N serial communication interface (SCI), Richard Henderson, 2019/05/23
- [Qemu-devel] [PULL 10/13] hw/registerfields.h: Add 8bit and 16bit register macros,
Richard Henderson <=
- [Qemu-devel] [PULL 05/13] hw/intc: RX62N interrupt controller (ICUa), Richard Henderson, 2019/05/23
- [Qemu-devel] [PULL 06/13] hw/timer: RX62N internal timer modules, Richard Henderson, 2019/05/23
- [Qemu-devel] [PULL 13/13] MAINTAINERS: Add RX, Richard Henderson, 2019/05/23
- [Qemu-devel] [PULL 09/13] qemu/bitops.h: Add extract8 and extract16, Richard Henderson, 2019/05/23
- [Qemu-devel] [PULL 01/13] target/rx: TCG translation, Richard Henderson, 2019/05/23
- [Qemu-devel] [PULL 12/13] Add rx-softmmu, Richard Henderson, 2019/05/23
- [Qemu-devel] [PULL 02/13] target/rx: TCG helper, Richard Henderson, 2019/05/23
- [Qemu-devel] [PULL 08/13] hw/rx: RX Target hardware definition, Richard Henderson, 2019/05/23
- [Qemu-devel] [PULL 04/13] target/rx: RX disassembler, Richard Henderson, 2019/05/23
- Message not available