[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 8/9] target/m68k: Improve ending TB at page boundarie
From: |
Laurent Vivier |
Subject: |
[Qemu-devel] [PULL 8/9] target/m68k: Improve ending TB at page boundaries |
Date: |
Mon, 11 Jun 2018 12:49:34 +0200 |
From: Richard Henderson <address@hidden>
Rather than limit total TB size to PAGE-32 bytes, end the TB when
near the end of a page. This should provide proper semantics of
SIGSEGV when executing near the end of a page.
Signed-off-by: Richard Henderson <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Laurent Vivier <address@hidden>
---
target/m68k/translate.c | 22 +++++++++++++++++++---
1 file changed, 19 insertions(+), 3 deletions(-)
diff --git a/target/m68k/translate.c b/target/m68k/translate.c
index 62a96bedcd..ff3493d8ab 100644
--- a/target/m68k/translate.c
+++ b/target/m68k/translate.c
@@ -6105,9 +6105,25 @@ static void m68k_tr_translate_insn(DisasContextBase
*dcbase, CPUState *cpu)
disas_m68k_insn(cpu->env_ptr, dc);
dc->base.pc_next = dc->pc;
- if (dc->base.is_jmp == DISAS_NEXT
- && dc->pc - dc->base.pc_first >= TARGET_PAGE_SIZE - 32) {
- dc->base.is_jmp = DISAS_TOO_MANY;
+ if (dc->base.is_jmp == DISAS_NEXT) {
+ /* Stop translation when the next insn might touch a new page.
+ * This ensures that prefetch aborts at the right place.
+ *
+ * We cannot determine the size of the next insn without
+ * completely decoding it. However, the maximum insn size
+ * is 32 bytes, so end if we do not have that much remaining.
+ * This may produce several small TBs at the end of each page,
+ * but they will all be linked with goto_tb.
+ *
+ * ??? ColdFire maximum is 4 bytes; MC68000's maximum is also
+ * smaller than MC68020's.
+ */
+ target_ulong start_page_offset
+ = dc->pc - (dc->base.pc_first & TARGET_PAGE_MASK);
+
+ if (start_page_offset >= TARGET_PAGE_SIZE - 32) {
+ dc->base.is_jmp = DISAS_TOO_MANY;
+ }
}
}
--
2.14.4
- [Qemu-devel] [PULL 0/9] M68k for 3.0 patches, Laurent Vivier, 2018/06/11
- [Qemu-devel] [PULL 1/9] target/m68k: Use DISAS_NORETURN for exceptions, Laurent Vivier, 2018/06/11
- [Qemu-devel] [PULL 5/9] target/m68k: Rename DISAS_UPDATE and gen_lookup_tb, Laurent Vivier, 2018/06/11
- [Qemu-devel] [PULL 2/9] target/m68k: Replace DISAS_TB_JUMP with DISAS_NORETURN, Laurent Vivier, 2018/06/11
- [Qemu-devel] [PULL 4/9] target/m68k: Use lookup_and_goto_tb for DISAS_JUMP, Laurent Vivier, 2018/06/11
- [Qemu-devel] [PULL 3/9] target/m68k: Remove DISAS_JUMP_NEXT as unused, Laurent Vivier, 2018/06/11
- [Qemu-devel] [PULL 8/9] target/m68k: Improve ending TB at page boundaries,
Laurent Vivier <=
- [Qemu-devel] [PULL 7/9] target/m68k: Convert to TranslatorOps, Laurent Vivier, 2018/06/11
- [Qemu-devel] [PULL 6/9] target/m68k: Convert to DisasContextBase, Laurent Vivier, 2018/06/11
- [Qemu-devel] [PULL 9/9] target/m68k: Merge disas_m68k_insn into m68k_tr_translate_insn, Laurent Vivier, 2018/06/11
- Re: [Qemu-devel] [PULL 0/9] M68k for 3.0 patches, Peter Maydell, 2018/06/11