From: Ilya Leoshkevich <iii@linux.ibm.com>
To: Richard Henderson <richard.henderson@linaro.org>,
David Hildenbrand <david@redhat.com>,
Cornelia Huck <cohuck@redhat.com>, Thomas Huth <thuth@redhat.com>
Cc: Christian Borntraeger <borntraeger@de.ibm.com>,
qemu-s390x@nongnu.org, qemu-devel@nongnu.org,
Ilya Leoshkevich <iii@linux.ibm.com>
Subject: [PATCH v4 3/5] target/s390x: Fix cc_calc_sla_64() missing overflows
Date: Wed, 12 Jan 2022 17:50:14 +0100 [thread overview]
Message-ID: <20220112165016.226996-4-iii@linux.ibm.com> (raw)
In-Reply-To: <20220112165016.226996-1-iii@linux.ibm.com>
An overflow occurs for SLAG when at least one shifted bit is not equal
to sign bit. Therefore, we need to check that `shift + 1` bits are
neither all 0s nor all 1s. The current code checks only `shift` bits,
missing some overflows.
Fixes: cbe24bfa91d2 ("target-s390: Convert SHIFT, ROTATE SINGLE")
Co-developed-by: David Hildenbrand <david@redhat.com>
Signed-off-by: Ilya Leoshkevich <iii@linux.ibm.com>
---
target/s390x/tcg/cc_helper.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/target/s390x/tcg/cc_helper.c b/target/s390x/tcg/cc_helper.c
index c2c96c3a3c..c9b7b0e8c6 100644
--- a/target/s390x/tcg/cc_helper.c
+++ b/target/s390x/tcg/cc_helper.c
@@ -297,7 +297,7 @@ static uint32_t cc_calc_sla_32(uint32_t src, int shift)
static uint32_t cc_calc_sla_64(uint64_t src, int shift)
{
- uint64_t mask = ((1ULL << shift) - 1ULL) << (64 - shift);
+ uint64_t mask = -1ULL << (63 - shift);
uint64_t sign = 1ULL << 63;
uint64_t match;
int64_t r;
--
2.31.1
next prev parent reply other threads:[~2022-01-12 16:53 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-12 16:50 [PATCH v4 0/5] target/s390x: Fix shift instructions Ilya Leoshkevich
2022-01-12 16:50 ` [PATCH v4 1/5] target/s390x: Fix SLDA sign bit index Ilya Leoshkevich
2022-01-12 16:50 ` [PATCH v4 2/5] target/s390x: Fix SRDA CC calculation Ilya Leoshkevich
2022-01-13 15:33 ` David Hildenbrand
2022-01-12 16:50 ` Ilya Leoshkevich [this message]
2022-01-13 8:21 ` [PATCH v4 3/5] target/s390x: Fix cc_calc_sla_64() missing overflows David Hildenbrand
2022-01-12 16:50 ` [PATCH v4 4/5] target/s390x: Fix shifting 32-bit values for more than 31 bits Ilya Leoshkevich
2022-01-13 8:23 ` David Hildenbrand
2022-01-12 16:50 ` [PATCH v4 5/5] tests/tcg/s390x: Test shift instructions Ilya Leoshkevich
2022-01-13 8:25 ` David Hildenbrand
2022-01-18 9:08 ` [PATCH v4 0/5] target/s390x: Fix " Thomas Huth
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=20220112165016.226996-4-iii@linux.ibm.com \
--to=iii@linux.ibm.com \
--cc=borntraeger@de.ibm.com \
--cc=cohuck@redhat.com \
--cc=david@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-s390x@nongnu.org \
--cc=richard.henderson@linaro.org \
--cc=thuth@redhat.com \
/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).