Module Name:    src
Committed By:   skrll
Date:           Wed Oct 11 09:12:21 UTC 2023

Modified Files:
        src/lib/libc/arch/ia64/gen: setjmp.S
        src/lib/libc/arch/or1k/gen: __setjmp14.S
        src/lib/libc/arch/powerpc/gen: __setjmp14.S __sigsetjmp14.S
        src/lib/libc/arch/powerpc64/gen: __setjmp14.S __sigsetjmp14.S
        src/lib/libc/arch/riscv/gen: __setjmp14.S
        src/lib/libc/arch/sh3/gen: setjmp.S sigsetjmp.S
        src/lib/libc/arch/sparc/gen: setjmp.S
        src/lib/libc/arch/sparc64/gen: setjmp.S

Log Message:
Consistently pass 0 as first and ignored argument to sigprocmask in the
setjmp implementations.

NFCI.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/lib/libc/arch/ia64/gen/setjmp.S
cvs rdiff -u -r1.1 -r1.2 src/lib/libc/arch/or1k/gen/__setjmp14.S
cvs rdiff -u -r1.5 -r1.6 src/lib/libc/arch/powerpc/gen/__setjmp14.S \
    src/lib/libc/arch/powerpc/gen/__sigsetjmp14.S
cvs rdiff -u -r1.4 -r1.5 src/lib/libc/arch/powerpc64/gen/__setjmp14.S
cvs rdiff -u -r1.3 -r1.4 src/lib/libc/arch/powerpc64/gen/__sigsetjmp14.S
cvs rdiff -u -r1.4 -r1.5 src/lib/libc/arch/riscv/gen/__setjmp14.S
cvs rdiff -u -r1.10 -r1.11 src/lib/libc/arch/sh3/gen/setjmp.S
cvs rdiff -u -r1.9 -r1.10 src/lib/libc/arch/sh3/gen/sigsetjmp.S
cvs rdiff -u -r1.13 -r1.14 src/lib/libc/arch/sparc/gen/setjmp.S
cvs rdiff -u -r1.11 -r1.12 src/lib/libc/arch/sparc64/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/ia64/gen/setjmp.S
diff -u src/lib/libc/arch/ia64/gen/setjmp.S:1.2 src/lib/libc/arch/ia64/gen/setjmp.S:1.3
--- src/lib/libc/arch/ia64/gen/setjmp.S:1.2	Wed Oct 11 06:15:36 2023
+++ src/lib/libc/arch/ia64/gen/setjmp.S	Wed Oct 11 09:12:20 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: setjmp.S,v 1.2 2023/10/11 06:15:36 skrll Exp $	*/
+/*	$NetBSD: setjmp.S,v 1.3 2023/10/11 09:12:20 skrll Exp $	*/
 
 /*
  * Copyright (c) 1994, 1995 Carnegie-Mellon University.
@@ -30,7 +30,7 @@
 #define _LOCORE
 #include <machine/asm.h>
 
-RCSID("$NetBSD: setjmp.S,v 1.2 2023/10/11 06:15:36 skrll Exp $")
+RCSID("$NetBSD: setjmp.S,v 1.3 2023/10/11 09:12:20 skrll Exp $")
 
 #include    <machine/setjmp.h>
 
@@ -49,7 +49,7 @@ ENTRY(__setjmp14, 1)
 	alloc	loc0=ar.pfs,1,2,3,0
 	mov	loc1=rp
 	;;
-	mov	out0=1				// how = SIG_BLOCK
+	mov	out0=0				// how is ignored
 	mov	out1=0				// set = NULL
 	add	out2=J_SIGSET,in0		// oset = &jb[J_SIGSET]
 	br.call.sptk.few rp=_sys___sigprocmask14

Index: src/lib/libc/arch/or1k/gen/__setjmp14.S
diff -u src/lib/libc/arch/or1k/gen/__setjmp14.S:1.1 src/lib/libc/arch/or1k/gen/__setjmp14.S:1.2
--- src/lib/libc/arch/or1k/gen/__setjmp14.S:1.1	Wed Sep  3 19:34:25 2014
+++ src/lib/libc/arch/or1k/gen/__setjmp14.S	Wed Oct 11 09:12:21 2023
@@ -1,10 +1,10 @@
-/*	$NetBSD: __setjmp14.S,v 1.1 2014/09/03 19:34:25 matt Exp $	*/
+/*	$NetBSD: __setjmp14.S,v 1.2 2023/10/11 09:12:21 skrll Exp $	*/
 
 #include "SYS.h"
 #include "assym.h"
 
 #if defined(LIBC_SCCS)
