From: Thomas Huth <thuth@redhat.com>
To: qemu-devel@nongnu.org
Cc: Peter Maydell <peter.maydell@linaro.org>,
Ilya Leoshkevich <iii@linux.ibm.com>,
David Hildenbrand <david@redhat.com>
Subject: [PULL 03/10] target/s390x: Fix SRDA CC calculation
Date: Wed, 19 Jan 2022 09:32:08 +0100 [thread overview]
Message-ID: <20220119083215.120911-4-thuth@redhat.com> (raw)
In-Reply-To: <20220119083215.120911-1-thuth@redhat.com>
From: Ilya Leoshkevich <iii@linux.ibm.com>
SRDA uses r1_D32 for binding the first operand and s64 for setting CC.
cout_s64() relies on o->out being the shift result, however,
wout_r1_D32() clobbers it.
Fix by using a temporary.
Fixes: a79ba3398a0a ("target-s390: Convert SHIFT DOUBLE")
Signed-off-by: Ilya Leoshkevich <iii@linux.ibm.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
Message-Id: <20220112165016.226996-3-iii@linux.ibm.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
target/s390x/tcg/translate.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/target/s390x/tcg/translate.c b/target/s390x/tcg/translate.c
index f180853e7a..766b4c87b2 100644
--- a/target/s390x/tcg/translate.c
+++ b/target/s390x/tcg/translate.c
@@ -5420,9 +5420,11 @@ static void wout_r1_P32(DisasContext *s, DisasOps *o)
static void wout_r1_D32(DisasContext *s, DisasOps *o)
{
int r1 = get_field(s, r1);
+ TCGv_i64 t = tcg_temp_new_i64();
store_reg32_i64(r1 + 1, o->out);
- tcg_gen_shri_i64(o->out, o->out, 32);
- store_reg32_i64(r1, o->out);
+ tcg_gen_shri_i64(t, o->out, 32);
+ store_reg32_i64(r1, t);
+ tcg_temp_free_i64(t);
}
#define SPEC_wout_r1_D32 SPEC_r1_even
--
2.27.0
next prev parent reply other threads:[~2022-01-19 9:25 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-19 8:32 [PULL 00/10] s390x patches (shift instructions, MAINTAINERS, ...) Thomas Huth
2022-01-19 8:32 ` [PULL 01/10] s390x/css: fix PMCW invalid mask Thomas Huth
2022-01-19 8:32 ` [PULL 02/10] target/s390x: Fix SLDA sign bit index Thomas Huth
2022-01-19 8:32 ` Thomas Huth [this message]
2022-01-19 8:32 ` [PULL 04/10] target/s390x: Fix cc_calc_sla_64() missing overflows Thomas Huth
2022-01-19 8:32 ` [PULL 05/10] target/s390x: Fix shifting 32-bit values for more than 31 bits Thomas Huth
2022-01-19 8:32 ` [PULL 06/10] tests/tcg/s390x: Test shift instructions Thomas Huth
2022-01-19 8:32 ` [PULL 07/10] MAINTAINERS: split out s390x sections Thomas Huth
2022-01-19 8:32 ` [PULL 08/10] MAINTAINERS: Add myself to s390 I/O areas Thomas Huth
2022-01-19 8:32 ` [PULL 09/10] s390x/ipl: support extended kernel command line size Thomas Huth
2022-01-19 8:32 ` [PULL 10/10] s390x: sigp: Reorder the SIGP STOP code Thomas Huth
2022-01-19 18:46 ` [PULL 00/10] s390x patches (shift instructions, MAINTAINERS, ...) 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=20220119083215.120911-4-thuth@redhat.com \
--to=thuth@redhat.com \
--cc=david@redhat.com \
--cc=iii@linux.ibm.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.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).