diff options
| author | Nico Boehr <nrb@linux.ibm.com> | 2022-01-26 09:42:01 +0100 |
|---|---|---|
| committer | Thomas Huth <thuth@redhat.com> | 2022-02-25 13:31:37 +0100 |
| commit | 2092fdd97c27c0d6ef4bd0958fde0f6522100dcc (patch) | |
| tree | 52ed7cf7be726a46f9358d167005cce25fa1083e /target/s390x | |
| parent | fa435db8ce1dff3b15e3f59a12f55f7b3a347b08 (diff) | |
| download | qemu-2092fdd97c27c0d6ef4bd0958fde0f6522100dcc.zip qemu-2092fdd97c27c0d6ef4bd0958fde0f6522100dcc.tar.gz qemu-2092fdd97c27c0d6ef4bd0958fde0f6522100dcc.tar.bz2 | |
s390x: sck: load into a temporary not into in1
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, use in2_la2_m64a to load from storage into in2 and pass that to
the helper, which matches what we already do for SCKC.
This fixes the SCK test I sent here under TCG:
<https://www.spinics.net/lists/kvm/msg265169.html>
Fixes: 9dc67537 ("s390x/tcg: implement SET CLOCK ")
Suggested-by: David Hildenbrand <david@redhat.com>
Signed-off-by: Nico Boehr <nrb@linux.ibm.com>
Message-Id: <20220126084201.774457-1-nrb@linux.ibm.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
Diffstat (limited to 'target/s390x')
| -rw-r--r-- | target/s390x/tcg/insn-data.def | 2 | ||||
| -rw-r--r-- | target/s390x/tcg/translate.c | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/target/s390x/tcg/insn-data.def b/target/s390x/tcg/insn-data.def index 1c3e115..4911952 100644 --- a/target/s390x/tcg/insn-data.def +++ b/target/s390x/tcg/insn-data.def @@ -1317,7 +1317,7 @@ /* SET ADDRESS SPACE CONTROL FAST */ F(0xb279, SACF, S, Z, 0, a2, 0, 0, sacf, 0, IF_PRIV) /* SET CLOCK */ - F(0xb204, SCK, S, Z, la2, 0, 0, 0, sck, 0, IF_PRIV | IF_IO) + F(0xb204, SCK, S, Z, 0, m2_64a, 0, 0, sck, 0, IF_PRIV | IF_IO) /* SET CLOCK COMPARATOR */ F(0xb206, SCKC, S, Z, 0, m2_64a, 0, 0, sckc, 0, IF_PRIV | IF_IO) /* SET CLOCK PROGRAMMABLE FIELD */ diff --git a/target/s390x/tcg/translate.c b/target/s390x/tcg/translate.c index 46dea73..e21da53 100644 --- a/target/s390x/tcg/translate.c +++ b/target/s390x/tcg/translate.c @@ -4290,8 +4290,7 @@ 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); + gen_helper_sck(cc_op, cpu_env, o->in2); set_cc_static(s); return DISAS_NEXT; } |