Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/lib/libc/arch/aarch64/gen Fix the lib/libc/setjmp/t_setjmp:{...



details:   https://anonhg.NetBSD.org/src/rev/3b0f67fdb6c6
branches:  trunk
changeset: 988284:3b0f67fdb6c6
user:      skrll <skrll%NetBSD.org@localhost>
date:      Thu Oct 07 06:44:18 2021 +0000

description:
Fix the lib/libc/setjmp/t_setjmp:{,_}longjmp_zero test cases

diffstat:

 lib/libc/arch/aarch64/gen/_setjmp.S |  5 +++--
 lib/libc/arch/aarch64/gen/setjmp.S  |  7 +++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diffs (41 lines):

diff -r 57a8ac7b74db -r 3b0f67fdb6c6 lib/libc/arch/aarch64/gen/_setjmp.S
--- a/lib/libc/arch/aarch64/gen/_setjmp.S       Thu Oct 07 00:11:08 2021 +0000
+++ b/lib/libc/arch/aarch64/gen/_setjmp.S       Thu Oct 07 06:44:18 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: _setjmp.S,v 1.4 2020/05/10 14:05:59 skrll Exp $ */
+/* $NetBSD: _setjmp.S,v 1.5 2021/10/07 06:44:18 skrll Exp $ */
 
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -99,7 +99,8 @@
        mov     x29, x4
        mov     x30, x5
 
-       mov     x0, x1
+       cmp     x1, #0
+       csinc   x0, x1, xzr, ne
        ret
 
        /* validation failed, die die die. */
diff -r 57a8ac7b74db -r 3b0f67fdb6c6 lib/libc/arch/aarch64/gen/setjmp.S
--- a/lib/libc/arch/aarch64/gen/setjmp.S        Thu Oct 07 00:11:08 2021 +0000
+++ b/lib/libc/arch/aarch64/gen/setjmp.S        Thu Oct 07 06:44:18 2021 +0000
@@ -1,4 +1,4 @@
-/*.$NetBSD: setjmp.S,v 1.3 2020/05/10 14:05:59 skrll Exp $.*/
+/*.$NetBSD: setjmp.S,v 1.4 2021/10/07 06:44:18 skrll Exp $.*/
 
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -114,8 +114,11 @@
        bl      _C_LABEL(__sigprocmask14)
 
        ldp     x29, x30, [sp, #16]
-       ldr     x0, [sp, #8]
+       ldr     x1, [sp, #8]
        add     sp, sp, #32
+
+       cmp     x1, #0
+       csinc   x0, x1, xzr, ne
        ret
 
        /* validation failed, die die die. */



Home | Main Index | Thread Index | Old Index