target/arm: Use translator_use_goto_tb for aarch32

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>
This commit is contained in:
Richard Henderson 2021-06-29 11:19:33 -07:00
parent 0285162bdf
commit 97f11c8169

View file

@ -2578,16 +2578,6 @@ static int disas_dsp_insn(DisasContext *s, uint32_t insn)
return 1; return 1;
} }
static inline bool use_goto_tb(DisasContext *s, target_ulong dest)
{
#ifndef CONFIG_USER_ONLY
return (s->base.tb->pc & TARGET_PAGE_MASK) == (dest & TARGET_PAGE_MASK) ||
((s->base.pc_next - 1) & TARGET_PAGE_MASK) == (dest & TARGET_PAGE_MASK);
#else
return true;
#endif
}
static void gen_goto_ptr(void) static void gen_goto_ptr(void)
{ {
tcg_gen_lookup_and_goto_ptr(); tcg_gen_lookup_and_goto_ptr();
@ -2599,7 +2589,7 @@ static void gen_goto_ptr(void)
*/ */
static void gen_goto_tb(DisasContext *s, int n, target_ulong dest) static void gen_goto_tb(DisasContext *s, int n, target_ulong dest)
{ {
if (use_goto_tb(s, dest)) { if (translator_use_goto_tb(&s->base, dest)) {
tcg_gen_goto_tb(n); tcg_gen_goto_tb(n);
gen_set_pc_im(s, dest); gen_set_pc_im(s, dest);
tcg_gen_exit_tb(s->base.tb, n); tcg_gen_exit_tb(s->base.tb, n);