generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Remove deprecated use of ldm/stm in ARM setjmp."

Browse Source
This commit is contained in:
Josh Gao 2015-10-20 01:01:19 +00:00 committed by Gerrit Code Review
commit f5ea085844
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libc/arch-arm/bionic/setjmp.S
View File

@ -151,7 +151,10 @@ ENTRY(sigsetjmp)
// Save core registers. // Save core registers.
add r1, r0, #(_JB_CORE_BASE * 4) add r1, r0, #(_JB_CORE_BASE * 4)
m_mangle_registers r2 m_mangle_registers r2
stmia r1, {r4-r14}
// ARM deprecates using sp in the register list for stmia.
stmia r1, {r4-r12, lr}
str sp, [r1, #(10 * 4)]
m_unmangle_registers r2 m_unmangle_registers r2
// Save floating-point registers. // Save floating-point registers.
@ -204,7 +207,10 @@ ENTRY(siglongjmp)
ldr r3, [r0, #(_JB_SIGFLAG * 4)] ldr r3, [r0, #(_JB_SIGFLAG * 4)]
bic r3, r3, #1 bic r3, r3, #1
add r2, r0, #(_JB_CORE_BASE * 4) add r2, r0, #(_JB_CORE_BASE * 4)
ldmia r2, {r4-r14}
// ARM deprecates using sp in the register list for ldmia.
ldmia r2, {r4-r12, lr}
ldr sp, [r2, #(10 * 4)]
m_unmangle_registers r3 m_unmangle_registers r3
// Save the return value/address and check the setjmp cookie. // Save the return value/address and check the setjmp cookie.