| Message ID | 20230704081506.276055-1-iii@linux.ibm.com (mailing list archive) |
|---|---|
| Headers | show |
| Series | target/s390x: Miscellaneous TCG fixes | expand |
On 04.07.23 10:12, Ilya Leoshkevich wrote: > When a DAT error occurs, LRA is supposed to write the error information > to the bottom 32 bits of R1, and leave the top 32 bits of R1 alone. > > Fix by passing the original value of R1 into helper and copying the > top 32 bits to the return value. > > Fixes: d8fe4a9c284f ("target-s390: Convert LRA") > Cc: qemu-stable@nongnu.org > Signed-off-by: Ilya Leoshkevich <iii@linux.ibm.com> > --- > target/s390x/helper.h | 2 +- > target/s390x/tcg/mem_helper.c | 4 ++-- > target/s390x/tcg/translate.c | 2 +- > 3 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/target/s390x/helper.h b/target/s390x/helper.h > index 6bc01df73d7..05102578fc9 100644 > --- a/target/s390x/helper.h > +++ b/target/s390x/helper.h > @@ -355,7 +355,7 @@ DEF_HELPER_FLAGS_4(idte, TCG_CALL_NO_RWG, void, env, i64, i64, i32) > DEF_HELPER_FLAGS_4(ipte, TCG_CALL_NO_RWG, void, env, i64, i64, i32) > DEF_HELPER_FLAGS_1(ptlb, TCG_CALL_NO_RWG, void, env) > DEF_HELPER_FLAGS_1(purge, TCG_CALL_NO_RWG, void, env) > -DEF_HELPER_2(lra, i64, env, i64) > +DEF_HELPER_3(lra, i64, env, i64, i64) > DEF_HELPER_1(per_check_exception, void, env) > DEF_HELPER_FLAGS_3(per_branch, TCG_CALL_NO_RWG, void, env, i64, i64) > DEF_HELPER_FLAGS_2(per_ifetch, TCG_CALL_NO_RWG, void, env, i64) > diff --git a/target/s390x/tcg/mem_helper.c b/target/s390x/tcg/mem_helper.c > index 84ad85212c9..f417fb1183c 100644 > --- a/target/s390x/tcg/mem_helper.c > +++ b/target/s390x/tcg/mem_helper.c > @@ -2356,7 +2356,7 @@ void HELPER(purge)(CPUS390XState *env) > } > > /* load real address */ > -uint64_t HELPER(lra)(CPUS390XState *env, uint64_t addr) > +uint64_t HELPER(lra)(CPUS390XState *env, uint64_t r1, uint64_t addr) > { > uint64_t asc = env->psw.mask & PSW_MASK_ASC; > uint64_t ret, tec; > @@ -2370,7 +2370,7 @@ uint64_t HELPER(lra)(CPUS390XState *env, uint64_t addr) > exc = mmu_translate(env, addr, MMU_S390_LRA, asc, &ret, &flags, &tec); > if (exc) { > cc = 3; > - ret = exc | 0x80000000; > + ret = (r1 & 0xFFFFFFFF00000000ULL) | exc | 0x80000000; > } else { > cc = 0; > ret |= addr & ~TARGET_PAGE_MASK; > diff --git a/target/s390x/tcg/translate.c b/target/s390x/tcg/translate.c > index 0cef6efbef4..a6079ab7b4f 100644 > --- a/target/s390x/tcg/translate.c > +++ b/target/s390x/tcg/translate.c > @@ -2932,7 +2932,7 @@ static DisasJumpType op_lctlg(DisasContext *s, DisasOps *o) > > static DisasJumpType op_lra(DisasContext *s, DisasOps *o) > { > - gen_helper_lra(o->out, cpu_env, o->in2); > + gen_helper_lra(o->out, cpu_env, o->out, o->in2); > set_cc_static(s); > return DISAS_NEXT; > } Reviewed-by: David Hildenbrand <david@redhat.com>
v1: https://lists.gnu.org/archive/html/qemu-devel/2023-07/msg00454.html v1 -> v2: Add ULL for a large constant (David). Add a comment explaining the usage of ALGFI in the LARL test. Hi, Randomized testing found a number of issues in the s390x emulation. This series fixes 6 of them (patches 2-7) and adds tests (patches 8-12); patch 1 is a cosmetic improvement needed for the EPSW test. There are more issues, but I thought it would be better to send this batch now. Best regards, Ilya Ilya Leoshkevich (12): linux-user: elfload: Add more initial s390x PSW bits target/s390x: Fix EPSW CC reporting target/s390x: Fix MDEB and MDEBR target/s390x: Fix MVCRL with a large value in R0 target/s390x: Fix LRA overwriting the top 32 bits on DAT error target/s390x: Fix LRA when DAT is off target/s390x: Fix relative long instructions with large offsets tests/tcg/s390x: Test EPSW tests/tcg/s390x: Test LARL with a large offset tests/tcg/s390x: Test LRA tests/tcg/s390x: Test MDEB and MDEBR tests/tcg/s390x: Test MVCRL with a large value in R0 linux-user/elfload.c | 4 ++- target/s390x/helper.h | 2 +- target/s390x/mmu_helper.c | 2 +- target/s390x/tcg/fpu_helper.c | 3 +- target/s390x/tcg/insn-data.h.inc | 4 +-- target/s390x/tcg/mem_helper.c | 5 +-- target/s390x/tcg/translate.c | 8 +++-- tests/tcg/s390x/Makefile.softmmu-target | 1 + tests/tcg/s390x/Makefile.target | 3 ++ tests/tcg/s390x/epsw.c | 23 +++++++++++++ tests/tcg/s390x/larl.c | 21 +++++++++++ tests/tcg/s390x/lra.S | 19 ++++++++++ tests/tcg/s390x/mdeb.c | 30 ++++++++++++++++ tests/tcg/s390x/mie3-mvcrl.c | 46 +++++++++++++++++++------ 14 files changed, 151 insertions(+), 20 deletions(-) create mode 100644 tests/tcg/s390x/epsw.c create mode 100644 tests/tcg/s390x/larl.c create mode 100644 tests/tcg/s390x/lra.S create mode 100644 tests/tcg/s390x/mdeb.c