diff mbox series

[v5,10/23] target/ppc: Move page crossing check to ppc_tr_translate_insn

Message ID 20210517205025.3777947-11-matheus.ferst@eldorado.org.br (mailing list archive)
State New, archived
Headers show
Series Base for adding PowerPC 64-bit instructions | expand

Commit Message

Matheus K. Ferst May 17, 2021, 8:50 p.m. UTC 
From: Richard Henderson <richard.henderson@linaro.org>

With prefixed instructions, the number of instructions
remaining until the page crossing is no longer constant.

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Matheus Ferst <matheus.ferst@eldorado.org.br>
---
 target/ppc/translate.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

Comments

David Gibson May 18, 2021, 12:23 a.m. UTC | #1 
On Mon, May 17, 2021 at 05:50:12PM -0300, matheus.ferst@eldorado.org.br wrote:
> From: Richard Henderson <richard.henderson@linaro.org>
> 
> With prefixed instructions, the number of instructions
> remaining until the page crossing is no longer constant.
> 
> 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 | 8 +++++---
>  1 file changed, 5 insertions(+), 3 deletions(-)
> 
> diff --git a/target/ppc/translate.c b/target/ppc/translate.c
> index dc0f5fafc2..b1873d2dcc 100644
> --- a/target/ppc/translate.c
> +++ b/target/ppc/translate.c
> @@ -9060,9 +9060,6 @@ static void ppc_tr_init_disas_context(DisasContextBase *dcbase, CPUState *cs)
>  
>      if (ctx->singlestep_enabled & (CPU_SINGLE_STEP | GDBSTUB_SINGLE_STEP)) {
>          ctx->base.max_insns = 1;
> -    } else {
> -        int bound = -(ctx->base.pc_first | TARGET_PAGE_MASK) / 4;
> -        ctx->base.max_insns = MIN(ctx->base.max_insns, bound);
>      }
>  }
>  
> @@ -9117,6 +9114,11 @@ static void ppc_tr_translate_insn(DisasContextBase *dcbase, CPUState *cs)
>      handler->count++;
>  #endif
>  
> +    /* End the TB when crossing a page boundary. */
> +    if (ctx->base.is_jmp == DISAS_NEXT && !(pc & ~TARGET_PAGE_MASK)) {
> +        ctx->base.is_jmp = DISAS_TOO_MANY;
> +    }
> +
>      translator_loop_temp_check(&ctx->base);
>  }
>
diff mbox series

Patch

diff --git a/target/ppc/translate.c b/target/ppc/translate.c
index dc0f5fafc2..b1873d2dcc 100644
--- a/target/ppc/translate.c
+++ b/target/ppc/translate.c
@@ -9060,9 +9060,6 @@  static void ppc_tr_init_disas_context(DisasContextBase *dcbase, CPUState *cs)
 
     if (ctx->singlestep_enabled & (CPU_SINGLE_STEP | GDBSTUB_SINGLE_STEP)) {
         ctx->base.max_insns = 1;
-    } else {
-        int bound = -(ctx->base.pc_first | TARGET_PAGE_MASK) / 4;
-        ctx->base.max_insns = MIN(ctx->base.max_insns, bound);
     }
 }
 
@@ -9117,6 +9114,11 @@  static void ppc_tr_translate_insn(DisasContextBase *dcbase, CPUState *cs)
     handler->count++;
 #endif
 
+    /* End the TB when crossing a page boundary. */
+    if (ctx->base.is_jmp == DISAS_NEXT && !(pc & ~TARGET_PAGE_MASK)) {
+        ctx->base.is_jmp = DISAS_TOO_MANY;
+    }
+
     translator_loop_temp_check(&ctx->base);
 }