-__RCSID("$NetBSD: __setjmp14.S,v 1.1 2014/09/03 19:34:25 matt Exp $")
+__RCSID("$NetBSD: __setjmp14.S,v 1.2 2023/10/11 09:12:21 skrll Exp $")
 #endif
 
 /*
@@ -36,7 +36,7 @@ ENTRY(__setjmp14)
 	l.sw	JB_MAGIC(r3), r4	/* note we saved sigmask */
 	l.addi	r5, r3, JB_SIGMASK	# &sigmask
 	l.xor	r4, r4, r4
-	l.addi	r3, r0, SIG_BLOCK
+	l.addi	r3, r0, 0
 	_DOSYSCALL(__sigprocmask14)	# assume no error	XXX
 	l.xor	r11, r11, r11
 	l.jr	lr

Index: src/lib/libc/arch/powerpc/gen/__setjmp14.S
diff -u src/lib/libc/arch/powerpc/gen/__setjmp14.S:1.5 src/lib/libc/arch/powerpc/gen/__setjmp14.S:1.6
--- src/lib/libc/arch/powerpc/gen/__setjmp14.S:1.5	Sat Jan 15 07:31:12 2011
+++ src/lib/libc/arch/powerpc/gen/__setjmp14.S	Wed Oct 11 09:12:21 2023
@@ -1,10 +1,10 @@
-/*	$NetBSD: __setjmp14.S,v 1.5 2011/01/15 07:31:12 matt Exp $	*/
+/*	$NetBSD: __setjmp14.S,v 1.6 2023/10/11 09:12:21 skrll Exp $	*/
 
 #include "SYS.h"
 #include "assym.h"
 
 #if defined(LIBC_SCCS)
-__RCSID("$NetBSD: __setjmp14.S,v 1.5 2011/01/15 07:31:12 matt Exp $")
+__RCSID("$NetBSD: __setjmp14.S,v 1.6 2023/10/11 09:12:21 skrll Exp $")
 #endif
 
 /*
@@ -19,8 +19,8 @@ __RCSID("$NetBSD: __setjmp14.S,v 1.5 201
 
 ENTRY(__setjmp14)
 	mr	%r6,%r3
-	li	%r3,SIG_BLOCK
-	li	%r4,0
+	li	%r3,0			# how is ignored
+	li	%r4,0			# set = NULL
 	addi	%r5,%r6,4*(1+24)	# &sigmask
 	_DOSYSCALL(__sigprocmask14)	# assume no error	XXX
 	mflr	%r11
Index: src/lib/libc/arch/powerpc/gen/__sigsetjmp14.S
diff -u src/lib/libc/arch/powerpc/gen/__sigsetjmp14.S:1.5 src/lib/libc/arch/powerpc/gen/__sigsetjmp14.S:1.6
--- src/lib/libc/arch/powerpc/gen/__sigsetjmp14.S:1.5	Sat Jan 15 07:31:12 2011
+++ src/lib/libc/arch/powerpc/gen/__sigsetjmp14.S	Wed Oct 11 09:12:21 2023
@@ -1,18 +1,18 @@
-/*	$NetBSD: __sigsetjmp14.S,v 1.5 2011/01/15 07:31:12 matt Exp $	*/
+/*	$NetBSD: __sigsetjmp14.S,v 1.6 2023/10/11 09:12:21 skrll Exp $	*/
 
 #include "SYS.h"
 #include "assym.h"
 
 #if defined(LIBC_SCCS)
-__RCSID("$NetBSD: __sigsetjmp14.S,v 1.5 2011/01/15 07:31:12 matt Exp $")
+__RCSID("$NetBSD: __sigsetjmp14.S,v 1.6 2023/10/11 09:12:21 skrll Exp $")
 #endif
 
 ENTRY(__sigsetjmp14)
 	mr	%r6,%r3
 	or.	%r7,%r4,%r4
 	beq	1f
