change PRE_Block to an int, which architectures like alpha can access

atomically. Adapt all the others (except s390 which is not fixed yet).

mips and hppa still do not work for some other reason.

testing by beck, ckuethe, todd, asm proofreading by miod

15 files changed, 44 insertions, 44 deletions

diff --git a/usr.sbin/afs/src/lwp/preempt.c b/usr.sbin/afs/src/lwp/preempt.c
index cc11fda9536..81000ab7896 100644
--- a/usr.sbin/afs/src/lwp/preempt.c
+++ b/usr.sbin/afs/src/lwp/preempt.c
@@ -34,7 +34,7 @@
 
 RCSID("$arla: preempt.c,v 1.9 2002/06/02 11:59:54 lha Exp $");
 
-char PRE_Block = 0;		/* used in lwp.c and process.s */
+sig_atomic_t PRE_Block = 0;		/* used in lwp.c and process.s */
 
 #ifdef HAVE_GETITIMER
 
diff --git a/usr.sbin/afs/src/lwp/preempt.h b/usr.sbin/afs/src/lwp/preempt.h
index 15dbdce0300..feeb8b94791 100644
--- a/usr.sbin/afs/src/lwp/preempt.h
+++ b/usr.sbin/afs/src/lwp/preempt.h
@@ -44,5 +44,5 @@ static char *rcsidpreempt = "$arla: /afs/stacken.kth.se/src/SourceRepository/arl
 int PRE_InitPreempt(struct timeval *);
 int PRE_EndPreempt(void);
 
-extern char PRE_Block;
+extern sig_atomic_t PRE_Block;
 
diff --git a/usr.sbin/afs/src/lwp/process.aix22.S b/usr.sbin/afs/src/lwp/process.aix22.S
index d224105b934..a8cc0414eaf 100644
--- a/usr.sbin/afs/src/lwp/process.aix22.S
+++ b/usr.sbin/afs/src/lwp/process.aix22.S
@@ -73,7 +73,7 @@
 /*# Set preemption semaphore*/
 	lis	6,1
 	l	7,4(14)
-	stc	6,0(7)
+	sts	6,0(7)
 /*# r3 = base of savearea*/
 	st	1,topstack(3)		# area1->topstack = sp
 /*# New sp is in r4.*/
@@ -109,7 +109,7 @@ _savecontext:
 	lr	14,0
 	lis	6,0
 	l	7,4(14)
-	stc	6,0(7)
+	sts	6,0(7)
 	lm	0,0(1)		# Change if saving fewer regs.
 	brx	15		# Return to previous process
 	ai	1,1,regspace
diff --git a/usr.sbin/afs/src/lwp/process.arm.S b/usr.sbin/afs/src/lwp/process.arm.S
index 866e0ce12a2..18ba60fc39b 100644
--- a/usr.sbin/afs/src/lwp/process.arm.S
+++ b/usr.sbin/afs/src/lwp/process.arm.S
@@ -1,4 +1,4 @@
-/* $OpenBSD: process.arm.S,v 1.1 2004/02/11 21:52:49 drahn Exp $ */
+/* $OpenBSD: process.arm.S,v 1.2 2006/11/17 20:54:47 deraadt Exp $ */
 
 /*
  * Copyright (c) 2004 Dale Rahn. All rights reserved.
@@ -42,7 +42,7 @@ savecontext:
 	str	r2, [r1]
 	ldr	r3, .LPRE_Block
 	mov	r2, #1
-	strb	r2, [r3]
+	str	r2, [r3]
 	ldr	r2, [r1]
 
 	sub	sp, sp, #FRAME_SIZE
@@ -93,7 +93,7 @@ returnto:
 
 	ldr	r3, .LPRE_Block
 	mov	r2, #0
-	strb	r2, [r3]
+	str	r2, [r3]
 
 	add	sp, sp, #FRAME_SIZE
 #ifdef __ARM_26__
diff --git a/usr.sbin/afs/src/lwp/process.hpux.S b/usr.sbin/afs/src/lwp/process.hpux.S
index c1071d22a6c..9839e84d591 100644
--- a/usr.sbin/afs/src/lwp/process.hpux.S
+++ b/usr.sbin/afs/src/lwp/process.hpux.S
@@ -36,7 +36,7 @@
 
 	global	_savecontext
 _savecontext:
-	mov.b	&1,_PRE_Block		# Dont allow any interrupt finagling
+	mov.l	&1,_PRE_Block		# Dont allow any interrupt finagling
 	link	%a6,&-(NREGS*4)		# Save frame pointer & ...
 					# ... allocate space for nregs registers
 /* Save registers */
