From: KONRAD Frederic <frederic.konrad@adacore.com>
To: "Philippe Mathieu-Daudé" <f4bug@amsat.org>, qemu-devel@nongnu.org
Cc: Artyom Tarasenko <atar4qemu@gmail.com>,
Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>,
Jiri Gaisler <jiri@gaisler.se>,
Fabien Chouteau <chouteau@adacore.com>,
Richard Henderson <rth@twiddle.net>
Subject: Re: [PATCH-for-5.1 7/7] target/sparc/int32_helper: Extract and use excp_name_str()
Date: Wed, 1 Apr 2020 13:13:29 +0200 [thread overview]
Message-ID: <ae52a968-b47a-2e4d-0cda-7061efd946ed@adacore.com> (raw)
In-Reply-To: <20200331105048.27989-8-f4bug@amsat.org>
Le 3/31/20 à 12:50 PM, Philippe Mathieu-Daudé a écrit :
> Improve exception error report:
>
> Before:
>
> qemu: fatal: Trap 0x06 while interrupts disabled, Error state
>
> After:
>
> qemu: fatal: Trap 0x06 (Window Underflow) while interrupts disabled, Error state
>
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
> target/sparc/int32_helper.c | 18 ++++++++++++------
> 1 file changed, 12 insertions(+), 6 deletions(-)
>
> diff --git a/target/sparc/int32_helper.c b/target/sparc/int32_helper.c
> index c56dd3df18..9a71e1abd8 100644
> --- a/target/sparc/int32_helper.c
> +++ b/target/sparc/int32_helper.c
> @@ -57,6 +57,14 @@ static const char * const excp_names[0x80] = {
> [TT_NCP_INSN] = "Coprocessor Disabled",
> };
>
> +static const char *excp_name_str(int32_t exception_index)
> +{
> + if (exception_index < 0 || exception_index >= ARRAY_SIZE(excp_names)) {
> + return "Unknown";
> + }
> + return excp_names[exception_index];
> +}
> +
> void sparc_cpu_do_interrupt(CPUState *cs)
> {
> SPARCCPU *cpu = SPARC_CPU(cs);
> @@ -77,10 +85,7 @@ void sparc_cpu_do_interrupt(CPUState *cs)
> } else if (intno >= 0x80) {
> name = "Trap Instruction";
> } else {
> - name = excp_names[intno];
> - if (!name) {
> - name = "Unknown";
> - }
> + name = excp_name_str(intno);
> }
>
> qemu_log("%6d: %s (v=%02x)\n", count, name, intno);
> @@ -106,8 +111,9 @@ void sparc_cpu_do_interrupt(CPUState *cs)
> env->def.features & CPU_FEATURE_TA0_SHUTDOWN) {
> qemu_system_shutdown_request(SHUTDOWN_CAUSE_GUEST_SHUTDOWN);
> } else {
> - cpu_abort(cs, "Trap 0x%02x while interrupts disabled, Error state",
> - cs->exception_index);
> + cpu_abort(cs, "Trap 0x%02x (%s) while interrupts disabled, "
> + "Error state",
> + cs->exception_index, excp_name_str(cs->exception_index));
> }
> return;
> }
>
Reviewed-by: KONRAD Frederic <frederic.konrad@adacore.com>
Thanks,
Fred
next prev parent reply other threads:[~2020-04-01 11:14 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-31 10:50 [PATCH 0/7] hw/sparc/leon3: Few fixes and disable HelenOS test Philippe Mathieu-Daudé
2020-03-31 10:50 ` [PATCH-for-5.0 1/7] tests/acceptance/machine_sparc_leon3: Disable " Philippe Mathieu-Daudé
2020-03-31 16:18 ` Richard Henderson
2020-03-31 20:07 ` Philippe Mathieu-Daudé
2020-04-01 17:43 ` Willian Rampazzo
2020-04-01 20:21 ` Philippe Mathieu-Daudé
2020-04-01 20:30 ` Willian Rampazzo
2020-04-01 22:01 ` Philippe Mathieu-Daudé
2020-04-02 11:08 ` Philippe Mathieu-Daudé
2020-04-02 13:25 ` Willian Rampazzo
2020-04-02 15:18 ` Philippe Mathieu-Daudé
2020-04-02 21:39 ` Philippe Mathieu-Daudé
2020-03-31 10:50 ` [PATCH-for-5.0 2/7] hw/misc/grlib_ahb_apb_pnp: Avoid crash when writing to AHB PnP registers Philippe Mathieu-Daudé
2020-04-01 10:58 ` KONRAD Frederic
2020-03-31 10:50 ` [PATCH-for-5.0 3/7] hw/misc/grlib_ahb_apb_pnp: Fix AHB PnP 8-bit accesses Philippe Mathieu-Daudé
2020-04-01 10:58 ` KONRAD Frederic
2020-03-31 10:50 ` [PATCH-for-5.1 4/7] hw/misc/grlib_ahb_apb_pnp: Add trace events on read accesses Philippe Mathieu-Daudé
2020-04-01 10:59 ` KONRAD Frederic
2020-03-31 10:50 ` [PATCH-for-5.1 5/7] hw/timer/grlib_gptimer: Display frequency in decimal Philippe Mathieu-Daudé
2020-04-01 10:59 ` KONRAD Frederic
2020-03-31 10:50 ` [PATCH-for-5.1 6/7] target/sparc/int32_helper: Remove DEBUG_PCALL definition Philippe Mathieu-Daudé
2020-04-01 11:04 ` KONRAD Frederic
2020-03-31 10:50 ` [PATCH-for-5.1 7/7] target/sparc/int32_helper: Extract and use excp_name_str() Philippe Mathieu-Daudé
2020-04-01 11:13 ` KONRAD Frederic [this message]
2020-04-11 17:30 ` [PATCH 0/7] hw/sparc/leon3: Few fixes and disable HelenOS test Philippe Mathieu-Daudé
2020-04-13 10:12 ` KONRAD Frederic
2020-04-13 21:07 ` Philippe Mathieu-Daudé
2020-04-14 10:00 ` KONRAD Frederic
2020-05-11 7:03 ` Philippe Mathieu-Daudé
2020-05-23 17:26 ` Philippe Mathieu-Daudé
2020-05-25 11:02 ` Fred Konrad
2020-05-26 9:50 ` Philippe Mathieu-Daudé
2020-06-08 15:20 ` Philippe Mathieu-Daudé
2020-06-08 16:08 ` Mark Cave-Ayland
2020-06-08 16:14 ` Artyom Tarasenko
2020-06-09 5:14 ` 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=ae52a968-b47a-2e4d-0cda-7061efd946ed@adacore.com \
--to=frederic.konrad@adacore.com \
--cc=atar4qemu@gmail.com \
--cc=chouteau@adacore.com \
--cc=f4bug@amsat.org \
--cc=jiri@gaisler.se \
--cc=mark.cave-ayland@ilande.co.uk \
--cc=qemu-devel@nongnu.org \
--cc=rth@twiddle.net \
/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).