Let's use the new helper, that also detects destructive overlaps when
wrapping.

Signed-off-by: David Hildenbrand <david@redhat.com>
---
 target/s390x/mem_helper.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/target/s390x/mem_helper.c b/target/s390x/mem_helper.c
index 2bc2cd09c1..3c23c403cd 100644
--- a/target/s390x/mem_helper.c
+++ b/target/s390x/mem_helper.c
@@ -330,7 +330,7 @@ static uint32_t do_helper_mvc(CPUS390XState *env, uint32_t l, uint64_t dest,
      */
     if (dest == src + 1) {
         fast_memset(env, dest, cpu_ldub_data_ra(env, src, ra), l, ra);
-    } else if (dest < src || src + l <= dest) {
+    } else if (!is_destructive_overlap(env, dest, src, l)) {
         fast_memmove(env, dest, src, l, ra);
     } else {
         for (i = 0; i < l; i++) {
-- 
2.21.0

On 9/6/19 3:57 AM, David Hildenbrand wrote:
>      if (dest == src + 1) {
>          fast_memset(env, dest, cpu_ldub_data_ra(env, src, ra), l, ra);
> -    } else if (dest < src || src + l <= dest) {
> +    } else if (!is_destructive_overlap(env, dest, src, l)) {
>          fast_memmove(env, dest, src, l, ra);
>      } else {
>          for (i = 0; i < l; i++) {

I suppose, though last time I checked fast_memmove didn't support wrapping.

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>

r~

On 11.09.19 16:54, Richard Henderson wrote:
> On 9/6/19 3:57 AM, David Hildenbrand wrote:
>>      if (dest == src + 1) {
>>          fast_memset(env, dest, cpu_ldub_data_ra(env, src, ra), l, ra);
>> -    } else if (dest < src || src + l <= dest) {
>> +    } else if (!is_destructive_overlap(env, dest, src, l)) {
>>          fast_memmove(env, dest, src, l, ra);
>>      } else {
>>          for (i = 0; i < l; i++) {
> 
> I suppose, though last time I checked fast_memmove didn't support wrapping.

Yes, that's fixed by access_prepare(), access_memmove(). Wrapping is/was
broken in most mem handlers ...

> 
> Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
> 
> r~
> 


-- 

Thanks,

David / dhildenb