Commit 87023dcc authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/alistair/tags/pull-register-api-20200527' into staging 



A single patch to avoid clashes with the regiser field macros.

# gpg: Signature made Wed 27 May 2020 19:24:07 BST
# gpg:                using RSA key F6C4AC46D4934868D3B8CE8F21E10D29DF977054
# gpg: Good signature from "Alistair Francis <alistair@alistair23.me>" [full]
# Primary key fingerprint: F6C4 AC46 D493 4868 D3B8  CE8F 21E1 0D29 DF97 7054

* remotes/alistair/tags/pull-register-api-20200527:
  hw/registerfields: Prefix local variables with underscore in macros

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents aacc7c8b 5932a46c

include/hw/registerfields.h

+20 −20
Original line number Diff line number Diff line
@@ -66,35 +66,35 @@ 
#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; })

    } _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; })

    } _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;                \

    } v = { .v = val };                                                   \

    uint32_t d;                                                           \

    d = deposit32((storage), R_ ## reg ## _ ## field ## _SHIFT,           \

                  R_ ## reg ## _ ## field ## _LENGTH, v.v);               \

    d; })

    } _v = { .v = val };                                                  \

    uint32_t _d;                                                          \

    _d = deposit32((storage), R_ ## reg ## _ ## field ## _SHIFT,          \

                  R_ ## reg ## _ ## field ## _LENGTH, _v.v);              \

    _d; })

#define FIELD_DP64(storage, reg, field, val) ({                           \

    struct {                                                              \

        unsigned int v:R_ ## reg ## _ ## field ## _LENGTH;                \

    } v = { .v = val };                                                   \

    uint64_t d;                                                           \

    d = deposit64((storage), R_ ## reg ## _ ## field ## _SHIFT,           \

                  R_ ## reg ## _ ## field ## _LENGTH, v.v);               \

    d; })

    } _v = { .v = val };                                                  \

    uint64_t _d;                                                          \

    _d = deposit64((storage), R_ ## reg ## _ ## field ## _SHIFT,          \

                  R_ ## reg ## _ ## field ## _LENGTH, _v.v);              \

    _d; })



/* Deposit a field to array of registers.  */

#define ARRAY_FIELD_DP32(regs, reg, field, val)                           \