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

target/nios2: Use translator_use_goto_tb

Just use translator_use_goto_tb directly at the one call site,
rather than maintaining a local wrapper.

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

diff --git a/target/nios2/translate.c b/target/nios2/translate.c
index 930f3d3395b..17742cebc7a 100644
--- a/target/nios2/translate.c
+++ b/target/nios2/translate.c
@@ -150,24 +150,11 @@ static void t_gen_helper_raise_exception(DisasContext *dc,
     dc->base.is_jmp = DISAS_NORETURN;
 }
 
-static bool use_goto_tb(DisasContext *dc, uint32_t dest)
-{
-    if (unlikely(dc->base.singlestep_enabled)) {
-        return false;
-    }
-
-#ifndef CONFIG_USER_ONLY
-    return (dc->base.pc_first & TARGET_PAGE_MASK) == (dest & TARGET_PAGE_MASK);
-#else
-    return true;
-#endif
-}
-
 static void gen_goto_tb(DisasContext *dc, int n, uint32_t dest)
 {
     const TranslationBlock *tb = dc->base.tb;
 
-    if (use_goto_tb(dc, dest)) {
+    if (translator_use_goto_tb(&dc->base, dest)) {
         tcg_gen_goto_tb(n);
         tcg_gen_movi_tl(cpu_R[R_PC], dest);
         tcg_gen_exit_tb(tb, n);