[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 05/11] target/cris: Fix use_goto_tb
From: |
Richard Henderson |
Subject: |
[PATCH v2 05/11] target/cris: Fix use_goto_tb |
Date: |
Sun, 20 Jun 2021 14:32:43 -0700 |
Do not skip the page check for user-only -- mmap/mprotect can
still change page mappings. Only check dc->base.pc_first, not
dc->ppc -- the start page is the only one that's relevant.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
target/cris/translate.c | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/target/cris/translate.c b/target/cris/translate.c
index 24dbae6d58..9e1f2f9239 100644
--- a/target/cris/translate.c
+++ b/target/cris/translate.c
@@ -524,14 +524,9 @@ static void t_gen_cc_jmp(TCGv pc_true, TCGv pc_false)
gen_set_label(l1);
}
-static inline bool use_goto_tb(DisasContext *dc, target_ulong dest)
+static bool use_goto_tb(DisasContext *dc, target_ulong dest)
{
-#ifndef CONFIG_USER_ONLY
- return (dc->base.pc_first & TARGET_PAGE_MASK) == (dest & TARGET_PAGE_MASK)
||
- (dc->ppc & TARGET_PAGE_MASK) == (dest & TARGET_PAGE_MASK);
-#else
- return true;
-#endif
+ return ((dest ^ dc->base.pc_first) & TARGET_PAGE_MASK) == 0;
}
static void gen_goto_tb(DisasContext *dc, int n, target_ulong dest)
--
2.25.1
- [PATCH v2 00/11] target/cris: Convert to TranslatorOps, Richard Henderson, 2021/06/20
- [PATCH v2 01/11] target/cris: Add DisasContextBase to DisasContext, Richard Henderson, 2021/06/20
- [PATCH v2 03/11] target/cris: Mark exceptions as DISAS_NORETURN, Richard Henderson, 2021/06/20
- [PATCH v2 05/11] target/cris: Fix use_goto_tb,
Richard Henderson <=
- [PATCH v2 02/11] target/cris: Replace DISAS_TB_JUMP with DISAS_NORETURN, Richard Henderson, 2021/06/20
- [PATCH v2 04/11] target/cris: Remove DISAS_SWI, Richard Henderson, 2021/06/20
- [PATCH v2 07/11] target/cris: Mark helper_raise_exception noreturn, Richard Henderson, 2021/06/20
- [PATCH v2 08/11] target/cris: Mark static arrays const, Richard Henderson, 2021/06/20
- [PATCH v2 09/11] target/cris: Move delayed branch handling to tb_stop, Richard Henderson, 2021/06/20