From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Cc: laurent@vivier.eu, "Philippe Mathieu-Daudé" <f4bug@amsat.org>
Subject: [PATCH v5 11/17] target/m68k: Implement TPF in terms of TRAPcc
Date: Fri, 27 May 2022 09:48:01 -0700 [thread overview]
Message-ID: <20220527164807.135038-12-richard.henderson@linaro.org> (raw)
In-Reply-To: <20220527164807.135038-1-richard.henderson@linaro.org>
TPF stands for "trap false", and is a long-form nop for ColdFire.
Re-use the immediate consumption code from trapcc; the insn will
already expand to a nop because of the TCG_COND_NEVER test
within do_trapcc.
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
target/m68k/translate.c | 18 +-----------------
1 file changed, 1 insertion(+), 17 deletions(-)
diff --git a/target/m68k/translate.c b/target/m68k/translate.c
index c4fe8abc03..bb5ed1b7b1 100644
--- a/target/m68k/translate.c
+++ b/target/m68k/translate.c
@@ -3075,22 +3075,6 @@ DISAS_INSN(addsubq)
tcg_temp_free(dest);
}
-DISAS_INSN(tpf)
-{
- switch (insn & 7) {
- case 2: /* One extension word. */
- s->pc += 2;
- break;
- case 3: /* Two extension words. */
- s->pc += 4;
- break;
- case 4: /* No extension words. */
- break;
- default:
- disas_undef(env, s, insn);
- }
-}
-
DISAS_INSN(branch)
{
int32_t offset;
@@ -6099,7 +6083,7 @@ void register_m68k_insns (CPUM68KState *env)
INSN(scc, 50c0, f0c0, M68000); /* Scc.B <EA> */
INSN(dbcc, 50c8, f0f8, M68000);
INSN(trapcc, 50f8, f0f8, TRAPCC);
- INSN(tpf, 51f8, fff8, CF_ISA_A);
+ INSN(trapcc, 51f8, fff8, CF_ISA_A); /* TPF (trapf) */
/* Branch instructions. */
BASE(branch, 6000, f000);
--
2.34.1
next prev parent reply other threads:[~2022-05-27 16:58 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-27 16:47 [PATCH v5 00/17] target/m68k: Conditional traps + trap cleanup Richard Henderson
2022-05-27 16:47 ` [PATCH v5 01/17] target/m68k: Raise the TRAPn exception with the correct pc Richard Henderson
2022-05-27 16:47 ` [PATCH v5 02/17] target/m68k: Switch over exception type in m68k_interrupt_all Richard Henderson
2022-05-27 16:47 ` [PATCH v5 03/17] target/m68k: Fix coding style " Richard Henderson
2022-05-27 16:47 ` [PATCH v5 04/17] linux-user/m68k: Handle EXCP_TRAP1 through EXCP_TRAP15 Richard Henderson
2022-05-28 16:33 ` Laurent Vivier
2022-05-27 16:47 ` [PATCH v5 05/17] target/m68k: Remove retaddr in m68k_interrupt_all Richard Henderson
2022-05-27 16:47 ` [PATCH v5 06/17] target/m68k: Fix address argument for EXCP_CHK Richard Henderson
2022-05-27 16:47 ` [PATCH v5 07/17] target/m68k: Fix pc, c flag, and address argument for EXCP_DIV0 Richard Henderson
2022-05-27 16:47 ` [PATCH v5 08/17] target/m68k: Fix address argument for EXCP_TRACE Richard Henderson
2022-05-27 16:47 ` [PATCH v5 09/17] target/m68k: Fix stack frame for EXCP_ILLEGAL Richard Henderson
2022-05-27 16:48 ` [PATCH v5 10/17] target/m68k: Implement TRAPcc Richard Henderson
2022-05-31 8:01 ` Laurent Vivier
2022-05-31 14:59 ` Richard Henderson
2022-05-31 18:05 ` Laurent Vivier
2022-05-31 21:14 ` Richard Henderson
2022-05-27 16:48 ` Richard Henderson [this message]
2022-05-27 16:48 ` [PATCH v5 12/17] target/m68k: Implement TRAPV Richard Henderson
2022-05-27 16:48 ` [PATCH v5 13/17] target/m68k: Implement FTRAPcc Richard Henderson
2022-05-27 16:48 ` [PATCH v5 14/17] tests/tcg/m68k: Add trap.c Richard Henderson
2022-05-27 16:48 ` [PATCH v5 15/17] linux-user/strace: Use is_error in print_syscall_err Richard Henderson
2022-05-28 16:34 ` Laurent Vivier
2022-05-27 16:48 ` [PATCH v5 16/17] linux-user/strace: Adjust get_thread_area for m68k Richard Henderson
2022-05-27 16:48 ` [PATCH v5 17/17] target/m68k: Mark helper_raise_exception as noreturn Richard Henderson
2022-05-28 16:36 ` [PATCH v5 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=20220527164807.135038-12-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).