qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Emilio G. Cota" <cota@braap.org>
To: qemu-devel@nongnu.org
Cc: Richard Henderson <richard.henderson@linaro.org>
Subject: [Qemu-devel] [PATCH 06/10] target/tilegx: avoid integer overflow in next_page PC check
Date: Tue, 10 Apr 2018 12:19:42 -0400	[thread overview]
Message-ID: <1523377186-32578-7-git-send-email-cota@braap.org> (raw)
In-Reply-To: <1523377186-32578-1-git-send-email-cota@braap.org>

If the PC is in the last page of the address space, next_page_start
overflows to 0. Fix it.

Signed-off-by: Emilio G. Cota <cota@braap.org>
---
 target/tilegx/translate.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/target/tilegx/translate.c b/target/tilegx/translate.c
index d63bf5b..6c53c5e 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);
-- 
2.7.4

  parent reply	other threads:[~2018-04-10 16:19 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-04-10 16:19 [Qemu-devel] [PATCH 00/10] Avoid integer overflow in next_page_start Emilio G. Cota
2018-04-10 16:19 ` [Qemu-devel] [PATCH 01/10] target/riscv: avoid integer overflow in next_page PC check Emilio G. Cota
2018-04-11 15:44   ` Bastian Koppelmann
2018-04-11 21:49   ` Michael Clark
2018-04-10 16:19 ` [Qemu-devel] [PATCH 02/10] target/cris: " Emilio G. Cota
2018-04-10 16:19 ` [Qemu-devel] [PATCH 03/10] target/lm32: " Emilio G. Cota
2018-04-11  6:32   ` Michael Walle
2018-04-10 16:19 ` [Qemu-devel] [PATCH 04/10] target/xtensa: " Emilio G. Cota
2018-04-10 16:36   ` Max Filippov
2018-04-10 16:19 ` [Qemu-devel] [PATCH 05/10] target/unicore32: " Emilio G. Cota
2018-04-10 16:19 ` Emilio G. Cota [this message]
2018-04-10 16:19 ` [Qemu-devel] [PATCH 07/10] target/microblaze: " Emilio G. Cota
2018-04-10 16:19 ` [Qemu-devel] [PATCH 08/10] target/arm: " Emilio G. Cota
2018-04-10 16:19 ` [Qemu-devel] [PATCH 09/10] target/s390x: " Emilio G. Cota
2018-04-11  5:06   ` [Qemu-devel] [qemu-s390x] " Thomas Huth
2018-04-11  9:32   ` [Qemu-devel] " David Hildenbrand
2018-04-11 15:40   ` Cornelia Huck
2018-04-10 16:19 ` [Qemu-devel] [PATCH 10/10] target/mips: " Emilio G. Cota
2018-04-11  0:08 ` [Qemu-devel] [PATCH 00/10] Avoid integer overflow in next_page_start Richard Henderson
2018-04-11 15:29   ` Emilio G. Cota
2018-04-11 15:39     ` Cornelia Huck
2018-04-11 23:56     ` Richard Henderson
2018-05-09  0:51       ` Michael Clark
2018-05-09 16:45         ` Emilio G. Cota

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1523377186-32578-7-git-send-email-cota@braap.org \
    --to=cota@braap.org \
    --cc=qemu-devel@nongnu.org \
    --cc=richard.henderson@linaro.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).