From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Cc: laurent@vivier.eu
Subject: [PATCH v2 01/15] target/m68k: Raise the TRAPn exception with the correct pc
Date: Thu, 2 Dec 2021 12:48:46 -0800 [thread overview]
Message-ID: <20211202204900.50973-2-richard.henderson@linaro.org> (raw)
In-Reply-To: <20211202204900.50973-1-richard.henderson@linaro.org>
Rather than adjust the PC in all of the consumers, raise
the exception with the correct PC in the first place.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
linux-user/m68k/cpu_loop.c | 1 -
target/m68k/op_helper.c | 9 ---------
target/m68k/translate.c | 2 +-
3 files changed, 1 insertion(+), 11 deletions(-)
diff --git a/linux-user/m68k/cpu_loop.c b/linux-user/m68k/cpu_loop.c
index 790bd558c3..287f24cc60 100644
--- a/linux-user/m68k/cpu_loop.c
+++ b/linux-user/m68k/cpu_loop.c
@@ -70,7 +70,6 @@ void cpu_loop(CPUM68KState *env)
{
abi_long ret;
n = env->dregs[0];
- env->pc += 2;
ret = do_syscall(env,
n,
env->dregs[1],
diff --git a/target/m68k/op_helper.c b/target/m68k/op_helper.c
index cfbc987ba6..36662de149 100644
--- a/target/m68k/op_helper.c
+++ b/target/m68k/op_helper.c
@@ -216,11 +216,6 @@ static void cf_interrupt_all(CPUM68KState *env, int is_hw)
cpu_loop_exit(cs);
return;
}
- if (cs->exception_index >= EXCP_TRAP0
- && cs->exception_index <= EXCP_TRAP15) {
- /* Move the PC after the trap instruction. */
- retaddr += 2;
- }
}
vector = cs->exception_index << 2;
@@ -303,10 +298,6 @@ static void m68k_interrupt_all(CPUM68KState *env, int is_hw)
/* Return from an exception. */
m68k_rte(env);
return;
- case EXCP_TRAP0 ... EXCP_TRAP15:
- /* Move the PC after the trap instruction. */
- retaddr += 2;
- break;
}
}
diff --git a/target/m68k/translate.c b/target/m68k/translate.c
index af43c8eab8..af3febdd48 100644
--- a/target/m68k/translate.c
+++ b/target/m68k/translate.c
@@ -4860,7 +4860,7 @@ DISAS_INSN(wdebug)
DISAS_INSN(trap)
{
- gen_exception(s, s->base.pc_next, EXCP_TRAP0 + (insn & 0xf));
+ gen_exception(s, s->pc, EXCP_TRAP0 + (insn & 0xf));
}
static void gen_load_fcr(DisasContext *s, TCGv res, int reg)
--
2.25.1
next prev parent reply other threads:[~2021-12-02 20:52 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 ` Richard Henderson [this message]
2021-12-03 9:04 ` [PATCH v2 01/15] target/m68k: Raise the TRAPn exception with the correct pc 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
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=20211202204900.50973-2-richard.henderson@linaro.org \
--to=richard.henderson@linaro.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).