@@ -74,7 +74,7 @@ _returnto:
 	add.l	&(NREGS*4),%sp
 	mov.l	%sp,%a6			# Argghh...be careful here
 	unlk	%a6
-	clr.b	_PRE_Block
+	clr.l	_PRE_Block
 	rts				# Return to previous process
 #else
 
@@ -105,7 +105,7 @@ savecontext
 
 	LDI   1,%r1				/* Store a (char) 1 in */
 	LDW   T%PRE_Block(0,%r19),%r31    	/* global variable */
-	STB   %r1,0(0,%r31)			/* PRE_Block. */
+	STW   %r1,0(0,%r31)			/* PRE_Block. */
 
 
 	COPY  %arg0,%r22	/* Copy arg0 (f) to dyncall's input register */
@@ -138,7 +138,7 @@ returnto
 	LDWS  0(0,%arg0),%r30	/* Load the stack pointer from area2 */
 
 	LDW   T%PRE_Block(0,%r19),%r31   /* set PRE_Block = 0; */
-	STB   %r0,0(0,%r31)
+	STW   %r0,0(0,%r31)
 	.LEAVE
 	.PROCEND
 
@@ -173,7 +173,7 @@ savecontext
 
 	LDI   1,%r31				/* Store a (char) 1 in */
 	ADDIL L%PRE_Block-$global$,%r27		/* global variable */
-	STB   %r31,R%PRE_Block-$global$(0,%r1)	/* PRE_Block. */
+	STW   %r31,R%PRE_Block-$global$(0,%r1)	/* PRE_Block. */
 
 	COPY  %r26,%r22		/* Copy arg0 (f) to dyncall's input register. */
 
@@ -203,7 +203,7 @@ returnto
 	.CALLINFO CALLER,FRAME=0,SAVE_RP,ENTRY_GR=18,ENTRY_FR=21
 	/*  No ENTRY is used since this is a magic routine. */
 	ADDIL L%PRE_Block-$global$,%r27		/* PRE_Block = 0 */
-	STB   %r0,R%PRE_Block-$global$(0,%r1)
+	STW   %r0,R%PRE_Block-$global$(0,%r1)
 
 	LDWS  0(0,%r26),%r30	/* Load the stack pointer from area2 */
 	.LEAVE
@@ -248,7 +248,7 @@ savecontext
 
 	LDI   1,%r1				/* Store a (char) 1 in */
 	LDW   T%PRE_Block(0,%r19),%r31    	/* global variable */
-	STB   %r1,0(0,%r31)			/* PRE_Block. */
+	STW   %r1,0(0,%r31)			/* PRE_Block. */
 
 
 	COPY  %arg0,%r22	/* Copy arg0 (f) to dyncall's input register */
@@ -281,7 +281,7 @@ returnto
 	LDWS  0(0,%arg0),%r30	/* Load the stack pointer from area2 */
 
 	LDW   T%PRE_Block(0,%r19),%r31   /* set PRE_Block = 0; */
-	STB   %r0,0(0,%r31)
+	STW   %r0,0(0,%r31)
 	.LEAVE
 	.PROCEND
 
@@ -322,7 +322,7 @@ savecontext
 
 	LDI   1,%r31				/* Store a (char) 1 in */
 	ADDIL L%PRE_Block-$global$,%r27		/* global variable */
-	STB   %r31,R%PRE_Block-$global$(0,%r1)	/* PRE_Block. */
+	STW   %r31,R%PRE_Block-$global$(0,%r1)	/* PRE_Block. */
 
 	COPY  %r26,%r22		/* Copy arg0 (f) to dyncall's input register. */
 
@@ -355,7 +355,7 @@ returnto
 	.CALLINFO CALLER,FRAME=0,SAVE_RP,ENTRY_GR=18,ENTRY_FR=21
 	.ENTRY
 	ADDIL L%PRE_Block-$global$,%r27		/* PRE_Block = 0 */
-	STB   %r0,R%PRE_Block-$global$(0,%r1)
+	STW   %r0,R%PRE_Block-$global$(0,%r1)
 
 	LDWS  0(0,%r26),%r30	/* Load the stack pointer from area2 */
 	.EXIT
