From: Laurent Vivier <laurent@vivier.eu>
To: qemu-devel@nongnu.org
Cc: qemu-trivial@nongnu.org,
Pavel Dovgalyuk <Pavel.Dovgalyuk@ispras.ru>,
Richard Henderson <richard.henderson@linaro.org>,
Michael Tokarev <mjt@tls.msk.ru>,
Laurent Vivier <laurent@vivier.eu>
Subject: [PULL 06/11] target/nios2: fix page-fit instruction count
Date: Mon, 7 Jun 2021 20:57:25 +0200 [thread overview]
Message-ID: <20210607185730.346641-7-laurent@vivier.eu> (raw)
In-Reply-To: <20210607185730.346641-1-laurent@vivier.eu>
From: Pavel Dovgalyuk <pavel.dovgalyuk@ispras.ru>
This patch fixes calculation of number of the instructions
that fit the current page. It prevents creation of the translation
blocks that cross the page boundaries. It is required for deterministic
exception generation in icount mode.
Signed-off-by: Pavel Dovgalyuk <Pavel.Dovgalyuk@ispras.ru>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <162072241046.823357.10485774346114851009.stgit@pasha-ThinkPad-X280>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
target/nios2/translate.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/target/nios2/translate.c b/target/nios2/translate.c
index 9824544eb37c..399f22d93862 100644
--- a/target/nios2/translate.c
+++ b/target/nios2/translate.c
@@ -829,7 +829,7 @@ void gen_intermediate_code(CPUState *cs, TranslationBlock *tb, int max_insns)
/* Set up instruction counts */
num_insns = 0;
if (max_insns > 1) {
- int page_insns = (TARGET_PAGE_SIZE - (tb->pc & TARGET_PAGE_MASK)) / 4;
+ int page_insns = (TARGET_PAGE_SIZE - (tb->pc & ~TARGET_PAGE_MASK)) / 4;
if (max_insns > page_insns) {
max_insns = page_insns;
}
--
2.31.1
next prev parent reply other threads:[~2021-06-07 19:02 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-07 18:57 [PULL 00/11] Trivial branch for 6.1 patches Laurent Vivier
2021-06-07 18:57 ` [PULL 01/11] target/riscv: Do not include 'pmp.h' in user emulation Laurent Vivier
2021-06-07 18:57 ` [PULL 02/11] i386/kvm: The value passed to strerror should be positive Laurent Vivier
2021-06-07 18:57 ` [PULL 03/11] misc: Correct relative include path Laurent Vivier
2021-06-07 18:57 ` [PULL 04/11] linux-user/syscall: Constify bitmask_transtbl fcntl/mmap flags_tlb[] Laurent Vivier
2021-06-07 18:57 ` [PULL 05/11] docs: fix broken reference Laurent Vivier
2021-06-07 18:57 ` Laurent Vivier [this message]
2021-06-07 18:57 ` [PULL 07/11] hw/display/macfb: Classify the "nubus-macfb" as display device Laurent Vivier
2021-06-07 18:57 ` [PULL 08/11] target/hppa: Remove unused 'memory.h' header Laurent Vivier
2021-06-07 18:57 ` [PULL 09/11] target/mips: Fix 'Uncoditional' typo Laurent Vivier
2021-06-07 18:57 ` [PULL 10/11] scripts/oss-fuzz: Fix typo in documentation Laurent Vivier
2021-06-07 18:57 ` [PULL 11/11] vhost-vdpa: Remove redundant declaration of address_space_memory Laurent Vivier
2021-06-08 8:39 ` [PULL 00/11] Trivial branch for 6.1 patches Peter Maydell
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=20210607185730.346641-7-laurent@vivier.eu \
--to=laurent@vivier.eu \
--cc=Pavel.Dovgalyuk@ispras.ru \
--cc=mjt@tls.msk.ru \
--cc=qemu-devel@nongnu.org \
--cc=qemu-trivial@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).