-	li	%r3,SIG_BLOCK
-	li	%r4,0
+	li	%r3,0			# how is ignored
+	li	%r4,0			# set = NULL
 	addi	%r5,%r6,4*(1+24)	# &sigmask
 	_DOSYSCALL(__sigprocmask14)	# assume no error	XXX
 1:

Index: src/lib/libc/arch/powerpc64/gen/__setjmp14.S
diff -u src/lib/libc/arch/powerpc64/gen/__setjmp14.S:1.4 src/lib/libc/arch/powerpc64/gen/__setjmp14.S:1.5
--- src/lib/libc/arch/powerpc64/gen/__setjmp14.S:1.4	Wed Oct 11 06:15:57 2023
+++ src/lib/libc/arch/powerpc64/gen/__setjmp14.S	Wed Oct 11 09:12:21 2023
@@ -1,9 +1,9 @@
-/*	$NetBSD: __setjmp14.S,v 1.4 2023/10/11 06:15:57 skrll Exp $	*/
+/*	$NetBSD: __setjmp14.S,v 1.5 2023/10/11 09:12:21 skrll Exp $	*/
 
 #include "SYS.h"
 
 #if defined(LIBC_SCCS)
-__RCSID("$NetBSD: __setjmp14.S,v 1.4 2023/10/11 06:15:57 skrll Exp $")
+__RCSID("$NetBSD: __setjmp14.S,v 1.5 2023/10/11 09:12:21 skrll Exp $")
 #endif
 
 /*
@@ -18,7 +18,7 @@ __RCSID("$NetBSD: __setjmp14.S,v 1.4 202
 
 ENTRY(__setjmp14)
 	mr	%r6,%r3
-	li	%r3,1			# SIG_BLOCK
+	li	%r3,0
 	li	%r4,0
 	addi	%r5,%r6,100		# &sigmask
 	_DOSYSCALL(__sigprocmask14)	# assume no error	XXX

Index: src/lib/libc/arch/powerpc64/gen/__sigsetjmp14.S
diff -u src/lib/libc/arch/powerpc64/gen/__sigsetjmp14.S:1.3 src/lib/libc/arch/powerpc64/gen/__sigsetjmp14.S:1.4
--- src/lib/libc/arch/powerpc64/gen/__sigsetjmp14.S:1.3	Sat Aug 23 02:24:22 2014
+++ src/lib/libc/arch/powerpc64/gen/__sigsetjmp14.S	Wed Oct 11 09:12:21 2023
@@ -1,18 +1,18 @@
-/*	$NetBSD: __sigsetjmp14.S,v 1.3 2014/08/23 02:24:22 matt Exp $	*/
+/*	$NetBSD: __sigsetjmp14.S,v 1.4 2023/10/11 09:12:21 skrll Exp $	*/
 
 #include "SYS.h"
 
 #if defined(LIBC_SCCS)
 	.text
-	.asciz "$NetBSD: __sigsetjmp14.S,v 1.3 2014/08/23 02:24:22 matt Exp $"
+	.asciz "$NetBSD: __sigsetjmp14.S,v 1.4 2023/10/11 09:12:21 skrll Exp $"
 #endif
 
 ENTRY(__sigsetjmp14)
 	mr	%r6,%r3
 	or.	%r7,%r4,%r4
 	beq	1f
-	li	%r3,1			# SIG_BLOCK
-	li	%r4,0
+	li	%r3,0			# how is ignored
+	li	%r4,0			# set = NULL
 	addi	%r5,%r6,100		# &sigmask
 	_DOSYSCALL(__sigprocmask14)	# assume no error	XXX
 1:

Index: src/lib/libc/arch/riscv/gen/__setjmp14.S
diff -u src/lib/libc/arch/riscv/gen/__setjmp14.S:1.4 src/lib/libc/arch/riscv/gen/__setjmp14.S:1.5
--- src/lib/libc/arch/riscv/gen/__setjmp14.S:1.4	Sun May  7 12:41:47 2023
+++ src/lib/libc/arch/riscv/gen/__setjmp14.S	Wed Oct 11 09:12:21 2023
@@ -1,10 +1,10 @@
-/*	$NetBSD: __setjmp14.S,v 1.4 2023/05/07 12:41:47 skrll Exp $	*/
+/*	$NetBSD: __setjmp14.S,v 1.5 2023/10/11 09:12:21 skrll Exp $	*/
 
 #include "SYS.h"
 #include "assym.h"
 
 #if defined(LIBC_SCCS)
