[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v14 06/34] target/arm: Delay check for magic kernel
From: |
Richard Henderson |
Subject: |
[Qemu-devel] [PATCH v14 06/34] target/arm: Delay check for magic kernel page |
Date: |
Fri, 14 Jul 2017 23:42:15 -1000 |
There's nothing magic about the exception that we generate in order
to execute the magic kernel page. We can and should allow gdb to
set a breakpoint at this location.
Signed-off-by: Richard Henderson <address@hidden>
---
target/arm/translate.c | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/target/arm/translate.c b/target/arm/translate.c
index fea76fb..2ae68ce 100644
--- a/target/arm/translate.c
+++ b/target/arm/translate.c
@@ -11930,17 +11930,6 @@ void gen_intermediate_code(CPUState *cs,
TranslationBlock *tb)
0);
num_insns++;
-#ifdef CONFIG_USER_ONLY
- /* Intercept jump to the magic kernel page. */
- if (dc->pc >= 0xffff0000) {
- /* We always get here via a jump, so know we are not in a
- conditional execution block. */
- gen_exception_internal(EXCP_KERNEL_TRAP);
- dc->is_jmp = DISAS_NORETURN;
- break;
- }
-#endif
-
if (unlikely(!QTAILQ_EMPTY(&cs->breakpoints))) {
CPUBreakpoint *bp;
QTAILQ_FOREACH(bp, &cs->breakpoints, entry) {
@@ -11972,6 +11961,17 @@ void gen_intermediate_code(CPUState *cs,
TranslationBlock *tb)
gen_io_start();
}
+#ifdef CONFIG_USER_ONLY
+ /* Intercept jump to the magic kernel page. */
+ if (dc->pc >= 0xffff0000) {
+ /* We always get here via a jump, so know we are not in a
+ conditional execution block. */
+ gen_exception_internal(EXCP_KERNEL_TRAP);
+ dc->is_jmp = DISAS_NORETURN;
+ break;
+ }
+#endif
+
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
--
2.9.4
- Re: [Qemu-devel] [PATCH v14 02/34] tcg: Add generic DISAS_NORETURN, (continued)
- [Qemu-devel] [PATCH v14 01/34] Pass generic CPUState to gen_intermediate_code(), Richard Henderson, 2017/07/15
- [Qemu-devel] [PATCH v14 03/34] target/i386: Use generic DISAS_* enumerators, Richard Henderson, 2017/07/15
- [Qemu-devel] [PATCH v14 04/34] target/arm: Use DISAS_NORETURN, Richard Henderson, 2017/07/15
- [Qemu-devel] [PATCH v14 06/34] target/arm: Delay check for magic kernel page,
Richard Henderson <=
- [Qemu-devel] [PATCH v14 07/34] target/arm: Set is_jmp properly after single-stepping, Richard Henderson, 2017/07/15
- [Qemu-devel] [PATCH v14 05/34] target: [tcg] Use a generic enum for DISAS_ values, Richard Henderson, 2017/07/15
- [Qemu-devel] [PATCH v14 08/34] tcg: Add generic translation framework, Richard Henderson, 2017/07/15
- [Qemu-devel] [PATCH v14 10/34] target/i386: [tcg] Port to init_disas_context, Richard Henderson, 2017/07/15