From: "Alex Bennée" <alex.bennee@linaro.org>
To: "Philippe Mathieu-Daudé" <philmd@redhat.com>
Cc: Peter Maydell <peter.maydell@linaro.org>,
qemu-arm@nongnu.org,
Richard Henderson <richard.henderson@linaro.org>,
qemu-devel@nongnu.org
Subject: Re: [PATCH] target/arm: Display helpful message when hflags mismatch
Date: Mon, 09 Dec 2019 16:00:36 +0000 [thread overview]
Message-ID: <87d0cx32vv.fsf@linaro.org> (raw)
In-Reply-To: <20191209134552.27733-1-philmd@redhat.com>
Philippe Mathieu-Daudé <philmd@redhat.com> writes:
> 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>
> ---
> target/arm/helper.c | 18 +++++++++++++++---
> 1 file changed, 15 insertions(+), 3 deletions(-)
>
> diff --git a/target/arm/helper.c b/target/arm/helper.c
> index 0bf8f53d4b..6bfb62672b 100644
> --- a/target/arm/helper.c
> +++ b/target/arm/helper.c
> @@ -11348,6 +11348,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)
> {
> @@ -11355,9 +11369,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);
I'm trying to recall why we don't just use:
g_assert_cmphex(flags, =, rebuild_hflags_internal(env))
I think it came up in one of the reviews.
>
> if (FIELD_EX32(flags, TBFLAG_ANY, AARCH64_STATE)) {
> *pc = env->pc;
--
Alex Bennée
next prev parent reply other threads:[~2019-12-09 16:04 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-09 13:45 [PATCH] target/arm: Display helpful message when hflags mismatch Philippe Mathieu-Daudé
2019-12-09 16:00 ` Alex Bennée [this message]
2019-12-12 0:36 ` Richard Henderson
2019-12-15 4:56 ` Philippe Mathieu-Daudé
2019-12-09 19:05 ` no-reply
2019-12-09 19:10 ` no-reply
2019-12-17 16:02 ` Richard Henderson
2019-12-17 16:08 ` Peter Maydell
2019-12-17 16:11 ` Philippe Mathieu-Daudé
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87d0cx32vv.fsf@linaro.org \
--to=alex.bennee@linaro.org \
--cc=peter.maydell@linaro.org \
--cc=philmd@redhat.com \
--cc=qemu-arm@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).