diff --git a/usr.sbin/afs/src/lwp/process.ibm032.S b/usr.sbin/afs/src/lwp/process.ibm032.S
index 65c9d8e461a..ab9873374ee 100644
--- a/usr.sbin/afs/src/lwp/process.ibm032.S
+++ b/usr.sbin/afs/src/lwp/process.ibm032.S
@@ -76,7 +76,7 @@ _.savecontext:
 | Set preemption semaphore
 	get	r6,$1
 	get	r7,$_PRE_Block
-	putc	r6,0(r7)			| PRE_Block = 1
+	put	r6,0(r7)			| PRE_Block = 1
 | r3 = base of savearea
 	put	sp,topstack(r3)		| area1->topstack = sp
 | New sp is in r4.
@@ -101,7 +101,7 @@ _.returnto:
 | Clear preemption semaphore
 	get	r6,$0
 	get	r7,$_PRE_Block
-	putc	r6,0(r7)			| PRE_Block = 0
+	put	r6,0(r7)			| PRE_Block = 0
 	lm	r0,0(sp)		| Change if saving fewer regs.
 	brx	r15		| Return to previous process
 	ai	sp,sp,regspace
diff --git a/usr.sbin/afs/src/lwp/process.m68k.S b/usr.sbin/afs/src/lwp/process.m68k.S
index ecb11ce8e7f..bc7fd9691bf 100644
--- a/usr.sbin/afs/src/lwp/process.m68k.S
+++ b/usr.sbin/afs/src/lwp/process.m68k.S
@@ -84,7 +84,7 @@ area1	=	12
 newsp	=	16
 
 ENTRY(savecontext)
-	movb	#1,_C_LABEL(PRE_Block)	| Dont allow any interrupt finagling
+	movl	#1,_C_LABEL(PRE_Block)	| Dont allow any interrupt finagling
 	link	reg(a6),#-(nregs*4)	| Save frame pointer & ...
 					| ... allocate space for nregs registers
 /* Save registers */
@@ -121,5 +121,5 @@ ENTRY(returnto)
 	addl	#(nregs*4),reg(sp)
 	movl	reg(sp),reg(a6)			| Argghh...be careful here
 	unlk	reg(a6)
-	clrb	_C_LABEL(PRE_Block)
+	clrl	_C_LABEL(PRE_Block)
 	rts					| Return to previous process
diff --git a/usr.sbin/afs/src/lwp/process.m88k.S b/usr.sbin/afs/src/lwp/process.m88k.S
index 660bf89652b..32b5a5d7640 100644
--- a/usr.sbin/afs/src/lwp/process.m88k.S
+++ b/usr.sbin/afs/src/lwp/process.m88k.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: process.m88k.S,v 1.4 2004/09/15 05:55:46 miod Exp $	*/
+/*	$OpenBSD: process.m88k.S,v 1.5 2006/11/17 20:54:47 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2004, Miodrag Vallat.
@@ -60,7 +60,7 @@ ENTRY(savecontext)
 	/* set preemption lock */
 	or.u	r4,  r0,  hi16(_C_LABEL(PRE_Block))
 	set	r1,  r0,  1<0>
-	st.b	r1,  r4,  lo16(_C_LABEL(PRE_Block))
+	st	r1,  r4,  lo16(_C_LABEL(PRE_Block))
 	ld.d	r4,  r31, 4 * 0
 
 	/* save stack pointer, and fetch the new one if non NULL */
@@ -107,4 +107,4 @@ ENTRY(returnto)
 	/* clear preemption lock and return */
 	or.u	r2,  r0,  hi16(_C_LABEL(PRE_Block))
 	jmp.n	r1
-	 st.b	r0,  r2,  lo16(_C_LABEL(PRE_Block))
+	 st	r0,  r2,  lo16(_C_LABEL(PRE_Block))
diff --git a/usr.sbin/afs/src/lwp/process.mips.S b/usr.sbin/afs/src/lwp/process.mips.S
index dfad6cd06cc..eecda209106 100644
--- a/usr.sbin/afs/src/lwp/process.mips.S
+++ b/usr.sbin/afs/src/lwp/process.mips.S
@@ -52,7 +52,7 @@ savecontext:
 	.set	noreorder
 	li	t0, 1
 	.extern	PRE_Block