-__RCSID("$NetBSD: __setjmp14.S,v 1.4 2023/05/07 12:41:47 skrll Exp $")
+__RCSID("$NetBSD: __setjmp14.S,v 1.5 2023/10/11 09:12:21 skrll Exp $")
 #endif
 
 /*
@@ -54,8 +54,8 @@ ENTRY(__setjmp14)
 #endif
 
 	addi	a2, a0, JB_SIGMASK	/* &sigmask */
-	li	a1, 0
-	li	a0, SIG_BLOCK
+	li	a1, 0			/* set = NULL */
+	li	a0, 0			/* how is ignored */
 	SYSTRAP_NOERROR(__sigprocmask14)	/* assume no error */
 	li	a0, 0	/* success */	/* indicate success */
 	ret				/* return */

Index: src/lib/libc/arch/sh3/gen/setjmp.S
diff -u src/lib/libc/arch/sh3/gen/setjmp.S:1.10 src/lib/libc/arch/sh3/gen/setjmp.S:1.11
--- src/lib/libc/arch/sh3/gen/setjmp.S:1.10	Thu Jan  5 19:21:37 2006
+++ src/lib/libc/arch/sh3/gen/setjmp.S	Wed Oct 11 09:12:21 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: setjmp.S,v 1.10 2006/01/05 19:21:37 uwe Exp $	*/
+/*	$NetBSD: setjmp.S,v 1.11 2023/10/11 09:12:21 skrll Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -38,7 +38,7 @@
 #include <machine/setjmp.h>
 
 #if defined(LIBC_SCCS)
-	RCSID("$NetBSD: setjmp.S,v 1.10 2006/01/05 19:21:37 uwe Exp $")
+	RCSID("$NetBSD: setjmp.S,v 1.11 2023/10/11 09:12:21 skrll Exp $")
 #endif
 
 /*
@@ -58,10 +58,10 @@ ENTRY(__setjmp14)
 
 	mov.l	.L___sigprocmask14_1, r0
 	mov	r4, r6
-	mov	#1, r4			/* how = SIG_BLOCK */
-	mov	#0, r5			/* new = NULL */
+	mov	#0, r4			/* how is ignored */
+	mov	#0, r5			/* set = NULL */
 1:	CALL	r0
-	 add	#(_JB_SIGMASK * 4), r6	/* old = &sigmask */
+	 add	#(_JB_SIGMASK * 4), r6	/* oset = &sigmask */
 
 	mov.l	@sp+, r4
 	lds.l	@sp+, pr

Index: src/lib/libc/arch/sh3/gen/sigsetjmp.S
diff -u src/lib/libc/arch/sh3/gen/sigsetjmp.S:1.9 src/lib/libc/arch/sh3/gen/sigsetjmp.S:1.10
--- src/lib/libc/arch/sh3/gen/sigsetjmp.S:1.9	Thu Jan  5 19:21:37 2006
+++ src/lib/libc/arch/sh3/gen/sigsetjmp.S	Wed Oct 11 09:12:21 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: sigsetjmp.S,v 1.9 2006/01/05 19:21:37 uwe Exp $	*/
+/*	$NetBSD: sigsetjmp.S,v 1.10 2023/10/11 09:12:21 skrll Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -38,7 +38,7 @@
 #include <machine/setjmp.h>
 
 #if defined(LIBC_SCCS)
-	RCSID("$NetBSD: sigsetjmp.S,v 1.9 2006/01/05 19:21:37 uwe Exp $")
+	RCSID("$NetBSD: sigsetjmp.S,v 1.10 2023/10/11 09:12:21 skrll Exp $")
 #endif
 
 ENTRY(__sigsetjmp14)
@@ -53,10 +53,10 @@ ENTRY(__sigsetjmp14)
 
 	mov.l	.L___sigprocmask14_1, r0
 	mov	r4, r6
-	mov	#1, r4			/* how = SIG_BLOCK */
-	mov	#0, r5			/* new = NULL */
+	mov	#0, r4			/* how is ignored */
+	mov	#0, r5			/* set = NULL */
 1:	CALL	r0
