From: Ilya Leoshkevich Date: Mon, 24 Jul 2023 08:15:55 +0000 (+0200) Subject: target/s390x: Fix CLM with M3=0 X-Git-Tag: v8.0.4~43 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6bd56e0f82fbba142ec8572e44a4ea78a6c661c9;p=thirdparty%2Fqemu.git target/s390x: Fix CLM with M3=0 When the mask is zero, access exceptions should still be recognized for 1 byte at the second-operand address. CC should be set to 0. Cc: qemu-stable@nongnu.org Fixes: defb0e3157af ("s390x: Implement opcode helpers") Reviewed-by: David Hildenbrand Reviewed-by: Richard Henderson Signed-off-by: Ilya Leoshkevich Message-Id: <20230724082032.66864-3-iii@linux.ibm.com> Signed-off-by: Thomas Huth (cherry picked from commit 4b6e4c0b8223681ae85462794848db4386de1a8d) Signed-off-by: Michael Tokarev --- diff --git a/target/s390x/tcg/mem_helper.c b/target/s390x/tcg/mem_helper.c index 51894f17f56..541859afe7b 100644 --- a/target/s390x/tcg/mem_helper.c +++ b/target/s390x/tcg/mem_helper.c @@ -667,6 +667,11 @@ uint32_t HELPER(clm)(CPUS390XState *env, uint32_t r1, uint32_t mask, HELPER_LOG("%s: r1 0x%x mask 0x%x addr 0x%" PRIx64 "\n", __func__, r1, mask, addr); + if (!mask) { + /* Recognize access exceptions for the first byte */ + probe_read(env, addr, 1, cpu_mmu_index(env, false), ra); + } + while (mask) { if (mask & 8) { uint8_t d = cpu_ldub_data_ra(env, addr, ra);