From: Richard Henderson <richard.henderson@linaro.org>
Date: Sun, 20 Jun 2021 23:51:23 +0000 (-0700)
Subject: target/sh4: Use translator_use_goto_tb
X-Git-Tag: v6.1.0-rc0~27^2~12
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3f1e20984519ad3823438b73ea10035c0b2a9ffd;p=thirdparty%2Fqemu.git

target/sh4: Use translator_use_goto_tb

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

diff --git a/target/sh4/translate.c b/target/sh4/translate.c
index 8a25a4362ee..40898e2393c 100644
--- a/target/sh4/translate.c
+++ b/target/sh4/translate.c
@@ -224,17 +224,12 @@ static inline bool use_exit_tb(DisasContext *ctx)
     return (ctx->tbflags & GUSA_EXCLUSIVE) != 0;
 }
 
-static inline bool use_goto_tb(DisasContext *ctx, target_ulong dest)
+static bool use_goto_tb(DisasContext *ctx, target_ulong dest)
 {
-    /* Use a direct jump if in same page and singlestep not enabled */
-    if (unlikely(ctx->base.singlestep_enabled || use_exit_tb(ctx))) {
+    if (use_exit_tb(ctx)) {
         return false;
     }
-#ifndef CONFIG_USER_ONLY
-    return (ctx->base.tb->pc & TARGET_PAGE_MASK) == (dest & TARGET_PAGE_MASK);
-#else
-    return true;
-#endif
+    return translator_use_goto_tb(&ctx->base, dest);
 }
 
 static void gen_goto_tb(DisasContext *ctx, int n, target_ulong dest)