Fixed incorrect use of mvcle introduced by 2001-07-12 change.

diff --git a/sysdeps/s390/s390-32/memcpy.S b/sysdeps/s390/s390-32/memcpy.S
index ad82f8a..1fa4652 100644 (file)
--- a/sysdeps/s390/s390-32/memcpy.S
+++ b/sysdeps/s390/s390-32/memcpy.S
@@ -49,8 +49,7 @@ ENTRY(memcpy)
        # data copies > 1MB are faster with mvcle.
 .L4:   ahi     %r4,1               # length + 1
        lr      %r5,%r4             # source length
        # data copies > 1MB are faster with mvcle.
 .L4:   ahi     %r4,1               # length + 1
        lr      %r5,%r4             # source length

-       lr      %r4,%r2             # source address
-       lr      %r2,%r3             # set destination
+       lr      %r4,%r3             # source address

        lr      %r3,%r5             # destination length = source length
 .L5:   mvcle   %r2,%r4,0           # thats it, MVCLE is your friend
        jo      .L5
        lr      %r3,%r5             # destination length = source length
 .L5:   mvcle   %r2,%r4,0           # thats it, MVCLE is your friend
        jo      .L5

diff --git a/sysdeps/s390/s390-64/memcpy.S b/sysdeps/s390/s390-64/memcpy.S
index d13c0ad..d8e0023 100644 (file)
--- a/sysdeps/s390/s390-64/memcpy.S
+++ b/sysdeps/s390/s390-64/memcpy.S
@@ -35,7 +35,7 @@ ENTRY(memcpy)
        srlg    %r5,%r4,8
        ltgr    %r5,%r5             # < 256 bytes to mvoe ?
        jz      .L1
        srlg    %r5,%r4,8
        ltgr    %r5,%r5             # < 256 bytes to mvoe ?
        jz      .L1

-       chi     %r6,255             # > 1 MB to move ?
+       chi     %r5,255             # > 1 MB to move ?

        jh      .L4
 .L0:   mvc     0(256,%r1),0(%r3)   # move in 256 byte chunks
        la      %r1,256(%r1)
        jh      .L4
 .L0:   mvc     0(256,%r1),0(%r3)   # move in 256 byte chunks
        la      %r1,256(%r1)


@@ -48,8 +48,7 @@ ENTRY(memcpy)
        # data copies > 1MB are faster with mvcle.
 .L4:   aghi    %r4,1               # length + 1
        lgr     %r5,%r4             # source length
        # data copies > 1MB are faster with mvcle.
 .L4:   aghi    %r4,1               # length + 1
        lgr     %r5,%r4             # source length

-       lgr     %r4,%r2             # source address
-       lgr     %r2,%r3             # set destination
+       lgr     %r4,%r3             # source address

        lgr     %r3,%r5             # destination length = source length
 .L5:   mvcle   %r2,%r4,0           # thats it, MVCLE is your friend
        jo      .L5
        lgr     %r3,%r5             # destination length = source length
 .L5:   mvcle   %r2,%r4,0           # thats it, MVCLE is your friend
        jo      .L5