-	 add	#(_JB_SIGMASK * 4), r6	/* old = &sigmask */
+	 add	#(_JB_SIGMASK * 4), r6	/* oset = &sigmask */
 
 	mov.l	@sp+, r5
 	mov.l	@sp+, r4

Index: src/lib/libc/arch/sparc/gen/setjmp.S
diff -u src/lib/libc/arch/sparc/gen/setjmp.S:1.13 src/lib/libc/arch/sparc/gen/setjmp.S:1.14
--- src/lib/libc/arch/sparc/gen/setjmp.S:1.13	Sun Sep  3 21:41:45 2023
+++ src/lib/libc/arch/sparc/gen/setjmp.S	Wed Oct 11 09:12:21 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: setjmp.S,v 1.13 2023/09/03 21:41:45 mrg Exp $	*/
+/*	$NetBSD: setjmp.S,v 1.14 2023/10/11 09:12:21 skrll Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -40,7 +40,7 @@
 #if 0
 	.asciz "@(#)setjmp.s	8.1 (Berkeley) 6/4/93"
 #else
-	RCSID("$NetBSD: setjmp.S,v 1.13 2023/09/03 21:41:45 mrg Exp $")
+	RCSID("$NetBSD: setjmp.S,v 1.14 2023/10/11 09:12:21 skrll Exp $")
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -64,10 +64,10 @@ ENTRY(__setjmp14)
 	 * local vars on stack: struct sigstack foo @ offset 0x48
 	 * Note: sc_g1 is not used; sc_o0 is set in longjmp()
 	 */
-	mov	1, %o0		/* SIG_BLOCK */
+	mov	0, %o0		/* 0 - is ignored */
 	add	%i0, 32, %o2	/* build sigcontext sc.sc_mask */
 	call	_C_LABEL(__sigprocmask14)
-	 clr	%o1		/* sigprocmask(SIG_BLOCK, NULL, &sc.sc_mask) */
+	 clr	%o1		/* sigprocmask(0, NULL, &sc.sc_mask) */
 
 	add	%sp, 0x48, %o1	/* (foo being in arg dump area) */
 	call	_C_LABEL(__sigaltstack14)

Index: src/lib/libc/arch/sparc64/gen/setjmp.S
diff -u src/lib/libc/arch/sparc64/gen/setjmp.S:1.11 src/lib/libc/arch/sparc64/gen/setjmp.S:1.12
--- src/lib/libc/arch/sparc64/gen/setjmp.S:1.11	Wed Oct 11 06:16:13 2023
+++ src/lib/libc/arch/sparc64/gen/setjmp.S	Wed Oct 11 09:12:21 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: setjmp.S,v 1.11 2023/10/11 06:16:13 skrll Exp $	*/
+/*	$NetBSD: setjmp.S,v 1.12 2023/10/11 09:12:21 skrll Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -42,7 +42,7 @@
 #if 0
 	.asciz "@(#)setjmp.s	8.1 (Berkeley) 6/4/93"
 #else
-	RCSID("$NetBSD: setjmp.S,v 1.11 2023/10/11 06:16:13 skrll Exp $")
+	RCSID("$NetBSD: setjmp.S,v 1.12 2023/10/11 09:12:21 skrll Exp $")
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -81,8 +81,8 @@ ENTRY(__setjmp14)
 
 	/* now get sigmask and onstack flag */
 	add	%i0, 0x38, %o2		/* build sigcontext in [%o2]->sc.sc_mask */
-	mov	1, %o0			/* SIG_BLOCK */
-					/* sigprocmask(SIG_BLOCK, (sigset_t *)NULL, (sigset_t *)a) */
+	mov	0, %o0			/* 0 - is ignored. */
+					/* sigprocmask(0, (sigset_t *)NULL, (sigset_t *)a) */
 #if __PIC__ - 0 >= 2
 	set	_C_LABEL(__sigprocmask14), %o4
 	ldx	[%i1 + %o4], %g2

Reply via email to