diff options
| author | Elliott Hughes <enh@google.com> | 2014-05-21 18:27:40 -0700 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2014-05-21 18:30:00 -0700 |
| commit | d5ed63a6a8290de88802172ce178656fbafe70c6 (patch) | |
| tree | 97bb7a00c975041f6e297fe7ff53a8b116f405bf /libc/arch-mips64 | |
| parent | f97d8713a265f44279819ba6b245dd81aada34da (diff) | |
| download | bionic-d5ed63a6a8290de88802172ce178656fbafe70c6.zip bionic-d5ed63a6a8290de88802172ce178656fbafe70c6.tar.gz bionic-d5ed63a6a8290de88802172ce178656fbafe70c6.tar.bz2 | |
Hide most of the private futex functions.
Also hide part of the system properties compatibility code, since
we needed to touch that to keep it building.
I'll remove __futex_syscall4 and futex in a later patch.
Bug: 11156955
Change-Id: Ibbf42414c5bb07fb9f1c4a169922844778e4eeae
Diffstat (limited to 'libc/arch-mips64')
| -rw-r--r-- | libc/arch-mips64/bionic/futex_mips.S | 82 |
1 files changed, 1 insertions, 81 deletions
diff --git a/libc/arch-mips64/bionic/futex_mips.S b/libc/arch-mips64/bionic/futex_mips.S index 81f2f22..60c218c 100644 --- a/libc/arch-mips64/bionic/futex_mips.S +++ b/libc/arch-mips64/bionic/futex_mips.S @@ -28,9 +28,6 @@ #include <private/bionic_asm.h> -#define FUTEX_WAIT 0 -#define FUTEX_WAKE 1 - #if (_MIPS_SIM == _ABIO32) || (_MIPS_SIM == _ABI32) FRAMESZ = MKFSIZ(NARGSAVE+2,0) FRAME_A4 = 4*REGSZ @@ -39,84 +36,6 @@ FRAME_A5 = 5*REGSZ FRAMESZ = 0 #endif -// int __futex_wait(volatile void* ftx, int val, const struct timespec* timeout) -LEAF(__futex_wait, FRAMESZ) -#if (_MIPS_SIM == _ABIO32) || (_MIPS_SIM == _ABI32) - PTR_SUBU sp, FRAMESZ - REG_S $0,FRAME_A5(sp) /* val3 */ - REG_S $0,FRAME_A4(sp) /* addr2 */ -#else - move a5,$0 /* val3 */ - move a4,$0 /* addr2 */ -#endif - move a3,a2 /* timespec */ - move a2,a1 /* val */ - LI a1,FUTEX_WAIT /* op */ -# move a0,a0 /* ftx */ - LI v0,__NR_futex - syscall - neg v0 /* Negate errno */ - bnez a3,1f /* Check for error */ - move v0,$0 /* Return 0 if no error */ -1: -#if (_MIPS_SIM == _ABIO32) || (_MIPS_SIM == _ABI32) - PTR_ADDU sp,FRAMESZ -#endif - j ra - END(__futex_wait) - -// int __futex_wake(volatile void* ftx, int count) -LEAF(__futex_wake,FRAMESZ) -#if (_MIPS_SIM == _ABIO32) || (_MIPS_SIM == _ABI32) - PTR_SUBU sp, FRAMESZ - REG_S $0,FRAME_A5(sp) /* val3 */ - REG_S $0,FRAME_A4(sp) /* addr2 */ -#else - move a5,$0 /* val3 */ - move a4,$0 /* addr2 */ -#endif - move a3,$0 /* timespec */ - move a2,a1 /* val */ - LI a1,FUTEX_WAKE /* op */ -# move a0,a0 /* ftx */ - LI v0,__NR_futex - syscall - neg v0 /* Negate errno */ - bnez a3,1f /* Check for error */ - move v0,$0 /* Return 0 if no error */ -1: -#if (_MIPS_SIM == _ABIO32) || (_MIPS_SIM == _ABI32) - PTR_ADDU sp,FRAMESZ -#endif - j ra - END(__futex_wake) - -// int __futex_syscall3(volatile void* ftx, int op, int count) -LEAF(__futex_syscall3,FRAMESZ) -#if (_MIPS_SIM == _ABIO32) || (_MIPS_SIM == _ABI32) - PTR_SUBU sp, FRAMESZ - REG_S $0,FRAME_A5(sp) /* val3 */ - REG_S $0,FRAME_A4(sp) /* addr2 */ -#else - move a5,$0 /* val3 */ - move a4,$0 /* addr2 */ -#endif - move a3,$0 /* timespec */ -# move a2,a2 /* val */ -# move a1,a1 /* op */ -# move a0,a0 /* ftx */ - LI v0,__NR_futex - syscall - neg v0 /* Negate errno */ - bnez a3,1f /* Check for error */ - move v0,$0 /* Return 0 if no error */ -1: -#if (_MIPS_SIM == _ABIO32) || (_MIPS_SIM == _ABI32) - PTR_ADDU sp,FRAMESZ -#endif - j ra - END(__futex_syscall3) - // int __futex_syscall4(volatile void* ftx, int op, int val, const struct timespec* timeout) LEAF(__futex_syscall4,FRAMESZ) #if (_MIPS_SIM == _ABIO32) || (_MIPS_SIM == _ABI32) @@ -142,3 +61,4 @@ LEAF(__futex_syscall4,FRAMESZ) #endif j ra END(__futex_syscall4) +.hidden __futex_syscall4 |