OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

target/arm: Add compile time asserts to load/store_cpu_field macros

Browse Source 
Add some compile-time asserts to the load_cpu_field() and store_cpu_field()
macros that the struct field being accessed is the expected size. This
lets us catch cases where we incorrectly tried to do a 32-bit load
from a 64-bit struct field.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20230424153909.1419369-3-peter.maydell@linaro.org
This commit is contained in:
Peter Maydell 2023-04-24 16:39:09 +01:00
parent 7f3a3d3dc4
commit 2b67d0ff97
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
target/arm/translate-a32.h
View File

@ -59,7 +59,12 @@ static inline TCGv_i32 load_cpu_offset(int offset)
return tmp; return tmp;
} }
#define load_cpu_field(name) load_cpu_offset(offsetof(CPUARMState, name)) /* Load from a 32-bit field to a TCGv_i32 */
#define load_cpu_field(name) \
({ \
QEMU_BUILD_BUG_ON(sizeof_field(CPUARMState, name) != 4); \
load_cpu_offset(offsetof(CPUARMState, name)); \
})
/* Load from the low half of a 64-bit field to a TCGv_i32 */ /* Load from the low half of a 64-bit field to a TCGv_i32 */
#define load_cpu_field_low32(name) \ #define load_cpu_field_low32(name) \
@ -70,9 +75,13 @@ static inline TCGv_i32 load_cpu_offset(int offset)
void store_cpu_offset(TCGv_i32 var, int offset, int size); void store_cpu_offset(TCGv_i32 var, int offset, int size);
#define store_cpu_field(var, name) \ #define store_cpu_field(val, name) \
store_cpu_offset(var, offsetof(CPUARMState, name), \ ({ \
sizeof_field(CPUARMState, name)) QEMU_BUILD_BUG_ON(sizeof_field(CPUARMState, name) != 4 \
&& sizeof_field(CPUARMState, name) != 1); \
store_cpu_offset(val, offsetof(CPUARMState, name), \
sizeof_field(CPUARMState, name)); \
})
#define store_cpu_field_constant(val, name) \ #define store_cpu_field_constant(val, name) \
store_cpu_field(tcg_constant_i32(val), name) store_cpu_field(tcg_constant_i32(val), name)