openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Richard Henderson 2017-10-19 14:13:02 -07:00
parent 6cd61517fb
commit 7bcdbf51ee
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
target/arm/cpu.c
View File

@ -477,6 +477,7 @@ static void arm_disas_set_info(CPUState *cpu, disassemble_info *info)
{ {
ARMCPU *ac = ARM_CPU(cpu); ARMCPU *ac = ARM_CPU(cpu);
CPUARMState *env = &ac->env; CPUARMState *env = &ac->env;
bool sctlr_b;
if (is_a64(env)) { if (is_a64(env)) {
/* We might not be compiled with the A64 disassembler /* 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 { } else {
info->print_insn = print_insn_arm; 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 #ifdef TARGET_WORDS_BIGENDIAN
info->endian = BFD_ENDIAN_LITTLE; info->endian = BFD_ENDIAN_LITTLE;
#else #else
@ -499,9 +502,11 @@ static void arm_disas_set_info(CPUState *cpu, disassemble_info *info)
#endif #endif
} }
info->flags &= ~INSN_ARM_BE32; info->flags &= ~INSN_ARM_BE32;
if (arm_sctlr_b(env)) { #ifndef CONFIG_USER_ONLY
if (sctlr_b) {
info->flags |= INSN_ARM_BE32; info->flags |= INSN_ARM_BE32;
} }
#endif
} }
uint64_t arm_cpu_mp_affinity(int idx, uint8_t clustersz) uint64_t arm_cpu_mp_affinity(int idx, uint8_t clustersz)