Commit 97175c3f authored by Yoshinori Sato's avatar Yoshinori Sato Committed by Philippe Mathieu-Daudé
Browse files

hw/registerfields.h: Add 8bit and 16bit register macros 



Some RX peripheral use 8bit and 16bit registers.
Add the 8bit and 16bit APIs.

Reviewed-by: default avatarRichard Henderson <richard.henderson@linaro.org>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
Tested-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: default avatarAlistair Francis <alistair.francis@wdc.com>
Signed-off-by: default avatarYoshinori Sato <ysato@users.sourceforge.jp>
Signed-off-by: default avatarRichard Henderson <richard.henderson@linaro.org>
Message-Id: <20200224141923.82118-4-ysato@users.sourceforge.jp>
Acked-by: default avatarRichard Henderson <richard.henderson@linaro.org>
Signed-off-by: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
parent 4dd6517e

include/hw/registerfields.h

+30 −0
Original line number Diff line number Diff line
@@ -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;                \