From: Richard Henderson <richard.henderson@linaro.org>
Date: Tue, 29 Jun 2021 18:01:05 +0000 (-0700)
Subject: target/arm: Use DISAS_TOO_MANY for ISB and SB
X-Git-Tag: v6.1.0-rc0~27^2~31
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=73fce314dbbf2d1c3cd411a34535ebe5d20e1e45;p=thirdparty%2Fqemu.git

target/arm: Use DISAS_TOO_MANY for ISB and SB

Using gen_goto_tb directly misses the single-step check.
Let the branch or debug exception be emitted by arm_tr_tb_stop.

Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---

diff --git a/target/arm/translate.c b/target/arm/translate.c
index fdf2b3d1c88..6d2867be1d5 100644
--- a/target/arm/translate.c
+++ b/target/arm/translate.c
@@ -8904,7 +8904,7 @@ static bool trans_ISB(DisasContext *s, arg_ISB *a)
      * self-modifying code correctly and also to take
      * any pending interrupts immediately.
      */
-    gen_goto_tb(s, 0, s->base.pc_next);
+    s->base.is_jmp = DISAS_TOO_MANY;
     return true;
 }
 
@@ -8918,7 +8918,7 @@ static bool trans_SB(DisasContext *s, arg_SB *a)
      * for TCG; MB and end the TB instead.
      */
     tcg_gen_mb(TCG_MO_ALL | TCG_BAR_SC);
-    gen_goto_tb(s, 0, s->base.pc_next);
+    s->base.is_jmp = DISAS_TOO_MANY;
     return true;
 }