-	sb	t0, PRE_Block
+	sw	t0, PRE_Block
         .set    reorder
 	.frame	sp, regspace, ra
 /* Save registers. */
@@ -112,9 +112,9 @@ returnto:
 	l.d	$f30, floats + 40(sp)
 	.set	noreorder
 	addu	sp, regspace
-	la	t0, PRE_Block
+	sw	zero, PRE_Block
 	j	ra
-	sb	zero, 0(t0)
+	 nop
 	.set	reorder
 	.end	returnto
 
@@ -153,7 +153,7 @@ returnto:
 savecontext:
 	li	t0, 1
 	.extern	PRE_Block
-	sb	t0, PRE_Block
+	sw	t0, PRE_Block
 	subu	sp, regspace
 	.frame	sp, regspace, ra
 /* Save registers. */
@@ -207,7 +207,7 @@ returnto:
 	l.d	$f28, floats + 32(sp)
 	l.d	$f30, floats + 40(sp)
 	addu	sp, regspace
-	sb	$0, PRE_Block
+	sw	$0, PRE_Block
 	j	ra
 	.end	returnto
 #endif	/* HAVE_PIC */
diff --git a/usr.sbin/afs/src/lwp/process.ppc.S b/usr.sbin/afs/src/lwp/process.ppc.S
index 09aa40a1b7f..a229377805a 100644
--- a/usr.sbin/afs/src/lwp/process.ppc.S
+++ b/usr.sbin/afs/src/lwp/process.ppc.S
@@ -114,13 +114,13 @@
 _savecontext:
       lis     r9,ha16(_PRE_Block)     /* Disable interrupt fiddling */
       li      r8,1
-      stb     r8,lo16(_PRE_Block)(r9)
+      stw     r8,lo16(_PRE_Block)(r9)
 #else	
       .globl  savecontext
 savecontext:
       lis     r9,PRE_Block@ha         /* Disable interrupt fiddling */
       li      r8,1
-      stb     r8,PRE_Block@l(r9)
+      stw     r8,PRE_Block@l(r9)
 #endif /* NeXT || __APPLE__ */
       subi    r1,r1,FRAME_SIZE
       mfcr    r9
@@ -197,11 +197,11 @@ returnto:
 #if defined(NeXT) || defined(__APPLE__)
       lis     r9,ha16(_PRE_Block)         /* Re-enable interrupt fiddling */
       li      r8,0
-      stb     r8,lo16(_PRE_Block)(r9)
+      stw     r8,lo16(_PRE_Block)(r9)
 #else	
       lis     r9,PRE_Block@ha         /* Re-enable interrupt fiddling */
       li      r8,0
-      stb     r8,PRE_Block@l(r9)
+      stw     r8,PRE_Block@l(r9)
 #endif /* NeXT || __APPLE__ */
       addi    r1,r1,FRAME_SIZE
       blr
diff --git a/usr.sbin/afs/src/lwp/process.rios.S b/usr.sbin/afs/src/lwp/process.rios.S
index 6de6e70a849..645e29a8ddb 100644
--- a/usr.sbin/afs/src/lwp/process.rios.S
+++ b/usr.sbin/afs/src/lwp/process.rios.S
@@ -114,7 +114,7 @@
 
 	l	r7,  PRE_Block.S(toc)	# r7 <- &PRE_Block
 	cal	r6, 1(r0)		# r6 <- #1
-	stb	r6, 0(r7)		# r6 -> PRE_Block
+	st	r6, 0(r7)		# r6 -> PRE_Block
 
 	st	r1, topstack(a_area1)	# save old SP
 	
@@ -145,7 +145,7 @@ L1:	brl				# pc <- lr	-- (*a_f)()
 	lm	12,  -8*nfprs-4*ngprs(r1)
 	cal	r6, 0(r0)		# r6 <- #0
 	mtcrf	0x38, 12		# put back cr
-	stb	r6, 0(r7)		# r6 -> PRE_Block
+	st	r6, 0(r7)		# r6 -> PRE_Block
 
 /*
  * restore FPRs here!
diff --git a/usr.sbin/afs/src/lwp/process.s390.S b/usr.sbin/afs/src/lwp/process.s390.S
index d1580ba2dd4..53e9854ceb7 100644
--- a/usr.sbin/afs/src/lwp/process.s390.S
+++ b/usr.sbin/afs/src/lwp/process.s390.S
@@ -69,7 +69,7 @@ savecontext:
 	        .long   PRE_Block
 	.L0:
 	        l       %r5,0(%r5)              /* Get A(PRE_Block) */
