[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 02/10] target/cris: avoid integer overflow in next_p
From: |
Emilio G. Cota |
Subject: |
[Qemu-devel] [PATCH 02/10] target/cris: avoid integer overflow in next_page PC check |
Date: |
Tue, 10 Apr 2018 12:19:38 -0400 |
If the PC is in the last page of the address space, next_page_start
overflows to 0. Fix it.
Cc: "Edgar E. Iglesias" <address@hidden>
Signed-off-by: Emilio G. Cota <address@hidden>
---
target/cris/translate.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/target/cris/translate.c b/target/cris/translate.c
index f51a731..64b9ec6 100644
--- a/target/cris/translate.c
+++ b/target/cris/translate.c
@@ -3091,7 +3091,7 @@ void gen_intermediate_code(CPUState *cs, struct
TranslationBlock *tb)
unsigned int insn_len;
struct DisasContext ctx;
struct DisasContext *dc = &ctx;
- uint32_t next_page_start;
+ uint32_t page_start;
target_ulong npc;
int num_insns;
int max_insns;
@@ -3138,7 +3138,7 @@ void gen_intermediate_code(CPUState *cs, struct
TranslationBlock *tb)
dc->cpustate_changed = 0;
- next_page_start = (pc_start & TARGET_PAGE_MASK) + TARGET_PAGE_SIZE;
+ page_start = pc_start & TARGET_PAGE_MASK;
num_insns = 0;
max_insns = tb_cflags(tb) & CF_COUNT_MASK;
if (max_insns == 0) {
@@ -3234,7 +3234,7 @@ void gen_intermediate_code(CPUState *cs, struct
TranslationBlock *tb)
} while (!dc->is_jmp && !dc->cpustate_changed
&& !tcg_op_buf_full()
&& !singlestep
- && (dc->pc < next_page_start)
+ && (dc->pc - page_start < TARGET_PAGE_SIZE)
&& num_insns < max_insns);
if (dc->clear_locked_irq) {
--
2.7.4
- Re: [Qemu-devel] [PATCH 01/10] target/riscv: avoid integer overflow in next_page PC check, (continued)
- [Qemu-devel] [PATCH 03/10] target/lm32: avoid integer overflow in next_page PC check, Emilio G. Cota, 2018/04/10
- [Qemu-devel] [PATCH 07/10] target/microblaze: avoid integer overflow in next_page PC check, Emilio G. Cota, 2018/04/10
- [Qemu-devel] [PATCH 06/10] target/tilegx: avoid integer overflow in next_page PC check, Emilio G. Cota, 2018/04/10
- [Qemu-devel] [PATCH 08/10] target/arm: avoid integer overflow in next_page PC check, Emilio G. Cota, 2018/04/10
- [Qemu-devel] [PATCH 09/10] target/s390x: avoid integer overflow in next_page PC check, Emilio G. Cota, 2018/04/10
- [Qemu-devel] [PATCH 02/10] target/cris: avoid integer overflow in next_page PC check,
Emilio G. Cota <=
- [Qemu-devel] [PATCH 10/10] target/mips: avoid integer overflow in next_page PC check, Emilio G. Cota, 2018/04/10
- Re: [Qemu-devel] [PATCH 00/10] Avoid integer overflow in next_page_start, Richard Henderson, 2018/04/10