diff options
| author | Christopher Ferris <cferris@google.com> | 2015-07-06 12:03:40 -0700 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2015-10-29 22:44:26 -0700 |
| commit | 544a9d40c3dbc6b1ba256f9557224f3049c1e033 (patch) | |
| tree | 92c711fcdfeaff6027125f3f7274edafaee76971 /libc/arch-arm/generic | |
| parent | 532bb31d8333fc8f51667e3d5ec20a4c3d23c294 (diff) | |
| download | bionic-544a9d40c3dbc6b1ba256f9557224f3049c1e033.zip bionic-544a9d40c3dbc6b1ba256f9557224f3049c1e033.tar.gz bionic-544a9d40c3dbc6b1ba256f9557224f3049c1e033.tar.bz2 | |
Replace bx lr with update of pc from the stack.
When there is arm assembler of this format:
ldmxx sp!, {..., lr} or pop {..., lr}
bx lr
It can be replaced with:
ldmxx sp!, {..., pc} or pop {..., pc}
Change-Id: Ic27048c52f90ac4360ad525daf0361a830dc22a3
Diffstat (limited to 'libc/arch-arm/generic')
| -rw-r--r-- | libc/arch-arm/generic/bionic/memcmp.S | 3 | ||||
| -rw-r--r-- | libc/arch-arm/generic/bionic/memcpy.S | 6 | ||||
| -rw-r--r-- | libc/arch-arm/generic/bionic/memset.S | 6 |
3 files changed, 5 insertions, 10 deletions
diff --git a/libc/arch-arm/generic/bionic/memcmp.S b/libc/arch-arm/generic/bionic/memcmp.S index c78dbd4..6643d55 100644 --- a/libc/arch-arm/generic/bionic/memcmp.S +++ b/libc/arch-arm/generic/bionic/memcmp.S @@ -221,8 +221,7 @@ ENTRY(memcmp) bne 8b 9: /* restore registers and return */ - ldmfd sp!, {r4, lr} - bx lr + ldmfd sp!, {r4, pc} 10: /* process less than 12 bytes */ cmp r2, #0 diff --git a/libc/arch-arm/generic/bionic/memcpy.S b/libc/arch-arm/generic/bionic/memcpy.S index ea5a399..65cba4c 100644 --- a/libc/arch-arm/generic/bionic/memcpy.S +++ b/libc/arch-arm/generic/bionic/memcpy.S @@ -194,8 +194,7 @@ ENTRY(memcpy) /* we're done! restore everything and return */ 1: ldmfd sp!, {r5-r11} - ldmfd sp!, {r0, r4, lr} - bx lr + ldmfd sp!, {r0, r4, pc} /********************************************************************/ @@ -385,8 +384,7 @@ ENTRY(memcpy) /* we're done! restore sp and spilled registers and return */ add sp, sp, #28 - ldmfd sp!, {r0, r4, lr} - bx lr + ldmfd sp!, {r0, r4, pc} END(memcpy) // Only reached when the __memcpy_chk check fails. diff --git a/libc/arch-arm/generic/bionic/memset.S b/libc/arch-arm/generic/bionic/memset.S index d17a9c4..b8eabbf 100644 --- a/libc/arch-arm/generic/bionic/memset.S +++ b/libc/arch-arm/generic/bionic/memset.S @@ -82,8 +82,7 @@ ENTRY(memset) strbcs r1, [r0], #1 strbmi r1, [r0], #1 subs r2, r2, r3 - popls {r0, r4-r7, lr} /* return */ - bxls lr + popls {r0, r4-r7, pc} /* return */ /* align the destination to a cache-line */ mov r12, r1 @@ -126,8 +125,7 @@ ENTRY(memset) strhmi r1, [r0], #2 movs r2, r2, lsl #2 strbcs r1, [r0] - ldmfd sp!, {r0, r4-r7, lr} - bx lr + ldmfd sp!, {r0, r4-r7, pc} END(memset) .data |