From: Richard Henderson <richard.henderson@linaro.org>
Date: Sun, 20 Jun 2021 23:42:04 +0000 (-0700)
Subject: target/s390x: Use translator_use_goto_tb
X-Git-Tag: v6.1.0-rc0~27^2~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7379c0c82e8164b55dbf605ba9b3988442a73025;p=thirdparty%2Fqemu.git

target/s390x: Use translator_use_goto_tb

Reviewed-by: David Hildenbrand <david@redhat.com>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---

diff --git a/target/s390x/translate.c b/target/s390x/translate.c
index 5af68e01c67..767e77ca197 100644
--- a/target/s390x/translate.c
+++ b/target/s390x/translate.c
@@ -696,12 +696,7 @@ static bool use_goto_tb(DisasContext *s, uint64_t dest)
     if (unlikely(use_exit_tb(s))) {
         return false;
     }
-#ifndef CONFIG_USER_ONLY
-    return (dest & TARGET_PAGE_MASK) == (s->base.tb->pc & TARGET_PAGE_MASK) ||
-           (dest & TARGET_PAGE_MASK) == (s->base.pc_next & TARGET_PAGE_MASK);
-#else
-    return true;
-#endif
+    return translator_use_goto_tb(&s->base, dest);
 }
 
 static void account_noninline_branch(DisasContext *s, int cc_op)