* [PULL 0/1] register-api queue
@ 2020-05-27 18:26 Alistair Francis
2020-05-27 18:26 ` [PULL 1/1] hw/registerfields: Prefix local variables with underscore in macros Alistair Francis
2020-05-28 15:17 ` [PULL 0/1] register-api queue Peter Maydell
0 siblings, 2 replies; 3+ messages in thread
From: Alistair Francis @ 2020-05-27 18:26 UTC (permalink / raw)
To: qemu-devel, peter.maydell; +Cc: alistair23, Alistair Francis
The following changes since commit 06539ebc76b8625587aa78d646a9d8d5fddf84f3:
Merge remote-tracking branch 'remotes/philmd-gitlab/tags/mips-hw-next-20200526' into staging (2020-05-26 20:25:06 +0100)
are available in the Git repository at:
git@github.com:alistair23/qemu.git tags/pull-register-api-20200527
for you to fetch changes up to 5932a46c8a419db4a6402ac8ae42953b4d4fef1e:
hw/registerfields: Prefix local variables with underscore in macros (2020-05-27 11:23:07 -0700)
----------------------------------------------------------------
A single patch to avoid clashes with the regiser field macros.
----------------------------------------------------------------
Philippe Mathieu-Daudé (1):
hw/registerfields: Prefix local variables with underscore in macros
include/hw/registerfields.h | 40 ++++++++++++++++++++--------------------
1 file changed, 20 insertions(+), 20 deletions(-)
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PULL 1/1] hw/registerfields: Prefix local variables with underscore in macros
2020-05-27 18:26 [PULL 0/1] register-api queue Alistair Francis
@ 2020-05-27 18:26 ` Alistair Francis
2020-05-28 15:17 ` [PULL 0/1] register-api queue Peter Maydell
1 sibling, 0 replies; 3+ messages in thread
From: Alistair Francis @ 2020-05-27 18:26 UTC (permalink / raw)
To: qemu-devel, peter.maydell
Cc: alistair23, Alistair Francis, Philippe Mathieu-Daudé
From: Philippe Mathieu-Daudé <f4bug@amsat.org>
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é <f4bug@amsat.org>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Message-id: 20200510203457.10546-1-f4bug@amsat.org
Message-Id: <20200510203457.10546-1-f4bug@amsat.org>
Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
---
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) \
--
2.26.2
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PULL 0/1] register-api queue
2020-05-27 18:26 [PULL 0/1] register-api queue Alistair Francis
2020-05-27 18:26 ` [PULL 1/1] hw/registerfields: Prefix local variables with underscore in macros Alistair Francis
@ 2020-05-28 15:17 ` Peter Maydell
1 sibling, 0 replies; 3+ messages in thread
From: Peter Maydell @ 2020-05-28 15:17 UTC (permalink / raw)
To: Alistair Francis; +Cc: Alistair Francis, QEMU Developers
On Wed, 27 May 2020 at 19:35, Alistair Francis <alistair.francis@wdc.com> wrote:
>
> The following changes since commit 06539ebc76b8625587aa78d646a9d8d5fddf84f3:
>
> Merge remote-tracking branch 'remotes/philmd-gitlab/tags/mips-hw-next-20200526' into staging (2020-05-26 20:25:06 +0100)
>
> are available in the Git repository at:
>
> git@github.com:alistair23/qemu.git tags/pull-register-api-20200527
>
> for you to fetch changes up to 5932a46c8a419db4a6402ac8ae42953b4d4fef1e:
>
> hw/registerfields: Prefix local variables with underscore in macros (2020-05-27 11:23:07 -0700)
>
> ----------------------------------------------------------------
> A single patch to avoid clashes with the regiser field macros.
>
> ----------------------------------------------------------------
> Philippe Mathieu-Daudé (1):
> hw/registerfields: Prefix local variables with underscore in macros
Applied, thanks.
Please update the changelog at https://wiki.qemu.org/ChangeLog/5.1
for any user-visible changes.
-- PMM
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-05-28 15:22 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-05-27 18:26 [PULL 0/1] register-api queue Alistair Francis
2020-05-27 18:26 ` [PULL 1/1] hw/registerfields: Prefix local variables with underscore in macros Alistair Francis
2020-05-28 15:17 ` [PULL 0/1] register-api queue Peter Maydell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).