diff options
| author | Richard Henderson <richard.henderson@linaro.org> | 2021-11-03 00:03:46 -0400 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2021-12-15 10:35:26 +0000 |
| commit | 258a00e5a4a59dd4b0360a0aa4b8263b44d55cd0 (patch) | |
| tree | 9d80a765b76f41ffb4049be3ca0a26ef414a41ad /target | |
| parent | 0bb72bca7cb1cd282d2a55549db06a54d0319d7f (diff) | |
| download | qemu-258a00e5a4a59dd4b0360a0aa4b8263b44d55cd0.zip qemu-258a00e5a4a59dd4b0360a0aa4b8263b44d55cd0.tar.gz qemu-258a00e5a4a59dd4b0360a0aa4b8263b44d55cd0.tar.bz2 | |
target/arm: Split arm_pre_translate_insn
Create arm_check_ss_active and arm_check_kernelpage.
Reverse the order of the tests. While it doesn't matter in practice,
because only user-only has a kernel page and user-only never sets
ss_active, ss_active has priority over execution exceptions and it
is best to keep them in the proper order.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'target')
| -rw-r--r-- | target/arm/translate.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/target/arm/translate.c b/target/arm/translate.c index 1c2a727..0103c75 100644 --- a/target/arm/translate.c +++ b/target/arm/translate.c @@ -9502,7 +9502,7 @@ static void arm_tr_insn_start(DisasContextBase *dcbase, CPUState *cpu) dc->insn_start = tcg_last_op(); } -static bool arm_pre_translate_insn(DisasContext *dc) +static bool arm_check_kernelpage(DisasContext *dc) { #ifdef CONFIG_USER_ONLY /* Intercept jump to the magic kernel page. */ @@ -9514,7 +9514,11 @@ static bool arm_pre_translate_insn(DisasContext *dc) return true; } #endif + return false; +} +static bool arm_check_ss_active(DisasContext *dc) +{ if (dc->ss_active && !dc->pstate_ss) { /* Singlestep state is Active-pending. * If we're in this state at the start of a TB then either @@ -9551,7 +9555,7 @@ static void arm_tr_translate_insn(DisasContextBase *dcbase, CPUState *cpu) uint32_t pc = dc->base.pc_next; unsigned int insn; - if (arm_pre_translate_insn(dc)) { + if (arm_check_ss_active(dc) || arm_check_kernelpage(dc)) { dc->base.pc_next = pc + 4; return; } @@ -9622,7 +9626,7 @@ static void thumb_tr_translate_insn(DisasContextBase *dcbase, CPUState *cpu) uint32_t insn; bool is_16bit; - if (arm_pre_translate_insn(dc)) { + if (arm_check_ss_active(dc) || arm_check_kernelpage(dc)) { dc->base.pc_next = pc + 2; return; } |