On Wed, May 12, 2021 at 03:54:19PM -0300, matheus.ferst@eldorado.org.br wrote:
> From: Richard Henderson <richard.henderson@linaro.org>
> 
> Since ba3e7926691ed33, we switched the implementation of icount
> to always reset can_do_io at the start of the following TB.
> Most of them were removed in 9e9b10c64911, but some were missed.
> 
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> Signed-off-by: Matheus Ferst <matheus.ferst@eldorado.org.br>

Applied to ppc-for-6.1, thanks.

> ---
>  target/ppc/translate.c | 6 ------
>  1 file changed, 6 deletions(-)
> 
> diff --git a/target/ppc/translate.c b/target/ppc/translate.c
> index 88fe24ef95..1c02e21a56 100644
> --- a/target/ppc/translate.c
> +++ b/target/ppc/translate.c
> @@ -568,7 +568,6 @@ static void spr_read_tbl(DisasContext *ctx, int gprn, int sprn)
>      }
>      gen_helper_load_tbl(cpu_gpr[gprn], cpu_env);
>      if (tb_cflags(ctx->base.tb) & CF_USE_ICOUNT) {
> -        gen_io_end();
>          gen_stop_exception(ctx);
>      }
>  }
> @@ -580,7 +579,6 @@ static void spr_read_tbu(DisasContext *ctx, int gprn, int sprn)
>      }
>      gen_helper_load_tbu(cpu_gpr[gprn], cpu_env);
>      if (tb_cflags(ctx->base.tb) & CF_USE_ICOUNT) {
> -        gen_io_end();
>          gen_stop_exception(ctx);
>      }
>  }
> @@ -605,7 +603,6 @@ static void spr_write_tbl(DisasContext *ctx, int sprn, int gprn)
>      }
>      gen_helper_store_tbl(cpu_env, cpu_gpr[gprn]);
>      if (tb_cflags(ctx->base.tb) & CF_USE_ICOUNT) {
> -        gen_io_end();
>          gen_stop_exception(ctx);
>      }
>  }
> @@ -617,7 +614,6 @@ static void spr_write_tbu(DisasContext *ctx, int sprn, int gprn)
>      }
>      gen_helper_store_tbu(cpu_env, cpu_gpr[gprn]);
>      if (tb_cflags(ctx->base.tb) & CF_USE_ICOUNT) {
> -        gen_io_end();
>          gen_stop_exception(ctx);
>      }
>  }
> @@ -666,7 +662,6 @@ static void spr_read_hdecr(DisasContext *ctx, int gprn, int sprn)
>      }
>      gen_helper_load_hdecr(cpu_gpr[gprn], cpu_env);
>      if (tb_cflags(ctx->base.tb) & CF_USE_ICOUNT) {
> -        gen_io_end();
>          gen_stop_exception(ctx);
>      }
>  }
> @@ -678,7 +673,6 @@ static void spr_write_hdecr(DisasContext *ctx, int sprn, int gprn)
>      }
>      gen_helper_store_hdecr(cpu_env, cpu_gpr[gprn]);
>      if (tb_cflags(ctx->base.tb) & CF_USE_ICOUNT) {
> -        gen_io_end();
>          gen_stop_exception(ctx);
>      }
>  }

-- 
David Gibson			| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
				| _way_ _around_!
http://www.ozlabs.org/~dgibson