Module Name: src
Committed By: martin
Date: Wed Oct 13 16:03:07 UTC 2021
Modified Files:
src/lib/libc/arch/aarch64/gen [netbsd-9]: _setjmp.S setjmp.S
Log Message:
Pull up following revision(s) (requested by skrll in ticket #1358):
lib/libc/arch/aarch64/gen/setjmp.S: revision 1.4
lib/libc/arch/aarch64/gen/_setjmp.S: revision 1.5
Fix the lib/libc/setjmp/t_setjmp:{,_}longjmp_zero test cases
To generate a diff of this commit:
cvs rdiff -u -r1.3.6.1 -r1.3.6.2 src/lib/libc/arch/aarch64/gen/_setjmp.S
cvs rdiff -u -r1.2.6.1 -r1.2.6.2 src/lib/libc/arch/aarch64/gen/setjmp.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/arch/aarch64/gen/_setjmp.S
diff -u src/lib/libc/arch/aarch64/gen/_setjmp.S:1.3.6.1 src/lib/libc/arch/aarch64/gen/_setjmp.S:1.3.6.2
--- src/lib/libc/arch/aarch64/gen/_setjmp.S:1.3.6.1 Wed May 13 12:34:41 2020
+++ src/lib/libc/arch/aarch64/gen/_setjmp.S Wed Oct 13 16:03:07 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: _setjmp.S,v 1.3.6.1 2020/05/13 12:34:41 martin Exp $ */
+/* $NetBSD: _setjmp.S,v 1.3.6.2 2021/10/13 16:03:07 martin Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -99,7 +99,8 @@ ENTRY(_longjmp)
mov x29, x4
mov x30, x5
- mov x0, x1
+ cmp x1, #0
+ csinc x0, x1, xzr, ne
ret
/* validation failed, die die die. */
Index: src/lib/libc/arch/aarch64/gen/setjmp.S
diff -u src/lib/libc/arch/aarch64/gen/setjmp.S:1.2.6.1 src/lib/libc/arch/aarch64/gen/setjmp.S:1.2.6.2
--- src/lib/libc/arch/aarch64/gen/setjmp.S:1.2.6.1 Wed May 13 12:34:41 2020
+++ src/lib/libc/arch/aarch64/gen/setjmp.S Wed Oct 13 16:03:07 2021
@@ -1,4 +1,4 @@
-/*.$NetBSD: setjmp.S,v 1.2.6.1 2020/05/13 12:34:41 martin Exp $.*/
+/*.$NetBSD: setjmp.S,v 1.2.6.2 2021/10/13 16:03:07 martin Exp $.*/
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -114,8 +114,11 @@ ENTRY(__longjmp14)
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. */
