Browse Source

optimize arm setjmp/longjmp register saving/loading

the original code was wrongly based on how it would be done in thumb
mode, but that's not needed because musl's asm only targets arm.
Rich Felker 12 years ago
parent
commit
5aac5e2189
2 changed files with 2 additions and 6 deletions
  1. 1 3
      src/setjmp/arm/longjmp.s
  2. 1 3
      src/setjmp/arm/setjmp.s

+ 1 - 3
src/setjmp/arm/longjmp.s

@@ -7,9 +7,7 @@ longjmp:
 	mov ip,r0
 	mov ip,r0
 	movs r0,r1
 	movs r0,r1
 	moveq r0,#1
 	moveq r0,#1
-	ldmia ip!, {v1,v2,v3,v4,v5,v6,sl,fp}
+	ldmia ip!, {v1,v2,v3,v4,v5,v6,sl,fp,sp,lr}
-	ldr sp,[ip],#4
-	ldr lr,[ip],#4
 	tst lr,#1
 	tst lr,#1
 	moveq pc,lr
 	moveq pc,lr
 	bx lr
 	bx lr

+ 1 - 3
src/setjmp/arm/setjmp.s

@@ -8,9 +8,7 @@ __setjmp:
 _setjmp:
 _setjmp:
 setjmp:
 setjmp:
 	mov ip,r0
 	mov ip,r0
-	stmia ip!,{v1,v2,v3,v4,v5,v6,sl,fp}
+	stmia ip!,{v1,v2,v3,v4,v5,v6,sl,fp,sp,lr}
-	mov r2,sp
-	stmia ip!,{r2,lr}
 	mov r0,#0
 	mov r0,#0
 	tst lr,#1
 	tst lr,#1
 	moveq pc,lr
 	moveq pc,lr