jcs.org / qemu
qemu with hax to log dma reads & writes jcs.org/2018/11/12/vfio
fork atom

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: 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>

authored by

Philippe Mathieu-Daudé and committed by
Alistair Francis 5932a46c 06539ebc

+20 -20
+20 -20
include/hw/registerfields.h
··· 66 66 #define FIELD_DP8(storage, reg, field, val) ({ \ 67 67 struct { \ 68 68 unsigned int v:R_ ## reg ## _ ## field ## _LENGTH; \ 69 - } v = { .v = val }; \ 70 - uint8_t d; \ 71 - d = deposit32((storage), R_ ## reg ## _ ## field ## _SHIFT, \ 72 - R_ ## reg ## _ ## field ## _LENGTH, v.v); \ 73 - d; }) 69 + } _v = { .v = val }; \ 70 + uint8_t _d; \ 71 + _d = deposit32((storage), R_ ## reg ## _ ## field ## _SHIFT, \ 72 + R_ ## reg ## _ ## field ## _LENGTH, _v.v); \ 73 + _d; }) 74 74 #define FIELD_DP16(storage, reg, field, val) ({ \ 75 75 struct { \ 76 76 unsigned int v:R_ ## reg ## _ ## field ## _LENGTH; \ 77 - } v = { .v = val }; \ 78 - uint16_t d; \ 79 - d = deposit32((storage), R_ ## reg ## _ ## field ## _SHIFT, \ 80 - R_ ## reg ## _ ## field ## _LENGTH, v.v); \ 81 - d; }) 77 + } _v = { .v = val }; \ 78 + uint16_t _d; \ 79 + _d = deposit32((storage), R_ ## reg ## _ ## field ## _SHIFT, \ 80 + R_ ## reg ## _ ## field ## _LENGTH, _v.v); \ 81 + _d; }) 82 82 #define FIELD_DP32(storage, reg, field, val) ({ \ 83 83 struct { \ 84 84 unsigned int v:R_ ## reg ## _ ## field ## _LENGTH; \ 85 - } v = { .v = val }; \ 86 - uint32_t d; \ 87 - d = deposit32((storage), R_ ## reg ## _ ## field ## _SHIFT, \ 88 - R_ ## reg ## _ ## field ## _LENGTH, v.v); \ 89 - d; }) 85 + } _v = { .v = val }; \ 86 + uint32_t _d; \ 87 + _d = deposit32((storage), R_ ## reg ## _ ## field ## _SHIFT, \ 88 + R_ ## reg ## _ ## field ## _LENGTH, _v.v); \ 89 + _d; }) 90 90 #define FIELD_DP64(storage, reg, field, val) ({ \ 91 91 struct { \ 92 92 unsigned int v:R_ ## reg ## _ ## field ## _LENGTH; \ 93 - } v = { .v = val }; \ 94 - uint64_t d; \ 95 - d = deposit64((storage), R_ ## reg ## _ ## field ## _SHIFT, \ 96 - R_ ## reg ## _ ## field ## _LENGTH, v.v); \ 97 - d; }) 93 + } _v = { .v = val }; \ 94 + uint64_t _d; \ 95 + _d = deposit64((storage), R_ ## reg ## _ ## field ## _SHIFT, \ 96 + R_ ## reg ## _ ## field ## _LENGTH, _v.v); \ 97 + _d; }) 98 98 99 99 /* Deposit a field to array of registers. */ 100 100 #define ARRAY_FIELD_DP32(regs, reg, field, val) \