diff options
| author | Richard Henderson | 2017-10-19 23:13:02 +0200 |
|---|---|---|
| committer | Richard Henderson | 2017-10-25 11:55:09 +0200 |
| commit | 7bcdbf51eeb674e42dd3f171f1caed4c44ba8710 (patch) | |
| tree | 173c0f22d4aa380c589881a3be0a28be06a7e14c /target | |
| parent | target/arm: Move BE32 disassembler fixup (diff) | |
| download | qemu-7bcdbf51eeb674e42dd3f171f1caed4c44ba8710.tar.gz qemu-7bcdbf51eeb674e42dd3f171f1caed4c44ba8710.tar.xz qemu-7bcdbf51eeb674e42dd3f171f1caed4c44ba8710.zip | |
target/arm: Don't set INSN_ARM_BE32 for CONFIG_USER_ONLY
This matches translator behaviour in arm_lduw_code.
Fixes: https://bugs.launchpad.net/qemu/+bug/1724485
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Diffstat (limited to 'target')
| -rw-r--r-- | target/arm/cpu.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/target/arm/cpu.c b/target/arm/cpu.c index 82dad0b721..a92d86faa0 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -477,6 +477,7 @@ static void arm_disas_set_info(CPUState *cpu, disassemble_info *info) { ARMCPU *ac = ARM_CPU(cpu); CPUARMState *env = &ac->env; + bool sctlr_b; if (is_a64(env)) { /* We might not be compiled with the A64 disassembler @@ -491,7 +492,9 @@ static void arm_disas_set_info(CPUState *cpu, disassemble_info *info) } else { info->print_insn = print_insn_arm; } - if (bswap_code(arm_sctlr_b(env))) { + + sctlr_b = arm_sctlr_b(env); + if (bswap_code(sctlr_b)) { #ifdef TARGET_WORDS_BIGENDIAN info->endian = BFD_ENDIAN_LITTLE; #else @@ -499,9 +502,11 @@ static void arm_disas_set_info(CPUState *cpu, disassemble_info *info) #endif } info->flags &= ~INSN_ARM_BE32; - if (arm_sctlr_b(env)) { +#ifndef CONFIG_USER_ONLY + if (sctlr_b) { info->flags |= INSN_ARM_BE32; } +#endif } uint64_t arm_cpu_mp_affinity(int idx, uint8_t clustersz) |