Re: [PATCH 11/26] target/m68k: Use translator_use_goto_tb

[Laurent Vivier]

Le 21/06/2021 à 03:34, Richard Henderson a écrit :
> Just use translator_use_goto_tb directly at the one call site,
> rather than maintaining a local wrapper.
> 
> Cc: Laurent Vivier <laurent@vivier.eu>
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> ---
>  target/m68k/translate.c | 12 +-----------
>  1 file changed, 1 insertion(+), 11 deletions(-)
> 
> diff --git a/target/m68k/translate.c b/target/m68k/translate.c
> index f0c5bf9154..05b96fdda7 100644
> --- a/target/m68k/translate.c
> +++ b/target/m68k/translate.c
> @@ -1520,16 +1520,6 @@ static void gen_exit_tb(DisasContext *s)
>          }                                                               \
>      } while (0)
>  
> -static inline bool use_goto_tb(DisasContext *s, uint32_t dest)
> -{
> -#ifndef CONFIG_USER_ONLY
> -    return (s->base.pc_first & TARGET_PAGE_MASK) == (dest & TARGET_PAGE_MASK)
> -        || (s->base.pc_next & TARGET_PAGE_MASK) == (dest & TARGET_PAGE_MASK);
> -#else
> -    return true;
> -#endif
> -}
> -
>  /* Generate a jump to an immediate address.  */
>  static void gen_jmp_tb(DisasContext *s, int n, uint32_t dest)
>  {
> @@ -1537,7 +1527,7 @@ static void gen_jmp_tb(DisasContext *s, int n, uint32_t 
> dest)
>          update_cc_op(s);
>          tcg_gen_movi_i32(QREG_PC, dest);
>          gen_singlestep_exception(s);
> -    } else if (use_goto_tb(s, dest)) {
> +    } else if (translator_use_goto_tb(&s->base, dest)) {
>          tcg_gen_goto_tb(n);
>          tcg_gen_movi_i32(QREG_PC, dest);
>          tcg_gen_exit_tb(s->base.tb, n);
> 

Acked-by: Laurent Vivier <laurent@vivier.eu>