From: Laurent Vivier <laurent@vivier.eu>
To: Richard Henderson <richard.henderson@linaro.org>, qemu-devel@nongnu.org
Subject: Re: [PATCH v2 02/15] target/m68k: Switch over exception type in m68k_interrupt_all
Date: Fri, 3 Dec 2021 10:06:09 +0100 [thread overview]
Message-ID: <d668ae3b-5d9c-57b9-25bd-a8edf46ec192@vivier.eu> (raw)
In-Reply-To: <20211202204900.50973-3-richard.henderson@linaro.org>
Le 02/12/2021 à 21:48, Richard Henderson a écrit :
> Replace an if ladder with a switch for clarity.
>
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> ---
> target/m68k/op_helper.c | 45 +++++++++++++++++++++++++----------------
> 1 file changed, 28 insertions(+), 17 deletions(-)
>
> diff --git a/target/m68k/op_helper.c b/target/m68k/op_helper.c
> index 36662de149..71176eb3d8 100644
> --- a/target/m68k/op_helper.c
> +++ b/target/m68k/op_helper.c
> @@ -332,7 +332,8 @@ static void m68k_interrupt_all(CPUM68KState *env, int is_hw)
> sp &= ~1;
> }
>
> - if (cs->exception_index == EXCP_ACCESS) {
> + switch (cs->exception_index) {
> + case EXCP_ACCESS:
> if (env->mmu.fault) {
> cpu_abort(cs, "DOUBLE MMU FAULT\n");
> }
> @@ -390,26 +391,36 @@ static void m68k_interrupt_all(CPUM68KState *env, int is_hw)
> "ssw: %08x ea: %08x sfc: %d dfc: %d\n",
> env->mmu.ssw, env->mmu.ar, env->sfc, env->dfc);
> }
> - } else if (cs->exception_index == EXCP_ADDRESS) {
> + break;
> +
> + case EXCP_ADDRESS:
> do_stack_frame(env, &sp, 2, oldsr, 0, retaddr);
> - } else if (cs->exception_index == EXCP_ILLEGAL ||
> - cs->exception_index == EXCP_DIV0 ||
> - cs->exception_index == EXCP_CHK ||
> - cs->exception_index == EXCP_TRAPCC ||
> - cs->exception_index == EXCP_TRACE) {
> + break;
> +
> + case EXCP_ILLEGAL:
> + case EXCP_DIV0:
> + case EXCP_CHK:
> + case EXCP_TRAPCC:
> + case EXCP_TRACE:
> /* FIXME: addr is not only env->pc */
> do_stack_frame(env, &sp, 2, oldsr, env->pc, retaddr);
> - } else if (is_hw && oldsr & SR_M &&
> - cs->exception_index >= EXCP_SPURIOUS &&
> - cs->exception_index <= EXCP_INT_LEVEL_7) {
> - do_stack_frame(env, &sp, 0, oldsr, 0, retaddr);
> - oldsr = sr;
> - env->aregs[7] = sp;
> - cpu_m68k_set_sr(env, sr &= ~SR_M);
> - sp = env->aregs[7] & ~1;
> - do_stack_frame(env, &sp, 1, oldsr, 0, retaddr);
> - } else {
> + break;
> +
> + case EXCP_SPURIOUS ... EXCP_INT_LEVEL_7:
> + if (is_hw && oldsr & SR_M) {
> + do_stack_frame(env, &sp, 0, oldsr, 0, retaddr);
> + oldsr = sr;
> + env->aregs[7] = sp;
> + cpu_m68k_set_sr(env, sr &= ~SR_M);
> + sp = env->aregs[7] & ~1;
> + do_stack_frame(env, &sp, 1, oldsr, 0, retaddr);
> + break;
> + }
> + /* fall through */
> +
> + default:
> do_stack_frame(env, &sp, 0, oldsr, 0, retaddr);
> + break;
> }
>
> env->aregs[7] = sp;
>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
next prev parent reply other threads:[~2021-12-03 9:08 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-02 20:48 [PATCH v2 00/15] target/m68k: Conditional traps + trap cleanup Richard Henderson
2021-12-02 20:48 ` [PATCH v2 01/15] target/m68k: Raise the TRAPn exception with the correct pc Richard Henderson
2021-12-03 9:04 ` Laurent Vivier
2021-12-02 20:48 ` [PATCH v2 02/15] target/m68k: Switch over exception type in m68k_interrupt_all Richard Henderson
2021-12-03 9:02 ` Philippe Mathieu-Daudé
2021-12-03 9:06 ` Laurent Vivier [this message]
2021-12-02 20:48 ` [PATCH v2 03/15] linux-user/m68k: Use force_sig_fault Richard Henderson
2021-12-02 20:48 ` [PATCH v2 04/15] linux-user/m68k: Handle EXCP_TRAP1 through EXCP_TRAP15 Richard Henderson
2021-12-02 20:48 ` [PATCH v2 05/15] target/m68k: Remove retaddr in m68k_interrupt_all Richard Henderson
2021-12-03 9:03 ` Philippe Mathieu-Daudé
2021-12-03 9:08 ` Laurent Vivier
2021-12-02 20:48 ` [PATCH v2 06/15] target/m68k: Fix address argument for EXCP_CHK Richard Henderson
2021-12-03 14:27 ` Laurent Vivier
2021-12-03 14:29 ` Richard Henderson
2021-12-03 14:58 ` Laurent Vivier
2021-12-02 20:48 ` [PATCH v2 07/15] target/m68k: Fix pc, c flag, and address argument for EXCP_DIV0 Richard Henderson
2021-12-04 16:50 ` Laurent Vivier
2021-12-02 20:48 ` [PATCH v2 08/15] target/m68k: Fix address argument for EXCP_TRACE Richard Henderson
2021-12-03 14:21 ` Richard Henderson
2021-12-02 20:48 ` [PATCH v2 09/15] target/m68k: Implement TRAPcc Richard Henderson
2021-12-02 20:48 ` [PATCH v2 10/15] target/m68k: Implement TRAPV Richard Henderson
2021-12-02 20:48 ` [PATCH v2 11/15] target/m68k: Implement FTRAPcc Richard Henderson
2021-12-02 20:48 ` [PATCH v2 12/15] target/m68k: Fix stack frame for EXCP_ILLEGAL Richard Henderson
2021-12-02 20:48 ` [PATCH v2 13/15] tests/tcg/m68k: Add trap.c Richard Henderson
2021-12-02 20:48 ` [PATCH v2 14/15] linux-user/strace: Fix print_syscall_err Richard Henderson
2021-12-03 8:57 ` Philippe Mathieu-Daudé
2021-12-02 20:49 ` [PATCH v2 15/15] linux-user/strace: Adjust get_thread_area for m68k Richard Henderson
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=d668ae3b-5d9c-57b9-25bd-a8edf46ec192@vivier.eu \
--to=laurent@vivier.eu \
--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).