[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 09/14] target-mips: fix detection of the end of the p
From: |
Leon Alrae |
Subject: |
[Qemu-devel] [PULL 09/14] target-mips: fix detection of the end of the page during translation |
Date: |
Fri, 13 Feb 2015 10:02:07 +0000 |
The test is supposed to terminate TB if the end of the page is reached.
However, with current implementation it may never succeed for microMIPS or
mips16.
Reported-by: Richard Henderson <address@hidden>
Signed-off-by: Leon Alrae <address@hidden>
Reviewed-by: Maciej W. Rozycki <address@hidden>
Reviewed-by: Richard Henderson <address@hidden>
---
target-mips/translate.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/target-mips/translate.c b/target-mips/translate.c
index 1faeb5d..205a433 100644
--- a/target-mips/translate.c
+++ b/target-mips/translate.c
@@ -19095,6 +19095,7 @@ gen_intermediate_code_internal(MIPSCPU *cpu,
TranslationBlock *tb,
CPUMIPSState *env = &cpu->env;
DisasContext ctx;
target_ulong pc_start;
+ target_ulong next_page_start;
uint16_t *gen_opc_end;
CPUBreakpoint *bp;
int j, lj = -1;
@@ -19107,6 +19108,7 @@ gen_intermediate_code_internal(MIPSCPU *cpu,
TranslationBlock *tb,
qemu_log("search pc %d\n", search_pc);
pc_start = tb->pc;
+ next_page_start = (pc_start & TARGET_PAGE_MASK) + TARGET_PAGE_SIZE;
gen_opc_end = tcg_ctx.gen_opc_buf + OPC_MAX_SIZE;
ctx.pc = pc_start;
ctx.saved_pc = -1;
@@ -19206,8 +19208,9 @@ gen_intermediate_code_internal(MIPSCPU *cpu,
TranslationBlock *tb,
break;
}
- if ((ctx.pc & (TARGET_PAGE_SIZE - 1)) == 0)
+ if (ctx.pc >= next_page_start) {
break;
+ }
if (tcg_ctx.gen_opc_ptr >= gen_opc_end) {
break;
--
2.1.0
- [Qemu-devel] [PULL 13/14] target-mips: pass 0 instead of -1 as rs in microMIPS LUI instruction, (continued)
- [Qemu-devel] [PULL 13/14] target-mips: pass 0 instead of -1 as rs in microMIPS LUI instruction, Leon Alrae, 2015/02/13
- [Qemu-devel] [PULL 07/14] isa: remove isa_mem_base variable, Leon Alrae, 2015/02/13
- [Qemu-devel] [PULL 02/14] jazz: do not explode QEMUMachineInitArgs structure, Leon Alrae, 2015/02/13
- [Qemu-devel] [PULL 06/14] gt64xxx: remove isa_mem_base usage, Leon Alrae, 2015/02/13
- [Qemu-devel] [PULL 01/14] isa: add memory space parameter to isa_bus_new, Leon Alrae, 2015/02/13
- [Qemu-devel] [PULL 11/14] target-mips: use CP0EnLo_XI instead of magic number, Leon Alrae, 2015/02/13
- [Qemu-devel] [PULL 12/14] target-mips: fix broken snapshotting, Leon Alrae, 2015/02/13
- [Qemu-devel] [PULL 08/14] target-mips: Make CP0.Status.CU1 read-only for the 5Kc and 5KEc processors, Leon Alrae, 2015/02/13
- [Qemu-devel] [PULL 10/14] target-mips: ll and lld cause AdEL exception for unaligned address, Leon Alrae, 2015/02/13
- [Qemu-devel] [PULL 14/14] linux-user: correct stat structure in MIPS N32, Leon Alrae, 2015/02/13
- [Qemu-devel] [PULL 09/14] target-mips: fix detection of the end of the page during translation,
Leon Alrae <=
- Re: [Qemu-devel] [PULL 00/14] target-mips queue, Peter Maydell, 2015/02/13