am 4d87e743: Merge "Eliminate text relocations in x86 optimized memset versions"

* commit '4d87e743083c201edd0b565dd7d42e70945a6265':
  Eliminate text relocations in x86 optimized memset versions
This commit is contained in:
Elliott Hughes 2013-10-24 12:33:40 -07:00 committed by Android Git Automerger
commit c3d04aab96
2 changed files with 8 additions and 8 deletions

8
libcutils/arch-x86/sse2-memset16-atom.S Normal file → Executable file
View file

@ -86,7 +86,7 @@ name: \
# define SETRTNVAL movl DEST(%esp), %eax # define SETRTNVAL movl DEST(%esp), %eax
#endif #endif
#ifdef SHARED #if (defined SHARED || defined __PIC__)
# define ENTRANCE PUSH (%ebx); # define ENTRANCE PUSH (%ebx);
# define RETURN_END POP (%ebx); ret # define RETURN_END POP (%ebx); ret
# define RETURN RETURN_END; CFI_PUSH (%ebx) # define RETURN RETURN_END; CFI_PUSH (%ebx)
@ -344,7 +344,7 @@ L(128bytesormore):
PUSH (%ebx) PUSH (%ebx)
mov $SHARED_CACHE_SIZE, %ebx mov $SHARED_CACHE_SIZE, %ebx
#else #else
# ifdef SHARED # if (defined SHARED || defined __PIC__)
call __i686.get_pc_thunk.bx call __i686.get_pc_thunk.bx
add $_GLOBAL_OFFSET_TABLE_, %ebx add $_GLOBAL_OFFSET_TABLE_, %ebx
mov __x86_shared_cache_size@GOTOFF(%ebx), %ebx mov __x86_shared_cache_size@GOTOFF(%ebx), %ebx
@ -362,7 +362,7 @@ L(128bytesormore):
# define RESTORE_EBX_STATE CFI_PUSH (%ebx) # define RESTORE_EBX_STATE CFI_PUSH (%ebx)
cmp $DATA_CACHE_SIZE, %ecx cmp $DATA_CACHE_SIZE, %ecx
#else #else
# ifdef SHARED # if (defined SHARED || defined __PIC__)
# define RESTORE_EBX_STATE # define RESTORE_EBX_STATE
call __i686.get_pc_thunk.bx call __i686.get_pc_thunk.bx
add $_GLOBAL_OFFSET_TABLE_, %ebx add $_GLOBAL_OFFSET_TABLE_, %ebx
@ -471,7 +471,7 @@ L(128bytesormore_nt):
jae L(128bytesormore_nt) jae L(128bytesormore_nt)
sfence sfence
L(shared_cache_loop_end): L(shared_cache_loop_end):
#if defined DATA_CACHE_SIZE || !defined SHARED #if defined DATA_CACHE_SIZE || !(defined SHARED || defined __PIC__)
POP (%ebx) POP (%ebx)
#endif #endif
add %ecx, %edx add %ecx, %edx

8
libcutils/arch-x86/sse2-memset32-atom.S Normal file → Executable file
View file

@ -86,7 +86,7 @@ name: \
# define SETRTNVAL # define SETRTNVAL
#endif #endif
#ifdef SHARED #if (defined SHARED || defined __PIC__)
# define ENTRANCE PUSH (%ebx); # define ENTRANCE PUSH (%ebx);
# define RETURN_END POP (%ebx); ret # define RETURN_END POP (%ebx); ret
# define RETURN RETURN_END; CFI_PUSH (%ebx) # define RETURN RETURN_END; CFI_PUSH (%ebx)
@ -259,7 +259,7 @@ L(128bytesormore):
PUSH (%ebx) PUSH (%ebx)
mov $SHARED_CACHE_SIZE, %ebx mov $SHARED_CACHE_SIZE, %ebx
#else #else
# ifdef SHARED # if (defined SHARED || defined __PIC__)
call __i686.get_pc_thunk.bx call __i686.get_pc_thunk.bx
add $_GLOBAL_OFFSET_TABLE_, %ebx add $_GLOBAL_OFFSET_TABLE_, %ebx
mov __x86_shared_cache_size@GOTOFF(%ebx), %ebx mov __x86_shared_cache_size@GOTOFF(%ebx), %ebx
@ -276,7 +276,7 @@ L(128bytesormore):
# define RESTORE_EBX_STATE CFI_PUSH (%ebx) # define RESTORE_EBX_STATE CFI_PUSH (%ebx)
cmp $DATA_CACHE_SIZE, %ecx cmp $DATA_CACHE_SIZE, %ecx
#else #else
# ifdef SHARED # if (defined SHARED || defined __PIC__)
# define RESTORE_EBX_STATE # define RESTORE_EBX_STATE
call __i686.get_pc_thunk.bx call __i686.get_pc_thunk.bx
add $_GLOBAL_OFFSET_TABLE_, %ebx add $_GLOBAL_OFFSET_TABLE_, %ebx
@ -386,7 +386,7 @@ L(128bytesormore_nt):
jae L(128bytesormore_nt) jae L(128bytesormore_nt)
sfence sfence
L(shared_cache_loop_end): L(shared_cache_loop_end):
#if defined DATA_CACHE_SIZE || !defined SHARED #if defined DATA_CACHE_SIZE || !(defined SHARED || defined __PIC__)
POP (%ebx) POP (%ebx)
#endif #endif
add %ecx, %edx add %ecx, %edx