summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmilio G. Cota <cota@braap.org>2018-04-10 10:47:41 -0400
committerRichard Henderson <richard.henderson@linaro.org>2018-05-09 10:12:21 -0700
commit5c433a7aac1a34c199ed5a7a07f4f71349562a8f (patch)
tree55a728503dbf3cd555a9d54ef560736d2d387782
parent818c187781a0e9dcfd0cbaffd90c9485f2edcccd (diff)
downloadqemu-5c433a7aac1a34c199ed5a7a07f4f71349562a8f.tar.gz
target/tilegx: avoid integer overflow in next_page PC check
If the PC is in the last page of the address space, next_page_start overflows to 0. Fix it. Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Signed-off-by: Emilio G. Cota <cota@braap.org> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
-rw-r--r--target/tilegx/translate.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/tilegx/translate.c b/target/tilegx/translate.c
index d63bf5bba3..6c53c5e767 100644
--- a/target/tilegx/translate.c
+++ b/target/tilegx/translate.c
@@ -2375,7 +2375,7 @@ void gen_intermediate_code(CPUState *cs, struct TranslationBlock *tb)
DisasContext ctx;
DisasContext *dc = &ctx;
uint64_t pc_start = tb->pc;
- uint64_t next_page_start = (pc_start & TARGET_PAGE_MASK) + TARGET_PAGE_SIZE;
+ uint64_t page_start = pc_start & TARGET_PAGE_MASK;
int num_insns = 0;
int max_insns = tb_cflags(tb) & CF_COUNT_MASK;
@@ -2415,7 +2415,7 @@ void gen_intermediate_code(CPUState *cs, struct TranslationBlock *tb)
}
dc->pc += TILEGX_BUNDLE_SIZE_IN_BYTES;
if (num_insns >= max_insns
- || dc->pc >= next_page_start
+ || (dc->pc - page_start >= TARGET_PAGE_SIZE)
|| tcg_op_buf_full()) {
/* Ending the TB due to TB size or page boundary. Set PC. */
tcg_gen_movi_tl(cpu_pc, dc->pc);