-	        mvi     0(%r5),1                /* Set it */
+	        mvi     0(%r5),1                /* Set it */			/* XXX should be a word */
 	        st      %r15,0(%r3)             /* Save stack pointer */
 	        ltr     %r4,%r4                 /* If new sp is 0 */
 	        jz      .L1                     /* ... don't change sp */
@@ -107,7 +107,7 @@ returnto:
 	        .long   PRE_Block
 	.L3:
 	        l       %r5,0(%r5)              /* Get A(PRE_Block) */
-	        mvi     0(%r5),0                /* Clear it */
+	        mvi     0(%r5),0                /* Clear it */				/* XXX should be a word */
 	        l       %r15,0(%r15)            /* Point to next stack frame */
 	        lm      %r7,%r15,28(%r15)       /* Restore registers */
 	        br      %r14                    /* Return */
diff --git a/usr.sbin/afs/src/lwp/process.sh.S b/usr.sbin/afs/src/lwp/process.sh.S
index daa2cb0361e..152bd4b893d 100644
--- a/usr.sbin/afs/src/lwp/process.sh.S
+++ b/usr.sbin/afs/src/lwp/process.sh.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: process.sh.S,v 1.4 2006/11/16 05:19:52 deraadt Exp $	*/
+/*	$OpenBSD: process.sh.S,v 1.5 2006/11/17 20:54:47 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2006 Theo de Raadt
@@ -41,7 +41,7 @@ ENTRY(savecontext)
 
 	mov.l	.L_PRE_Block, r0	/* PRE_Block = 1 */
 	mov	#1, r1
-	mov.b	r1, @r0
+	mov.l	r1, @r0
 
 	/* sp == r15 - automatically handled */
 	mov.l	r14, @-sp
@@ -101,7 +101,7 @@ ENTRY(returnto)
 
 	mov.l	.L_PRE_Block2, r0	/* PRE_Block = 0 */
 	mov	#0, r4
-	mov.b	r4, @r0
+	mov.l	r4, @r0
 
 	rts
 	 nop
diff --git a/usr.sbin/afs/src/lwp/process.sparc.S b/usr.sbin/afs/src/lwp/process.sparc.S
index 1a48716a91f..1a47d7519fe 100644
--- a/usr.sbin/afs/src/lwp/process.sparc.S
+++ b/usr.sbin/afs/src/lwp/process.sparc.S
@@ -104,7 +104,7 @@ ENTRY(savecontext)
 	or	%l0,%lo(_C_LABEL(PRE_Block)),%l0
 #endif
 	mov	1,%l1
-	stb	%l1, [%l0]
+	st	%l1, [%l0]
 
 #ifdef	__sparcv9
 	
@@ -537,7 +537,7 @@ ENTRY(returnto)
 	or	%l0,%lo(_C_LABEL(PRE_Block)),%l0
 #endif
 	mov	0,%l1
-	stb	%l1, [%l0]
+	st	%l1, [%l0]
 
 	restore					
 	restore
diff --git a/usr.sbin/afs/src/lwp/process.vax.S b/usr.sbin/afs/src/lwp/process.vax.S
index ddf1808f7b9..01ffd9ba66b 100644
--- a/usr.sbin/afs/src/lwp/process.vax.S
+++ b/usr.sbin/afs/src/lwp/process.vax.S
@@ -70,7 +70,7 @@
 
 _savecontext:
 	.word 0x0ffc	# Save regs R2-R11
-	movb	$1,_PRE_Block		# Critical section for preemption code
+	movl	$1,_PRE_Block		# Critical section for preemption code
    	pushl	ap			# save old ap
 	pushl	fp			# save old fp    
 	movl	area1(ap),r0		# r0 = base of savearea
@@ -101,7 +101,7 @@ _returnto:
 	movl	topstack(r0),sp		# Restore sp
 	movl	(sp)+,fp		# Restore fp
 	movl	(sp)+,ap		# ,,,,
-	clrb	_PRE_Block		# End of preemption critical section
+	clrl	_PRE_Block		# End of preemption critical section
 	ret
 
 	pushl	$1234			# I will gloat, Kazar