浏览代码

powerpc: Avoid an unnecessary test and branch in longjmp()

Doing the test at exit of the function avoids an unnecessary
test and branch inside longjmp().

Semantics are unchanged.

Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
Reviewed-by: Michael Ellerman <mpe@ellerman.id.au>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Christophe Leroy 7 年之前
父节点
当前提交
24c78586cc
共有 1 个文件被更改,包括 4 次插入5 次删除
  1. 4 5
      arch/powerpc/kernel/misc.S

+ 4 - 5
arch/powerpc/kernel/misc.S

@@ -85,10 +85,7 @@ _GLOBAL(setjmp)
 	blr
 	blr
 
 
 _GLOBAL(longjmp)
 _GLOBAL(longjmp)
-	PPC_LCMPI r4,0
-	bne	1f
-	li	r4,1
-1:	PPC_LL	r13,4*SZL(r3)
+	PPC_LL	r13,4*SZL(r3)
 	PPC_LL	r14,5*SZL(r3)
 	PPC_LL	r14,5*SZL(r3)
 	PPC_LL	r15,6*SZL(r3)
 	PPC_LL	r15,6*SZL(r3)
 	PPC_LL	r16,7*SZL(r3)
 	PPC_LL	r16,7*SZL(r3)
@@ -113,7 +110,9 @@ _GLOBAL(longjmp)
 	PPC_LL	r1,SZL(r3)
 	PPC_LL	r1,SZL(r3)
 	PPC_LL	r2,2*SZL(r3)
 	PPC_LL	r2,2*SZL(r3)
 	mtlr	r0
 	mtlr	r0
-	mr	r3,r4
+	mr.	r3, r4
+	bnelr
+	li	r3, 1
 	blr
 	blr
 
 
 _GLOBAL(current_stack_pointer)
 _GLOBAL(current_stack_pointer)