[src/trunk]: src/lib/libc/arch/arm Do previous differtly by pushing two regis...

[skrll <skrll%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/941489cea5bd
branches:  trunk
changeset: 380017:941489cea5bd
user:      skrll <skrll%NetBSD.org@localhost>
date:      Wed Jun 30 21:20:29 2021 +0000

description:
Do previous differtly by pushing two registers in the same way as the
_INVOKE_CERROR macro

diffstat:

 lib/libc/arch/arm/gen/swapcontext.S |  14 ++++----------
 lib/libc/arch/arm/sys/__clone.S     |  12 +++---------
 2 files changed, 7 insertions(+), 19 deletions(-)

diffs (62 lines):

diff -r 16758c643949 -r 941489cea5bd lib/libc/arch/arm/gen/swapcontext.S
--- a/lib/libc/arch/arm/gen/swapcontext.S       Wed Jun 30 21:18:00 2021 +0000
+++ b/lib/libc/arch/arm/gen/swapcontext.S       Wed Jun 30 21:20:29 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: swapcontext.S,v 1.17 2021/06/30 00:00:49 rin Exp $     */
+/*     $NetBSD: swapcontext.S,v 1.18 2021/06/30 21:20:29 skrll Exp $   */
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
 #include "assym.h"
 
 #if defined(LIBC_SCCS) && !defined(lint)
-        RCSID("$NetBSD: swapcontext.S,v 1.17 2021/06/30 00:00:49 rin Exp $")
+        RCSID("$NetBSD: swapcontext.S,v 1.18 2021/06/30 21:20:29 skrll Exp $")
 #endif /* LIBC_SCCS && !lint */
 
 ENTRY(swapcontext)
@@ -84,15 +84,9 @@ 1:
 #if !defined(__thumb__) || defined(_ARM_ARCH_T2)
        b       PLT_SYM(_C_LABEL(setcontext))
 #else
-       push    {lr}
-       mov     r1, sp
-       subs    r1, #4
-       mov     sp, r1
+       push    {r3, lr}
        bl      PLT_SYM(_C_LABEL(setcontext))
-       mov     r1, sp
-       adds    r1, #4
-       mov     sp, r1
-       pop     {pc}
+       pop     {r3, pc}
 #endif
 #if defined(__ARM_EABI__) && defined(__UNWIND_TABLES__)
        .cfi_endproc
diff -r 16758c643949 -r 941489cea5bd lib/libc/arch/arm/sys/__clone.S
--- a/lib/libc/arch/arm/sys/__clone.S   Wed Jun 30 21:18:00 2021 +0000
+++ b/lib/libc/arch/arm/sys/__clone.S   Wed Jun 30 21:20:29 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: __clone.S,v 1.13 2021/06/30 07:36:05 skrll Exp $ */
+/* $NetBSD: __clone.S,v 1.14 2021/06/30 21:20:30 skrll Exp $ */
 
 /*
  * Copyright (c) 2001 Christopher Gilbert
@@ -117,14 +117,8 @@ 1:
        b       CERROR
 #else
 .Lcerror:
-       push    {lr}
-       mov     r1, sp
-       subs    r1, #4
-       mov     sp, r1
+       push    {r3, lr}
        bl      CERROR
-       mov     r1, sp
-       adds    r1, #4
-       mov     sp, r1
-       pop     {pc}
+       pop     {r3, pc}
 #endif
 END(__clone)