Module Name: src
Committed By: skrll
Date: Thu Oct 7 06:44:19 UTC 2021
Modified Files:
src/lib/libc/arch/aarch64/gen: _setjmp.S setjmp.S
Log Message:
Fix the lib/libc/setjmp/t_setjmp:{,_}longjmp_zero test cases
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/lib/libc/arch/aarch64/gen/_setjmp.S
cvs rdiff -u -r1.3 -r1.4 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.4 src/lib/libc/arch/aarch64/gen/_setjmp.S:1.5
--- src/lib/libc/arch/aarch64/gen/_setjmp.S:1.4 Sun May 10 14:05:59 2020
+++ src/lib/libc/arch/aarch64/gen/_setjmp.S Thu Oct 7 06:44:18 2021
@@ -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 @@ 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.3 src/lib/libc/arch/aarch64/gen/setjmp.S:1.4
--- src/lib/libc/arch/aarch64/gen/setjmp.S:1.3 Sun May 10 14:05:59 2020
+++ src/lib/libc/arch/aarch64/gen/setjmp.S Thu Oct 7 06:44:18 2021
@@ -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 @@ 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. */
