To be able to add more load/store operations, introduce the LD_CONVERT() macro.
Signed-off-by: Philippe Mathieu-Daudé <phi...@redhat.com> --- include/qemu/bswap.h | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/include/qemu/bswap.h b/include/qemu/bswap.h index 4e2bd2e97ee..c2fd4f31d20 100644 --- a/include/qemu/bswap.h +++ b/include/qemu/bswap.h @@ -434,18 +434,37 @@ static inline void stq_be_p(void *ptr, uint64_t v) stq_he_p(ptr, be_bswap(v, 64)); } +#define LD_CONVERT_UNALIGNED(bits, rtype, vtype, size)\ +static inline rtype ld ## size ## _he_p(const void *ptr)\ +{\ + vtype r;\ + __builtin_memcpy(&r, ptr, sizeof(r));\ + return r;\ +} + #define ST_CONVERT_UNALIGNED(bits, vtype, size)\ static inline void st ## size ## _he_p(void *ptr, vtype v)\ {\ __builtin_memcpy(ptr, &v, sizeof(v));\ } +#define LD_CONVERT_END(endian, bits, rtype, vtype, size)\ +static inline rtype ld ## size ## _ ## endian ## _p(const void *ptr)\ +{\ + return (vtype)glue(endian, _bswap)(ld ## size ## _he_p(ptr), bits);\ +} + #define ST_CONVERT_END(endian, bits, vtype, size)\ static inline void st ## size ## _ ## endian ## _p(void *ptr, vtype v)\ {\ st ## size ## _he_p(ptr, glue(endian, _bswap)(v, bits));\ } +#define LD_CONVERT(bits, rtype, vtype, size)\ + LD_CONVERT_UNALIGNED(bits, rtype, vtype, size)\ + LD_CONVERT_END(le, bits, rtype, vtype, size)\ + LD_CONVERT_END(be, bits, rtype, vtype, size) + #define ST_CONVERT(bits, vtype, size)\ ST_CONVERT_UNALIGNED(bits, vtype, size)\ ST_CONVERT_END(le, bits, vtype, size)\ -- 2.26.3