diff options
| author | Philippe Mathieu-Daudé <philmd@redhat.com> | 2019-12-20 14:03:00 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2019-12-20 14:03:00 +0000 |
| commit | 0ee8b24a69e410ce5abdc30b7050dc9e26a647ca (patch) | |
| tree | 2eb478ac16bb9176589238ec81b25a9cc0045ec3 /target | |
| parent | b255cafb59578d16716186ed955717bc8f87bdb7 (diff) | |
| download | qemu-0ee8b24a69e410ce5abdc30b7050dc9e26a647ca.zip qemu-0ee8b24a69e410ce5abdc30b7050dc9e26a647ca.tar.gz qemu-0ee8b24a69e410ce5abdc30b7050dc9e26a647ca.tar.bz2 | |
target/arm: Display helpful message when hflags mismatch
Instead of crashing in a confuse way, give some hint to the user
about why we aborted. He might report the issue without having
to use a debugger.
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-id: 20191209134552.27733-1-philmd@redhat.com
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Tested-by: Niek Linnenbank <nieklinnenbank@gmail.com>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'target')
| -rw-r--r-- | target/arm/helper.c | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/target/arm/helper.c b/target/arm/helper.c index 1d9af2d..b6bec42 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -11512,6 +11512,20 @@ void HELPER(rebuild_hflags_a64)(CPUARMState *env, int el) env->hflags = rebuild_hflags_a64(env, el, fp_el, mmu_idx); } +static inline void assert_hflags_rebuild_correctly(CPUARMState *env) +{ +#ifdef CONFIG_DEBUG_TCG + uint32_t env_flags_current = env->hflags; + uint32_t env_flags_rebuilt = rebuild_hflags_internal(env); + + if (unlikely(env_flags_current != env_flags_rebuilt)) { + fprintf(stderr, "TCG hflags mismatch (current:0x%08x rebuilt:0x%08x)\n", + env_flags_current, env_flags_rebuilt); + abort(); + } +#endif +} + void cpu_get_tb_cpu_state(CPUARMState *env, target_ulong *pc, target_ulong *cs_base, uint32_t *pflags) { @@ -11519,9 +11533,7 @@ void cpu_get_tb_cpu_state(CPUARMState *env, target_ulong *pc, uint32_t pstate_for_ss; *cs_base = 0; -#ifdef CONFIG_DEBUG_TCG - assert(flags == rebuild_hflags_internal(env)); -#endif + assert_hflags_rebuild_correctly(env); if (FIELD_EX32(flags, TBFLAG_ANY, AARCH64_STATE)) { *pc = env->pc; |