From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Cc: laurent@vivier.eu, "Philippe Mathieu-Daudé" <f4bug@amsat.org>
Subject: [PATCH v6 05/17] target/m68k: Remove retaddr in m68k_interrupt_all
Date: Wed, 1 Jun 2022 18:33:49 -0700 [thread overview]
Message-ID: <20220602013401.303699-6-richard.henderson@linaro.org> (raw)
In-Reply-To: <20220602013401.303699-1-richard.henderson@linaro.org>
The only value this variable holds is now env->pc.
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
target/m68k/op_helper.c | 15 ++++++---------
1 file changed, 6 insertions(+), 9 deletions(-)
diff --git a/target/m68k/op_helper.c b/target/m68k/op_helper.c
index 0f41c2dce3..777869790b 100644
--- a/target/m68k/op_helper.c
+++ b/target/m68k/op_helper.c
@@ -287,12 +287,9 @@ static void m68k_interrupt_all(CPUM68KState *env, int is_hw)
{
CPUState *cs = env_cpu(env);
uint32_t sp;
- uint32_t retaddr;
uint32_t vector;
uint16_t sr, oldsr;
- retaddr = env->pc;
-
if (!is_hw) {
switch (cs->exception_index) {
case EXCP_RTE:
@@ -385,7 +382,7 @@ static void m68k_interrupt_all(CPUM68KState *env, int is_hw)
sp -= 4;
cpu_stl_mmuidx_ra(env, sp, env->mmu.ar, MMU_KERNEL_IDX, 0);
- do_stack_frame(env, &sp, 7, oldsr, 0, retaddr);
+ do_stack_frame(env, &sp, 7, oldsr, 0, env->pc);
env->mmu.fault = false;
if (qemu_loglevel_mask(CPU_LOG_INT)) {
qemu_log(" "
@@ -395,7 +392,7 @@ static void m68k_interrupt_all(CPUM68KState *env, int is_hw)
break;
case EXCP_ADDRESS:
- do_stack_frame(env, &sp, 2, oldsr, 0, retaddr);
+ do_stack_frame(env, &sp, 2, oldsr, 0, env->pc);
break;
case EXCP_ILLEGAL:
@@ -404,12 +401,12 @@ static void m68k_interrupt_all(CPUM68KState *env, int is_hw)
case EXCP_TRAPCC:
case EXCP_TRACE:
/* FIXME: addr is not only env->pc */
- do_stack_frame(env, &sp, 2, oldsr, env->pc, retaddr);
+ do_stack_frame(env, &sp, 2, oldsr, env->pc, env->pc);
break;
case EXCP_SPURIOUS ... EXCP_INT_LEVEL_7:
if (is_hw && (oldsr & SR_M)) {
- do_stack_frame(env, &sp, 0, oldsr, 0, retaddr);
+ do_stack_frame(env, &sp, 0, oldsr, 0, env->pc);
oldsr = sr;
env->aregs[7] = sp;
cpu_m68k_set_sr(env, sr & ~SR_M);
@@ -417,13 +414,13 @@ static void m68k_interrupt_all(CPUM68KState *env, int is_hw)
if (!m68k_feature(env, M68K_FEATURE_UNALIGNED_DATA)) {
sp &= ~1;
}
- do_stack_frame(env, &sp, 1, oldsr, 0, retaddr);
+ do_stack_frame(env, &sp, 1, oldsr, 0, env->pc);
break;
}
/* fall through */
default:
- do_stack_frame(env, &sp, 0, oldsr, 0, retaddr);
+ do_stack_frame(env, &sp, 0, oldsr, 0, env->pc);
break;
}
--
2.34.1
next prev parent reply other threads:[~2022-06-02 1:45 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-02 1:33 [PATCH v6 00/17] target/m68k: Conditional traps + trap cleanup Richard Henderson
2022-06-02 1:33 ` [PATCH v6 01/17] target/m68k: Raise the TRAPn exception with the correct pc Richard Henderson
2022-06-02 1:33 ` [PATCH v6 02/17] target/m68k: Switch over exception type in m68k_interrupt_all Richard Henderson
2022-06-02 1:33 ` [PATCH v6 03/17] target/m68k: Fix coding style " Richard Henderson
2022-06-02 1:33 ` [PATCH v6 04/17] linux-user/m68k: Handle EXCP_TRAP1 through EXCP_TRAP15 Richard Henderson
2022-06-02 1:33 ` Richard Henderson [this message]
2022-06-02 1:33 ` [PATCH v6 06/17] target/m68k: Fix address argument for EXCP_CHK Richard Henderson
2022-06-02 1:33 ` [PATCH v6 07/17] target/m68k: Fix pc, c flag, and address argument for EXCP_DIV0 Richard Henderson
2022-06-02 1:33 ` [PATCH v6 08/17] target/m68k: Fix address argument for EXCP_TRACE Richard Henderson
2022-06-02 1:33 ` [PATCH v6 09/17] target/m68k: Fix stack frame for EXCP_ILLEGAL Richard Henderson
2022-06-02 1:33 ` [PATCH v6 10/17] target/m68k: Implement TRAPcc Richard Henderson
2022-06-02 1:33 ` [PATCH v6 11/17] target/m68k: Implement TPF in terms of TRAPcc Richard Henderson
2022-06-02 1:33 ` [PATCH v6 12/17] target/m68k: Implement TRAPV Richard Henderson
2022-06-02 1:33 ` [PATCH v6 13/17] target/m68k: Implement FTRAPcc Richard Henderson
2022-06-02 1:33 ` [PATCH v6 14/17] tests/tcg/m68k: Add trap.c Richard Henderson
2022-06-02 1:33 ` [PATCH v6 15/17] linux-user/strace: Use is_error in print_syscall_err Richard Henderson
2022-06-02 1:34 ` [PATCH v6 16/17] linux-user/strace: Adjust get_thread_area for m68k Richard Henderson
2022-06-02 1:34 ` [PATCH v6 17/17] target/m68k: Mark helper_raise_exception as noreturn Richard Henderson
2022-06-02 7:35 ` [PATCH v6 00/17] target/m68k: Conditional traps + trap cleanup Laurent Vivier
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=20220602013401.303699-6-richard.henderson@linaro.org \
--to=richard.henderson@linaro.org \
--cc=f4bug@amsat.org \
--cc=laurent@vivier.eu \
--cc=qemu-devel@nongnu.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).