From b7809f369266d6cc1a253688f80a66bfbce9e6dd Mon Sep 17 00:00:00 2001 From: David Hildenbrand Date: Wed, 4 Sep 2019 11:30:29 +0200 Subject: [PATCH] s390x/tcg: MVC: Fault-safe handling on destructive overlaps The last remaining bit for MVC is handling destructive overlaps in a fault-safe way. Reviewed-by: Richard Henderson Signed-off-by: David Hildenbrand --- target/s390x/mem_helper.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/target/s390x/mem_helper.c b/target/s390x/mem_helper.c index 04c4228f1350..aed53a37daed 100644 --- a/target/s390x/mem_helper.c +++ b/target/s390x/mem_helper.c @@ -438,8 +438,9 @@ static uint32_t do_helper_mvc(CPUS390XState *env, uint32_t l, uint64_t dest, access_memmove(env, &desta, &srca, ra); } else { for (i = 0; i < l; i++) { - uint8_t x = cpu_ldub_data_ra(env, src + i, ra); - cpu_stb_data_ra(env, dest + i, x, ra); + uint8_t byte = access_get_byte(env, &srca, i, ra); + + access_set_byte(env, &desta, i, byte, ra); } }