diff options
author | Joseph Myers <joseph@codesourcery.com> | 2013-02-21 22:21:52 +0000 |
---|---|---|
committer | Joseph Myers <joseph@codesourcery.com> | 2013-02-21 22:21:52 +0000 |
commit | 2366713d874342c94f9362b0d6b2461e1c68dbc3 (patch) | |
tree | 4e46c602c175d0487a7ab45a9ed178fac38abbe5 /sysdeps/i386/i586 | |
parent | 9bf95cbc357fc0c6597be223f66259a91b1e9bb0 (diff) | |
download | glibc-2366713d874342c94f9362b0d6b2461e1c68dbc3.zip glibc-2366713d874342c94f9362b0d6b2461e1c68dbc3.tar.gz glibc-2366713d874342c94f9362b0d6b2461e1c68dbc3.tar.bz2 |
Remove remaining bounded-pointers support from i386 .S files.
Diffstat (limited to 'sysdeps/i386/i586')
-rw-r--r-- | sysdeps/i386/i586/add_n.S | 14 | ||||
-rw-r--r-- | sysdeps/i386/i586/addmul_1.S | 12 | ||||
-rw-r--r-- | sysdeps/i386/i586/bzero.S | 2 | ||||
-rw-r--r-- | sysdeps/i386/i586/lshift.S | 12 | ||||
-rw-r--r-- | sysdeps/i386/i586/memcpy.S | 16 | ||||
-rw-r--r-- | sysdeps/i386/i586/mempcpy.S | 4 | ||||
-rw-r--r-- | sysdeps/i386/i586/memset.S | 16 | ||||
-rw-r--r-- | sysdeps/i386/i586/mul_1.S | 12 | ||||
-rw-r--r-- | sysdeps/i386/i586/rshift.S | 12 | ||||
-rw-r--r-- | sysdeps/i386/i586/strchr.S | 16 | ||||
-rw-r--r-- | sysdeps/i386/i586/strcpy.S | 15 | ||||
-rw-r--r-- | sysdeps/i386/i586/strlen.S | 8 | ||||
-rw-r--r-- | sysdeps/i386/i586/sub_n.S | 14 | ||||
-rw-r--r-- | sysdeps/i386/i586/submul_1.S | 12 |
14 files changed, 70 insertions, 95 deletions
diff --git a/sysdeps/i386/i586/add_n.S b/sysdeps/i386/i586/add_n.S index e06893c..2d6161f 100644 --- a/sysdeps/i386/i586/add_n.S +++ b/sysdeps/i386/i586/add_n.S @@ -19,17 +19,15 @@ #include "sysdep.h" #include "asm-syntax.h" -#include "bp-sym.h" -#include "bp-asm.h" -#define PARMS LINKAGE+16 /* space for 4 saved regs */ +#define PARMS 4+16 /* space for 4 saved regs */ #define RES PARMS -#define S1 RES+PTR_SIZE -#define S2 S1+PTR_SIZE -#define SIZE S2+PTR_SIZE +#define S1 RES+4 +#define S2 S1+4 +#define SIZE S2+4 .text -ENTRY (BP_SYM (__mpn_add_n)) +ENTRY (__mpn_add_n) pushl %edi cfi_adjust_cfa_offset (4) @@ -142,4 +140,4 @@ L(end2): cfi_restore (edi) ret -END (BP_SYM (__mpn_add_n)) +END (__mpn_add_n) diff --git a/sysdeps/i386/i586/addmul_1.S b/sysdeps/i386/i586/addmul_1.S index cdb8ddd..e18e405 100644 --- a/sysdeps/i386/i586/addmul_1.S +++ b/sysdeps/i386/i586/addmul_1.S @@ -19,13 +19,11 @@ #include "sysdep.h" #include "asm-syntax.h" -#include "bp-sym.h" -#include "bp-asm.h" -#define PARMS LINKAGE+16 /* space for 4 saved regs */ +#define PARMS 4+16 /* space for 4 saved regs */ #define RES PARMS -#define S1 RES+PTR_SIZE -#define SIZE S1+PTR_SIZE +#define S1 RES+4 +#define SIZE S1+4 #define S2LIMB SIZE+4 #define res_ptr edi @@ -34,7 +32,7 @@ #define s2_limb ebx .text -ENTRY (BP_SYM (__mpn_addmul_1)) +ENTRY (__mpn_addmul_1) pushl %res_ptr cfi_adjust_cfa_offset (4) @@ -93,4 +91,4 @@ L(oop): adcl $0, %ebp ret #undef size -END (BP_SYM (__mpn_addmul_1)) +END (__mpn_addmul_1) diff --git a/sysdeps/i386/i586/bzero.S b/sysdeps/i386/i586/bzero.S index 220aa47..84d2f70 100644 --- a/sysdeps/i386/i586/bzero.S +++ b/sysdeps/i386/i586/bzero.S @@ -1,3 +1,3 @@ #define memset __bzero #include <sysdeps/i386/i586/memset.S> -weak_alias (BP_SYM (__bzero), BP_SYM (bzero)) +weak_alias (__bzero, bzero) diff --git a/sysdeps/i386/i586/lshift.S b/sysdeps/i386/i586/lshift.S index de680fc..cda3aec 100644 --- a/sysdeps/i386/i586/lshift.S +++ b/sysdeps/i386/i586/lshift.S @@ -18,17 +18,15 @@ #include "sysdep.h" #include "asm-syntax.h" -#include "bp-sym.h" -#include "bp-asm.h" -#define PARMS LINKAGE+16 /* space for 4 saved regs */ +#define PARMS 4+16 /* space for 4 saved regs */ #define RES PARMS -#define S RES+PTR_SIZE -#define SIZE S+PTR_SIZE +#define S RES+4 +#define SIZE S+4 #define CNT SIZE+4 .text -ENTRY (BP_SYM (__mpn_lshift)) +ENTRY (__mpn_lshift) pushl %edi cfi_adjust_cfa_offset (4) @@ -254,4 +252,4 @@ L(L1): movl %edx,(%edi) /* store last limb */ cfi_restore (edi) ret -END (BP_SYM (__mpn_lshift)) +END (__mpn_lshift) diff --git a/sysdeps/i386/i586/memcpy.S b/sysdeps/i386/i586/memcpy.S index 1ad8684..49f1652 100644 --- a/sysdeps/i386/i586/memcpy.S +++ b/sysdeps/i386/i586/memcpy.S @@ -19,19 +19,17 @@ #include <sysdep.h> #include "asm-syntax.h" -#include "bp-sym.h" -#include "bp-asm.h" /* BEWARE: `#ifdef memcpy' means that memcpy is redefined as `mempcpy', and the return value is the byte after the last one copied in the destination. */ #define MEMPCPY_P (defined memcpy) -#define PARMS LINKAGE+8 /* space for 2 saved regs */ +#define PARMS 4+8 /* space for 2 saved regs */ #define RTN PARMS -#define DEST RTN+RTN_SIZE -#define SRC DEST+PTR_SIZE -#define LEN SRC+PTR_SIZE +#define DEST RTN +#define SRC DEST+4 +#define LEN SRC+4 .text #if defined PIC && !defined NOT_IN_libc @@ -41,7 +39,7 @@ ENTRY (__memcpy_chk) jb HIDDEN_JUMPTARGET (__chk_fail) END (__memcpy_chk) #endif -ENTRY (BP_SYM (memcpy)) +ENTRY (memcpy) pushl %edi cfi_adjust_cfa_offset (4) @@ -124,8 +122,8 @@ L(1): rep; movsb cfi_adjust_cfa_offset (-4) cfi_restore (edi) - RET_PTR -END (BP_SYM (memcpy)) + ret +END (memcpy) #if !MEMPCPY_P libc_hidden_builtin_def (memcpy) #endif diff --git a/sysdeps/i386/i586/mempcpy.S b/sysdeps/i386/i586/mempcpy.S index f492be7..afc112d 100644 --- a/sysdeps/i386/i586/mempcpy.S +++ b/sysdeps/i386/i586/mempcpy.S @@ -2,6 +2,6 @@ #define __memcpy_chk __mempcpy_chk #include <sysdeps/i386/i586/memcpy.S> -libc_hidden_def (BP_SYM (__mempcpy)) -weak_alias (BP_SYM (__mempcpy), BP_SYM (mempcpy)) +libc_hidden_def (__mempcpy) +weak_alias (__mempcpy, mempcpy) libc_hidden_builtin_def (mempcpy) diff --git a/sysdeps/i386/i586/memset.S b/sysdeps/i386/i586/memset.S index 728e12a..c194b10 100644 --- a/sysdeps/i386/i586/memset.S +++ b/sysdeps/i386/i586/memset.S @@ -20,19 +20,17 @@ #include <sysdep.h> #include "asm-syntax.h" -#include "bp-sym.h" -#include "bp-asm.h" /* BEWARE: `#ifdef memset' means that memset is redefined as `bzero' */ #define BZERO_P (defined memset) -#define PARMS LINKAGE+4 /* space for 1 saved reg */ +#define PARMS 4+4 /* space for 1 saved reg */ #define RTN PARMS -#define DEST RTN+RTN_SIZE +#define DEST RTN #if BZERO_P -# define LEN DEST+PTR_SIZE +# define LEN DEST+4 #else -# define CHR DEST+PTR_SIZE +# define CHR DEST+4 # define LEN CHR+4 #endif @@ -44,7 +42,7 @@ ENTRY (__memset_chk) jb HIDDEN_JUMPTARGET (__chk_fail) END (__memset_chk) #endif -ENTRY (BP_SYM (memset)) +ENTRY (memset) pushl %edi cfi_adjust_cfa_offset (4) @@ -117,7 +115,7 @@ L(2): shrl $2, %ecx /* convert byte count to longword count */ #if BZERO_P ret #else - RET_PTR + ret #endif -END (BP_SYM (memset)) +END (memset) libc_hidden_builtin_def (memset) diff --git a/sysdeps/i386/i586/mul_1.S b/sysdeps/i386/i586/mul_1.S index 6965e8b..f5bbea2 100644 --- a/sysdeps/i386/i586/mul_1.S +++ b/sysdeps/i386/i586/mul_1.S @@ -19,13 +19,11 @@ #include "sysdep.h" #include "asm-syntax.h" -#include "bp-sym.h" -#include "bp-asm.h" -#define PARMS LINKAGE+16 /* space for 4 saved regs */ +#define PARMS 4+16 /* space for 4 saved regs */ #define RES PARMS -#define S1 RES+PTR_SIZE -#define SIZE S1+PTR_SIZE +#define S1 RES+4 +#define SIZE S1+4 #define S2LIMB SIZE+4 #define res_ptr edi @@ -34,7 +32,7 @@ #define s2_limb ebx .text -ENTRY (BP_SYM (__mpn_mul_1)) +ENTRY (__mpn_mul_1) pushl %res_ptr cfi_adjust_cfa_offset (4) @@ -89,4 +87,4 @@ L(oop): adcl $0, %ebp ret #undef size -END (BP_SYM (__mpn_mul_1)) +END (__mpn_mul_1) diff --git a/sysdeps/i386/i586/rshift.S b/sysdeps/i386/i586/rshift.S index bec72b0..37eff12 100644 --- a/sysdeps/i386/i586/rshift.S +++ b/sysdeps/i386/i586/rshift.S @@ -18,17 +18,15 @@ #include "sysdep.h" #include "asm-syntax.h" -#include "bp-sym.h" -#include "bp-asm.h" -#define PARMS LINKAGE+16 /* space for 4 saved regs */ +#define PARMS 4+16 /* space for 4 saved regs */ #define RES PARMS -#define S RES+PTR_SIZE -#define SIZE S+PTR_SIZE +#define S RES+4 +#define SIZE S+4 #define CNT SIZE+4 .text -ENTRY (BP_SYM (__mpn_rshift)) +ENTRY (__mpn_rshift) pushl %edi cfi_adjust_cfa_offset (4) @@ -254,4 +252,4 @@ L(L1): movl %edx,(%edi) /* store last limb */ cfi_restore (edi) ret -END (BP_SYM (__mpn_rshift)) +END (__mpn_rshift) diff --git a/sysdeps/i386/i586/strchr.S b/sysdeps/i386/i586/strchr.S index e2dfa20..648d528 100644 --- a/sysdeps/i386/i586/strchr.S +++ b/sysdeps/i386/i586/strchr.S @@ -20,8 +20,6 @@ #include <sysdep.h> #include "asm-syntax.h" -#include "bp-sym.h" -#include "bp-asm.h" /* This version is especially optimized for the i586 (and following?) processors. This is mainly done by using the two pipelines. The @@ -36,13 +34,13 @@ /* The magic value which is used throughout in the whole code. */ #define magic 0xfefefeff -#define PARMS LINKAGE+16 /* space for 4 saved regs */ +#define PARMS 4+16 /* space for 4 saved regs */ #define RTN PARMS -#define STR RTN+RTN_SIZE -#define CHR STR+PTR_SIZE +#define STR RTN +#define CHR STR+4 .text -ENTRY (BP_SYM (strchr)) +ENTRY (strchr) pushl %edi /* Save callee-safe registers. */ cfi_adjust_cfa_offset (-4) @@ -301,7 +299,7 @@ L(out): popl %ebp /* restore saved registers */ cfi_adjust_cfa_offset (-4) cfi_restore (edi) - RET_PTR + ret cfi_adjust_cfa_offset (16) cfi_rel_offset (edi, 12) @@ -343,8 +341,8 @@ L(4): subl $4, %eax /* adjust pointer */ L(3): xorl %eax, %eax jmp L(out) -END (BP_SYM (strchr)) +END (strchr) #undef index -weak_alias (BP_SYM (strchr), BP_SYM (index)) +weak_alias (strchr, index) libc_hidden_builtin_def (strchr) diff --git a/sysdeps/i386/i586/strcpy.S b/sysdeps/i386/i586/strcpy.S index c5a4ce7..c940369 100644 --- a/sysdeps/i386/i586/strcpy.S +++ b/sysdeps/i386/i586/strcpy.S @@ -19,13 +19,11 @@ #include <sysdep.h> #include "asm-syntax.h" -#include "bp-sym.h" -#include "bp-asm.h" -#define PARMS LINKAGE+12 /* space for 3 saved regs */ +#define PARMS 4+12 /* space for 3 saved regs */ #define RTN PARMS -#define DEST RTN+RTN_SIZE -#define SRC DEST+PTR_SIZE +#define DEST RTN +#define SRC DEST+4 #ifndef USE_AS_STPCPY # define STRCPY strcpy @@ -34,7 +32,7 @@ #define magic 0xfefefeff .text -ENTRY (BP_SYM (STRCPY)) +ENTRY (STRCPY) pushl %edi cfi_adjust_cfa_offset (4) @@ -149,7 +147,6 @@ L(4): movb %dl, (%edi) L(end): movb %ah, (%edi) L(end2): - /* GKM FIXME: check high bounds */ #ifdef USE_AS_STPCPY movl %edi, %eax #else @@ -165,8 +162,8 @@ L(end2): cfi_adjust_cfa_offset (-4) cfi_restore (edi) - RET_PTR -END (BP_SYM (STRCPY)) + ret +END (STRCPY) #ifndef USE_AS_STPCPY libc_hidden_builtin_def (strcpy) #endif diff --git a/sysdeps/i386/i586/strlen.S b/sysdeps/i386/i586/strlen.S index c076343..b50fffa 100644 --- a/sysdeps/i386/i586/strlen.S +++ b/sysdeps/i386/i586/strlen.S @@ -20,8 +20,6 @@ #include <sysdep.h> #include "asm-syntax.h" -#include "bp-sym.h" -#include "bp-asm.h" /* This version is especially optimized for the i586 (and following?) processors. This is mainly done by using the two pipelines. The @@ -36,11 +34,11 @@ /* The magic value which is used throughout in the whole code. */ #define magic 0xfefefeff -#define PARMS LINKAGE /* no space for saved regs */ +#define PARMS 4 /* no space for saved regs */ #define STR PARMS .text -ENTRY (BP_SYM (strlen)) +ENTRY (strlen) movl STR(%esp), %eax movl $3, %edx /* load mask (= 3) */ @@ -180,5 +178,5 @@ L(2): subl STR(%esp), %eax /* now compute the length as difference between start and terminating NUL character */ ret -END (BP_SYM (strlen)) +END (strlen) libc_hidden_builtin_def (strlen) diff --git a/sysdeps/i386/i586/sub_n.S b/sysdeps/i386/i586/sub_n.S index 1440648..3b40ff3 100644 --- a/sysdeps/i386/i586/sub_n.S +++ b/sysdeps/i386/i586/sub_n.S @@ -19,17 +19,15 @@ #include "sysdep.h" #include "asm-syntax.h" -#include "bp-sym.h" -#include "bp-asm.h" -#define PARMS LINKAGE+16 /* space for 4 saved regs */ +#define PARMS 4+16 /* space for 4 saved regs */ #define RES PARMS -#define S1 RES+PTR_SIZE -#define S2 S1+PTR_SIZE -#define SIZE S2+PTR_SIZE +#define S1 RES+4 +#define S2 S1+4 +#define SIZE S2+4 .text -ENTRY (BP_SYM (__mpn_sub_n)) +ENTRY (__mpn_sub_n) pushl %edi cfi_adjust_cfa_offset (4) @@ -142,4 +140,4 @@ L(end2): cfi_restore (edi) ret -END (BP_SYM (__mpn_sub_n)) +END (__mpn_sub_n) diff --git a/sysdeps/i386/i586/submul_1.S b/sysdeps/i386/i586/submul_1.S index cf4fcf0..97a9048 100644 --- a/sysdeps/i386/i586/submul_1.S +++ b/sysdeps/i386/i586/submul_1.S @@ -19,13 +19,11 @@ #include "sysdep.h" #include "asm-syntax.h" -#include "bp-sym.h" -#include "bp-asm.h" -#define PARMS LINKAGE+16 /* space for 4 saved regs */ +#define PARMS 4+16 /* space for 4 saved regs */ #define RES PARMS -#define S1 RES+PTR_SIZE -#define SIZE S1+PTR_SIZE +#define S1 RES+4 +#define SIZE S1+4 #define S2LIMB SIZE+4 #define res_ptr edi @@ -34,7 +32,7 @@ #define s2_limb ebx .text -ENTRY (BP_SYM (__mpn_submul_1)) +ENTRY (__mpn_submul_1) pushl %res_ptr cfi_adjust_cfa_offset (4) @@ -93,4 +91,4 @@ L(oop): adcl $0, %ebp ret #undef size -END (BP_SYM (__mpn_submul_1)) +END (__mpn_submul_1) |