Use target_big_endian() for CPU endian initialization, FPSIMD signal-frame ordering and CPU-versus-ABI byte-order checks.
Preserve the behavior of the existing fixed-endian targets. Signed-off-by: Philippe Mathieu-Daudé <[email protected]> --- target/arm/internals.h | 2 +- linux-user/aarch64/cpu_loop.c | 12 ++++++------ linux-user/aarch64/signal.c | 20 ++++++-------------- target/arm/gdbstub64.c | 4 ++-- target/arm/tcg/translate-sve.c | 2 +- 5 files changed, 16 insertions(+), 24 deletions(-) diff --git a/target/arm/internals.h b/target/arm/internals.h index 033d6d66da3a..1381ef9638a3 100644 --- a/target/arm/internals.h +++ b/target/arm/internals.h @@ -588,7 +588,7 @@ static inline bool arm_cpu_data_is_big_endian(CPUARMState *env) #ifdef CONFIG_USER_ONLY static inline bool arm_cpu_bswap_data(CPUARMState *env) { - return TARGET_BIG_ENDIAN ^ arm_cpu_data_is_big_endian(env); + return target_big_endian() ^ arm_cpu_data_is_big_endian(env); } #endif diff --git a/linux-user/aarch64/cpu_loop.c b/linux-user/aarch64/cpu_loop.c index e7f643d69d56..91ebf4e0778f 100644 --- a/linux-user/aarch64/cpu_loop.c +++ b/linux-user/aarch64/cpu_loop.c @@ -242,13 +242,13 @@ void init_main_thread(CPUState *cs, struct image_info *info) env->pc = info->entry & ~0x3ULL; env->xregs[31] = info->start_stack; -#if TARGET_BIG_ENDIAN - env->cp15.sctlr_el[1] |= SCTLR_E0E; - for (int i = 1; i < 4; ++i) { - env->cp15.sctlr_el[i] |= SCTLR_EE; + if (target_big_endian()) { + env->cp15.sctlr_el[1] |= SCTLR_E0E; + for (int i = 1; i < 4; ++i) { + env->cp15.sctlr_el[i] |= SCTLR_EE; + } + arm_rebuild_hflags(env); } - arm_rebuild_hflags(env); -#endif if (cpu_isar_feature(aa64_pauth, cpu)) { qemu_guest_getrandom_nofail(&env->keys, sizeof(env->keys)); diff --git a/linux-user/aarch64/signal.c b/linux-user/aarch64/signal.c index 899fce76436c..f24fcddfec3e 100644 --- a/linux-user/aarch64/signal.c +++ b/linux-user/aarch64/signal.c @@ -208,6 +208,7 @@ static void target_setup_fpsimd_record(struct target_fpsimd_context *fpsimd, CPUARMState *env) { int i; + int big_endian = target_big_endian(); __put_user(TARGET_FPSIMD_MAGIC, &fpsimd->head.magic); __put_user(sizeof(struct target_fpsimd_context), &fpsimd->head.size); @@ -216,13 +217,8 @@ static void target_setup_fpsimd_record(struct target_fpsimd_context *fpsimd, for (i = 0; i < 32; i++) { uint64_t *q = aa64_vfp_qreg(env, i); -#if TARGET_BIG_ENDIAN - __put_user(q[0], &fpsimd->vregs[i * 2 + 1]); - __put_user(q[1], &fpsimd->vregs[i * 2]); -#else - __put_user(q[0], &fpsimd->vregs[i * 2]); - __put_user(q[1], &fpsimd->vregs[i * 2 + 1]); -#endif + __put_user(q[0], &fpsimd->vregs[i * 2 + big_endian]); + __put_user(q[1], &fpsimd->vregs[i * 2 + !big_endian]); } } @@ -402,6 +398,7 @@ static void target_restore_fpsimd_record(CPUARMState *env, { uint32_t fpsr, fpcr; int i; + int big_endian = target_big_endian(); __get_user(fpsr, &fpsimd->fpsr); vfp_set_fpsr(env, fpsr); @@ -410,13 +407,8 @@ static void target_restore_fpsimd_record(CPUARMState *env, for (i = 0; i < 32; i++) { uint64_t *q = aa64_vfp_qreg(env, i); -#if TARGET_BIG_ENDIAN - __get_user(q[0], &fpsimd->vregs[i * 2 + 1]); - __get_user(q[1], &fpsimd->vregs[i * 2]); -#else - __get_user(q[0], &fpsimd->vregs[i * 2]); - __get_user(q[1], &fpsimd->vregs[i * 2 + 1]); -#endif + __get_user(q[0], &fpsimd->vregs[i * 2 + big_endian]); + __get_user(q[1], &fpsimd->vregs[i * 2 + !big_endian]); } } diff --git a/target/arm/gdbstub64.c b/target/arm/gdbstub64.c index 0c3e5b30bd6a..ee6ed8296e33 100644 --- a/target/arm/gdbstub64.c +++ b/target/arm/gdbstub64.c @@ -122,8 +122,8 @@ int aarch64_gdb_set_fpu_reg(CPUState *cs, uint8_t *buf, int reg) * On the wire these are target-endian 128 bit values. * In the CPU state these are host-order uint64_t values * with the least-significant one first. This means they're - * the other way around for target_big_endian() (which is - * only true for us for aarch64_be-linux-user). + * the other way around for target_big_endian(), which reflects + * the executable's byte order in Linux-user emulation. */ if (target_big_endian()) { q[1] = ldq_p(buf); diff --git a/target/arm/tcg/translate-sve.c b/target/arm/tcg/translate-sve.c index 10375577b1e0..6c4cf29238c6 100644 --- a/target/arm/tcg/translate-sve.c +++ b/target/arm/tcg/translate-sve.c @@ -5165,7 +5165,7 @@ void gen_sve_str(DisasContext *s, TCGv_ptr base, int vofs, /* Note that unpredicated load/store of vector/predicate registers * are defined as a stream of bytes, which equates to little-endian * operations on larger quantities. There is no nice way to force - * a little-endian store for aarch64_be-linux-user out of line. + * a little-endian store for big-endian Linux-user guests out of line. * * Attempt to keep code expansion to a minimum by limiting the * amount of unrolling done. -- 2.55.0
