Commit 5932a46c authored by Philippe Mathieu-Daudé's avatar Philippe Mathieu-Daudé Committed by Alistair Francis
Browse files

hw/registerfields: Prefix local variables with underscore in macros 



One can name a local variable holding a value as 'v', but it
currently clashes with the registerfields macros. To save others
to debug the same mistake, prefix the macro's local variables
with an underscore.

Signed-off-by: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: default avatarAlistair Francis <alistair.francis@wdc.com>
Message-id: 20200510203457.10546-1-f4bug@amsat.org
Message-Id: <20200510203457.10546-1-f4bug@amsat.org>
Signed-off-by: default avatarAlistair Francis <alistair.francis@wdc.com>
parent 06539ebc

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)                           \