Prefer https to http for gnu.org and fsf.org URLs

[thirdparty/glibc.git] / sysdeps / i386 / i686 / memmove.S

diff --git a/sysdeps/i386/i686/memmove.S b/sysdeps/i386/i686/memmove.S
index 951e139ad4a5b19d80f78368c2e1d71c75e43b9d..563bc71be52f4f3d609797d5330d900e2e742f4e 100644 (file)
--- a/sysdeps/i386/i686/memmove.S
+++ b/sysdeps/i386/i686/memmove.S
@@ -1,7 +1,7 @@
 /* Copy memory block and return pointer to beginning of destination block
    For Intel 80x86, x>=6.
    This file is part of the GNU C Library.
-   Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+   Copyright (C) 2003-2019 Free Software Foundation, Inc.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 2003.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -15,45 +15,51 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
 #include "asm-syntax.h"
-#include "bp-sym.h"
-#include "bp-asm.h"
 
-#define PARMS  LINKAGE+4       /* one spilled register */
+#define PARMS  4+4     /* one spilled register */
 #define RTN    PARMS
-#define DEST   RTN+RTN_SIZE
-#define SRC    DEST+PTR_SIZE
-#define LEN    SRC+PTR_SIZE
 
        .text
-#if defined PIC && !defined NOT_IN_libc
-ENTRY (__memmove_chk)
+
+#ifdef USE_AS_BCOPY
+# define SRC   RTN
+# define DEST  SRC+4
+# define LEN   DEST+4
+#else
+# define DEST  RTN
+# define SRC   DEST+4
+# define LEN   SRC+4
+
+# if defined PIC && IS_IN (libc)
+ENTRY_CHK (__memmove_chk)
        movl    12(%esp), %eax
        cmpl    %eax, 16(%esp)
        jb      HIDDEN_JUMPTARGET (__chk_fail)
-END (__memmove_chk)
+END_CHK (__memmove_chk)
+# endif
 #endif
-ENTRY (BP_SYM (memmove))
-       ENTER
+
+ENTRY (memmove)
 
        pushl   %edi
+       cfi_adjust_cfa_offset (4)
 
        movl    LEN(%esp), %ecx
        movl    DEST(%esp), %edi
+       cfi_rel_offset (edi, 0)
        movl    %esi, %edx
        movl    SRC(%esp), %esi
-       CHECK_BOUNDS_BOTH_WIDE (%edi, DEST(%esp), %ecx)
-       CHECK_BOUNDS_BOTH_WIDE (%esi, SRC(%esp), %ecx)
+       cfi_register (esi, edx)
 
        movl    %edi, %eax
        subl    %esi, %eax
-       cmpl    %eax, %edi
-       jae     3f
+       cmpl    %eax, %ecx
+       ja      3f
 
        cld
        shrl    $1, %ecx
@@ -65,13 +71,20 @@ ENTRY (BP_SYM (memmove))
 2:     rep
        movsl
        movl    %edx, %esi
+       cfi_restore (esi)
+#ifndef USE_AS_BCOPY
        movl    DEST(%esp), %eax
-       RETURN_BOUNDED_POINTER (DEST(%esp))
+#endif
 
        popl    %edi
+       cfi_adjust_cfa_offset (-4)
+       cfi_restore (edi)
 
-       LEAVE
-       RET_PTR
+       ret
+
+       cfi_adjust_cfa_offset (4)
+       cfi_rel_offset (edi, 0)
+       cfi_register (esi, edx)
 
        /* Backward copying.  */
 3:     std
@@ -90,13 +103,18 @@ ENTRY (BP_SYM (memmove))
        rep
        movsl
        movl    %edx, %esi
+       cfi_restore (esi)
+#ifndef USE_AS_BCOPY
        movl    DEST(%esp), %eax
-       RETURN_BOUNDED_POINTER (DEST(%esp))
+#endif
 
        cld
        popl    %edi
+       cfi_adjust_cfa_offset (-4)
+       cfi_restore (edi)
 
-       LEAVE
-       RET_PTR
-END (BP_SYM (memmove))
+       ret
+END (memmove)
+#ifndef USE_AS_BCOPY
 libc_hidden_builtin_def (memmove)
+#endif