qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Cc: Zack Buhman <zack@buhman.org>,
	Yoshinori Sato <ysato@users.sourceforge.jp>
Subject: [PULL v2 09/20] target/sh4: add missing CHECK_NOT_DELAY_SLOT
Date: Tue,  9 Apr 2024 09:35:52 -1000	[thread overview]
Message-ID: <20240409193603.1703216-10-richard.henderson@linaro.org> (raw)
In-Reply-To: <20240409193603.1703216-1-richard.henderson@linaro.org>

From: Zack Buhman <zack@buhman.org>

CHECK_NOT_DELAY_SLOT is correctly applied to the branch-related
instructions, but not to the PC-relative mov* instructions.

I verified the existence of an illegal slot exception on a SH7091 when
any of these instructions are attempted inside a delay slot.

This also matches the behavior described in the SH-4 ISA manual.

Signed-off-by: Zack Buhman <zack@buhman.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20240407150705.5965-1-zack@buhman.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Reviewd-by: Yoshinori Sato <ysato@users.sourceforge.jp>
---
 target/sh4/translate.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/target/sh4/translate.c b/target/sh4/translate.c
index 6643c14dde..ebb6c901bf 100644
--- a/target/sh4/translate.c
+++ b/target/sh4/translate.c
@@ -523,6 +523,7 @@ static void _decode_opc(DisasContext * ctx)
         tcg_gen_movi_i32(REG(B11_8), B7_0s);
         return;
     case 0x9000: /* mov.w @(disp,PC),Rn */
+        CHECK_NOT_DELAY_SLOT
         {
             TCGv addr = tcg_constant_i32(ctx->base.pc_next + 4 + B7_0 * 2);
             tcg_gen_qemu_ld_i32(REG(B11_8), addr, ctx->memidx,
@@ -530,6 +531,7 @@ static void _decode_opc(DisasContext * ctx)
         }
         return;
     case 0xd000: /* mov.l @(disp,PC),Rn */
+        CHECK_NOT_DELAY_SLOT
         {
             TCGv addr = tcg_constant_i32((ctx->base.pc_next + 4 + B7_0 * 4) & ~3);
             tcg_gen_qemu_ld_i32(REG(B11_8), addr, ctx->memidx,
@@ -1236,6 +1238,7 @@ static void _decode_opc(DisasContext * ctx)
         }
         return;
     case 0xc700: /* mova @(disp,PC),R0 */
+        CHECK_NOT_DELAY_SLOT
         tcg_gen_movi_i32(REG(0), ((ctx->base.pc_next & 0xfffffffc) +
                                   4 + B7_0 * 4) & ~3);
         return;
-- 
2.34.1



  parent reply	other threads:[~2024-04-09 19:40 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-04-09 19:35 [PULL v2 00/20] misc patch queue Richard Henderson
2024-04-09 19:35 ` [PULL v2 01/20] tcg/optimize: Do not attempt to constant fold neg_vec Richard Henderson
2024-04-09 19:35 ` [PULL v2 02/20] linux-user: Fix waitid return of siginfo_t and rusage Richard Henderson
2024-04-09 19:35 ` [PULL v2 03/20] linux-user: replace calloc() with g_new0() Richard Henderson
2024-04-09 19:35 ` [PULL v2 04/20] target/hppa: Fix IIAOQ, IIASQ for pa2.0 Richard Henderson
2024-04-09 19:35 ` [PULL v2 05/20] target/sh4: mac.w: memory accesses are 16-bit words Richard Henderson
2024-04-09 19:35 ` [PULL v2 06/20] target/sh4: Merge mach and macl into a union Richard Henderson
2024-04-09 19:35 ` [PULL v2 07/20] target/sh4: Fix mac.l with saturation enabled Richard Henderson
2024-04-09 19:35 ` [PULL v2 08/20] target/sh4: Fix mac.w " Richard Henderson
2024-04-09 19:35 ` Richard Henderson [this message]
2024-04-09 19:35 ` [PULL v2 10/20] target/m68k: Map FPU exceptions to FPSR register Richard Henderson
2024-04-09 19:35 ` [PULL v2 11/20] tcg: Add TCGContext.emit_before_op Richard Henderson
2024-04-09 19:35 ` [PULL v2 12/20] accel/tcg: Add insn_start to DisasContextBase Richard Henderson
2024-04-09 19:35 ` [PULL v2 13/20] target/arm: Use insn_start from DisasContextBase Richard Henderson
2024-04-09 19:35 ` [PULL v2 14/20] target/hppa: " Richard Henderson
2024-04-09 19:35 ` [PULL v2 15/20] target/i386: Preserve DisasContextBase.insn_start across rewind Richard Henderson
2024-04-09 19:35 ` [PULL v2 16/20] target/microblaze: Use insn_start from DisasContextBase Richard Henderson
2024-04-09 19:36 ` [PULL v2 17/20] target/riscv: " Richard Henderson
2024-04-09 19:36 ` [PULL v2 18/20] target/s390x: " Richard Henderson
2024-04-09 19:36 ` [PULL v2 19/20] accel/tcg: Improve can_do_io management Richard Henderson
2024-04-09 19:36 ` [PULL v2 20/20] linux-user: Preserve unswapped siginfo_t for strace Richard Henderson
2024-04-10 13:42 ` [PULL v2 00/20] misc patch queue Peter Maydell
2024-04-10 16:10 ` Michael Tokarev
2024-04-10 16:38   ` Richard Henderson
2024-04-10 17:44     ` Michael Tokarev

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=20240409193603.1703216-10-richard.henderson@linaro.org \
    --to=richard.henderson@linaro.org \
    --cc=qemu-devel@nongnu.org \
    --cc=ysato@users.sourceforge.jp \
    --cc=zack@buhman.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).