Skip to contentSkip to conversation

target/sh4: add missing CHECK_NOT_DELAY_SLOT

PATCH In review Zack Buhman 3 participants 3 messages Apr 7, 2024 – Apr 8, 2024

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 target/sh4: add missing CHECK_NOT_DELAY_SLOT

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.

---
 target/sh4/translate.c | 3 +++
 1 file changed, 3 insertions(+)
target/sh4/translate.c +3 -0
index 6643c14dde..ebb6c901bf 100644
@@ -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;
Signature · 1 line
2.41.0
Reviewed-by on v1 1/1
#1 lore raw
Quoted 6 lines · Zack Buhman

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.

Quoted 6 lines

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

---
  target/sh4/translate.c | 3 +++
  1 file changed, 3 insertions(+)

r~

Reviewed-by on v1 1/1
#2 lore raw
In reply to Zack Buhman
Quoted 45 lines · Zack Buhman

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.

---
 target/sh4/translate.c | 3 +++
 1 file changed, 3 insertions(+)
target/sh4/translate.c +3 -0
index 6643c14dde..ebb6c901bf 100644
@@ -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;
Signature · 1 line
2.41.0

That's what the documentation said.

Quoted 2 lines

If a PC-relative load instruction is executed in a delay slot, an illegal slot instruction exception will be generated.

Signature · 1 line
Yosinori Sato