From: Nico Boehr <nrb@linux.ibm.com>
To: qemu-devel@nongnu.org
Cc: linux-s390@vger.kernel.org, thuth@redhat.com,
richard.henderson@linaro.org, david@redhat.com
Subject: [PATCH qemu] s390x: sck: load into a temporary not into in1
Date: Tue, 25 Jan 2022 13:29:14 +0100 [thread overview]
Message-ID: <20220125122914.567599-1-nrb@linux.ibm.com> (raw)
We previously loaded into in1, but in1 is not filled during
disassembly and hence always zero. This leads to an assertion failure:
qemu-system-s390x: /home/nrb/qemu/include/tcg/tcg.h:654: temp_idx:
Assertion `n >= 0 && n < tcg_ctx->nb_temps' failed.`
Instead, load into a temporary and pass that to the helper.
This fixes the SCK test I sent here under TCG:
<https://www.spinics.net/lists/kvm/msg265169.html>
Signed-off-by: Nico Boehr <nrb@linux.ibm.com>
---
target/s390x/tcg/translate.c | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/target/s390x/tcg/translate.c b/target/s390x/tcg/translate.c
index 46dea733571e..dc0baec5a5f4 100644
--- a/target/s390x/tcg/translate.c
+++ b/target/s390x/tcg/translate.c
@@ -4290,9 +4290,16 @@ static DisasJumpType op_stcke(DisasContext *s, DisasOps *o)
#ifndef CONFIG_USER_ONLY
static DisasJumpType op_sck(DisasContext *s, DisasOps *o)
{
- tcg_gen_qemu_ld_i64(o->in1, o->addr1, get_mem_index(s), MO_TEUQ | MO_ALIGN);
- gen_helper_sck(cc_op, cpu_env, o->in1);
+ TCGv_i64 t1;
+
+ t1 = tcg_temp_new_i64();
+
+ tcg_gen_qemu_ld_i64(t1, o->addr1, get_mem_index(s), MO_TEUQ | MO_ALIGN);
+ gen_helper_sck(cc_op, cpu_env, t1);
set_cc_static(s);
+
+ tcg_temp_free_i64(t1);
+
return DISAS_NEXT;
}
--
2.31.1
next reply other threads:[~2022-01-25 13:12 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-25 12:29 Nico Boehr [this message]
2022-01-25 13:13 ` [PATCH qemu] s390x: sck: load into a temporary not into in1 David Hildenbrand
2022-01-25 14:54 ` Nico Boehr
2022-01-25 16:42 ` Philippe Mathieu-Daudé via
2022-01-25 16:44 ` David Hildenbrand
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=20220125122914.567599-1-nrb@linux.ibm.com \
--to=nrb@linux.ibm.com \
--cc=david@redhat.com \
--cc=linux-s390@vger.kernel.org \
--cc=qemu-devel@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).