[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH] hw/registerfields: Prefix local variables with underscore in
|
From: |
Alistair Francis |
|
Subject: |
Re: [PATCH] hw/registerfields: Prefix local variables with underscore in macros |
|
Date: |
Tue, 26 May 2020 15:49:36 -0700 |
On Tue, May 26, 2020 at 9:50 AM Philippe Mathieu-Daudé <address@hidden> wrote:
>
> ping?
I'll send a PR with this.
Alistair
>
> On 5/10/20 10:34 PM, Philippe Mathieu-Daudé wrote:
> > 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: Philippe Mathieu-Daudé <address@hidden>
> > ---
> > include/hw/registerfields.h | 40 ++++++++++++++++++-------------------
> > 1 file changed, 20 insertions(+), 20 deletions(-)
> >
> > diff --git a/include/hw/registerfields.h b/include/hw/registerfields.h
> > index 0407edb7ec..93fa4a84c2 100644
> > --- a/include/hw/registerfields.h
> > +++ b/include/hw/registerfields.h
> > @@ -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) \
> >
>