target/arm: Use translator_use_goto_tb for aarch64
We have not needed to end a TB for I/O since ba3e792669
("icount: clean up cpu_can_io at the entry to the block"),
and gdbstub singlestep is handled by the generic function.
Drop the unused 'n' argument to use_goto_tb.
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
parent
73fce314db
commit
0285162bdf
|
@ -385,35 +385,20 @@ static void gen_step_complete_exception(DisasContext *s)
|
||||||
s->base.is_jmp = DISAS_NORETURN;
|
s->base.is_jmp = DISAS_NORETURN;
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline bool use_goto_tb(DisasContext *s, int n, uint64_t dest)
|
static inline bool use_goto_tb(DisasContext *s, uint64_t dest)
|
||||||
{
|
{
|
||||||
/* No direct tb linking with singlestep (either QEMU's or the ARM
|
if (s->ss_active) {
|
||||||
* debug architecture kind) or deterministic io
|
|
||||||
*/
|
|
||||||
if (s->base.singlestep_enabled || s->ss_active ||
|
|
||||||
(tb_cflags(s->base.tb) & CF_LAST_IO)) {
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
return translator_use_goto_tb(&s->base, dest);
|
||||||
#ifndef CONFIG_USER_ONLY
|
|
||||||
/* Only link tbs from inside the same guest page */
|
|
||||||
if ((s->base.tb->pc & TARGET_PAGE_MASK) != (dest & TARGET_PAGE_MASK)) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline void gen_goto_tb(DisasContext *s, int n, uint64_t dest)
|
static inline void gen_goto_tb(DisasContext *s, int n, uint64_t dest)
|
||||||
{
|
{
|
||||||
const TranslationBlock *tb;
|
if (use_goto_tb(s, dest)) {
|
||||||
|
|
||||||
tb = s->base.tb;
|
|
||||||
if (use_goto_tb(s, n, dest)) {
|
|
||||||
tcg_gen_goto_tb(n);
|
tcg_gen_goto_tb(n);
|
||||||
gen_a64_set_pc_im(dest);
|
gen_a64_set_pc_im(dest);
|
||||||
tcg_gen_exit_tb(tb, n);
|
tcg_gen_exit_tb(s->base.tb, n);
|
||||||
s->base.is_jmp = DISAS_NORETURN;
|
s->base.is_jmp = DISAS_NORETURN;
|
||||||
} else {
|
} else {
|
||||||
gen_a64_set_pc_im(dest);
|
gen_a64_set_pc_im(dest);
|
||||||
|
|
Loading…
Reference in a new issue