diff options
| author | Richard Henderson <richard.henderson@linaro.org> | 2021-06-20 16:28:24 -0700 |
|---|---|---|
| committer | Richard Henderson <richard.henderson@linaro.org> | 2021-07-09 09:42:28 -0700 |
| commit | adf1f3dee69f88a66fc36c962dbf74d28de84b65 (patch) | |
| tree | 0df448066e086d8f28827523ff6f193ade3ba361 | |
| parent | 6082414e3f240de12987f5136b5fdd314379262c (diff) | |
| download | focaccia-qemu-adf1f3dee69f88a66fc36c962dbf74d28de84b65.tar.gz focaccia-qemu-adf1f3dee69f88a66fc36c962dbf74d28de84b65.zip | |
target/openrisc: Use translator_use_goto_tb
Reorder the control statements to allow using the page boundary check from translator_use_goto_tb(). Reviewed-by: Stafford Horne <shorne@gmail.com> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
| -rw-r--r-- | target/openrisc/translate.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/target/openrisc/translate.c b/target/openrisc/translate.c index 5db63d7609..37c3e3e0a3 100644 --- a/target/openrisc/translate.c +++ b/target/openrisc/translate.c @@ -1719,16 +1719,17 @@ static void openrisc_tr_tb_stop(DisasContextBase *dcbase, CPUState *cs) /* fallthru */ case DISAS_TOO_MANY: - if (unlikely(dc->base.singlestep_enabled)) { - tcg_gen_movi_tl(cpu_pc, jmp_dest); - gen_exception(dc, EXCP_DEBUG); - } else if ((dc->base.pc_first ^ jmp_dest) & TARGET_PAGE_MASK) { - tcg_gen_movi_tl(cpu_pc, jmp_dest); - tcg_gen_lookup_and_goto_ptr(); - } else { + if (translator_use_goto_tb(&dc->base, jmp_dest)) { tcg_gen_goto_tb(0); tcg_gen_movi_tl(cpu_pc, jmp_dest); tcg_gen_exit_tb(dc->base.tb, 0); + break; + } + tcg_gen_movi_tl(cpu_pc, jmp_dest); + if (unlikely(dc->base.singlestep_enabled)) { + gen_exception(dc, EXCP_DEBUG); + } else { + tcg_gen_lookup_and_goto_ptr(); } break; |