back out changes to rei function

3 files changed, 12 insertions, 119 deletions

diff --git a/sys/arch/sun3/include/machdep.h b/sys/arch/sun3/include/machdep.h
index 82c3573552a..f53af4afbdb 100644
--- a/sys/arch/sun3/include/machdep.h
+++ b/sys/arch/sun3/include/machdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: machdep.h,v 1.5 1997/02/14 19:24:04 kstailey Exp $	*/
+/*	$OpenBSD: machdep.h,v 1.6 1997/02/14 23:50:17 kstailey Exp $	*/
 /*
  * Copyright (c) 1994 Gordon W. Ross
  * Copyright (c) 1993 Adam Glass
@@ -45,9 +45,14 @@
 
 #ifdef _KERNEL
 
-#define	FC_CONTROL 3		/* sun control space
+#define	FC_CONTROL	3	/* sun control space
 				   XXX HP uses FC_PURGE instead */
 
+#define	SPL1		(PSL_S | PSL_IPL1); /* used in locore.s
+					     * XXX mvme68k does this in
+					     * genassym.c
+					     */
+
 /* Prototypes... */
 
 struct frame;
diff --git a/sys/arch/sun3/include/param.h b/sys/arch/sun3/include/param.h
index e331b93b7e5..b9884ddb106 100644
--- a/sys/arch/sun3/include/param.h
+++ b/sys/arch/sun3/include/param.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: param.h,v 1.12 1997/02/14 19:24:05 kstailey Exp $	*/
+/*	$OpenBSD: param.h,v 1.13 1997/02/14 23:50:18 kstailey Exp $	*/
 /*	$NetBSD: param.h,v 1.34 1996/03/04 05:04:40 cgd Exp $	*/
 
 /*
@@ -150,7 +150,7 @@
 #define sun3_ptob(x)		((unsigned)(x) << PGSHIFT)
 
 /*
- * spl functions; all but spl0 are done in-line
+ * spl functions; all are done in-line
  */
 
 #include <machine/psl.h>
@@ -171,6 +171,7 @@
  * have no need to check for any simulated interrupts, etc.
  */
 
+#define spl0()  _spl(PSL_S|PSL_IPL0)
 #define spl1()  _spl(PSL_S|PSL_IPL1)
 #define spl2()  _spl(PSL_S|PSL_IPL2)
 #define spl3()  _spl(PSL_S|PSL_IPL3)
@@ -178,6 +179,7 @@
 #define spl5()  _spl(PSL_S|PSL_IPL5)
 #define spl6()  _spl(PSL_S|PSL_IPL6)
 #define spl7()  _spl(PSL_S|PSL_IPL7)
+#define splx(x)  _spl(x)
 
 /* IPL used by soft interrupts: netintr(), softclock() */
 #define splsoftclock()  spl1()
@@ -206,11 +208,6 @@
 #define splhigh()       spl7()
 #define splsched()      spl7()
 
-void spl0 __P((void));		/* XXX where should this go? */
-
-/* watch out for side effects */
-#define	splx(s)		(s & PSL_IPL ? _spl(s) : spl0())
-
 /* Get current sr value (debug, etc.) */
 extern int getsr __P((void));
 
diff --git a/sys/arch/sun3/sun3/locore.s b/sys/arch/sun3/sun3/locore.s
index 813d66c8e81..44801c4a30a 100644
--- a/sys/arch/sun3/sun3/locore.s
+++ b/sys/arch/sun3/sun3/locore.s
@@ -1,4 +1,4 @@
-/*	$OpenBSD: locore.s,v 1.13 1997/02/14 18:15:23 kstailey Exp $	*/
+/*	$OpenBSD: locore.s,v 1.14 1997/02/14 23:50:20 kstailey Exp $	*/
 /*	$NetBSD: locore.s,v 1.40 1996/11/06 20:19:54 cgd Exp $	*/
 
 /*
@@ -696,7 +696,6 @@ _intrcnt:
 _eintrcnt:
 	.text
 
-#if 0
 /*
  * Emulation of VAX REI instruction.
  *
@@ -756,95 +755,7 @@ Laststkadj:
 	movl	sp@,sp			| and our SP
 Ldorte:
 	rte				| real return
-#else
-/*
- * Emulation of VAX REI instruction.
- *
- * This code deals with checking for and servicing ASTs
- * (profiling, scheduling) and software interrupts (network, softclock).
- * We check for ASTs first, just like the VAX.  To avoid excess overhead
- * the T_ASTFLT handling code will also check for software interrupts so we
- * do not have to do it here.  After identifing that we need an AST we
- * drop the IPL to allow device interrupts.
- *
- * This code is complicated by the fact that sendsig may have been called
- * necessitating a stack cleanup.
- */
-	.comm	_ssir,1
-	.globl	_astpending
-	.globl	rei
-rei:
-#ifdef	DIAGNOSTIC
-	tstl	_panicstr		| have we paniced?
-	jne	Ldorte			| yes, do not make matters worse
-#endif
-	tstl	_astpending		| AST pending?
-	jeq	Lchksir			| no, go check for SIR
-Lrei1:
-	btst	#5,sp@			| yes, are we returning to user mode?
-	jne	Lchksir			| no, go check for SIR
-	movw	#PSL_LOWIPL,sr		| lower SPL
-	clrl	sp@-			| stack adjust
-	moveml	#0xFFFF,sp@-		| save all registers
-	movl	usp,a1			| including
-	movl	a1,sp@(FR_SP)		|    the users SP
-Lrei2:
-	clrl	sp@-			| VA == none
-	clrl	sp@-			| code == none
-	movl	#T_ASTFLT,sp@-		| type == async system trap
-	jbsr	_trap			| go handle it
-	lea	sp@(12),sp		| pop value args
-	movl	sp@(FR_SP),a0		| restore user SP
-	movl	a0,usp			|   from save area
-	movw	sp@(FR_ADJ),d0		| need to adjust stack?
-	jne	Laststkadj		| yes, go to it
-	moveml	sp@+,#0x7FFF		| no, restore most user regs
-	addql	#8,sp			| toss SP and stack adjust
-	rte				| and do real RTE
-Laststkadj:
-	lea	sp@(FR_HW),a1		| pointer to HW frame
-	addql	#8,a1			| source pointer
-	movl	a1,a0			| source
-	addw	d0,a0			|  + hole size = dest pointer
-	movl	a1@-,a0@-		| copy
-	movl	a1@-,a0@-		|  8 bytes
-	movl	a0,sp@(FR_SP)		| new SSP
-	moveml	sp@+,#0x7FFF		| restore user registers
-	movl	sp@,sp			| and our SP
-	rte				| and do real RTE
-Lchksir:
-	tstb	_ssir			| SIR pending?
-	jeq	Ldorte			| no, all done
-	movl	d0,sp@-			| need a scratch register
-	movw	sp@(4),d0		| get SR
-	andw	#PSL_IPL7,d0		| mask all but IPL
-	jne	Lnosir			| came from interrupt, no can do
-	movl	sp@+,d0			| restore scratch register
-Lgotsir:
-	movw	#SPL1,sr		| prevent others from servicing int
-	tstb	_ssir			| too late?
-	jeq	Ldorte			| yes, oh well...
-	clrl	sp@-			| stack adjust
-	moveml	#0xFFFF,sp@-		| save all registers
-	movl	usp,a1			| including
-	movl	a1,sp@(FR_SP)		|    the users SP
-Lsir1:
-	clrl	sp@-			| VA == none
-	clrl	sp@-			| code == none
-	movl	#T_SSIR,sp@-		| type == software interrupt
-	jbsr	_trap			| go handle it
-	lea	sp@(12),sp		| pop value args
-	movl	sp@(FR_SP),a0		| restore
-	movl	a0,usp			|   user SP
-	moveml	sp@+,#0x7FFF		| and all remaining registers
-	addql	#8,sp			| pop SP and stack adjust
-	rte
-Lnosir:
-	movl	sp@+,d0			| restore scratch register
-Ldorte:
-	rte				| real return
 
-#endif
 /*
  * Initialization is at the beginning of this file, because the
  * kernel entry point needs to be at zero for compatibility with
@@ -1296,26 +1207,6 @@ ENTRY(getsr)
 	movw	sr, d0
 	rts
 
-/*
- * Set processor priority level calls.  Most are implemented with
- * inline asm expansions.  However, spl0 requires special handling
- * as we need to check for our emulated software interrupts.
- */
-
-ENTRY(spl0)
-	moveq	#0,d0
-	movw	sr,d0			| get old SR for return
-	movw	#PSL_LOWIPL,sr		| restore new SR
-	tstb	_ssir			| software interrupt pending?
-	jeq	Lspldone		| no, all done
-	subql	#4,sp			| make room for RTE frame
-	movl	sp@(4),sp@(2)		| position return address
-	clrw	sp@(6)			| set frame type 0
-	movw	#PSL_LOWIPL,sp@		| and new SR
-	jra	Lgotsir			| go handle it
-Lspldone:
-	rts
-
 ENTRY(_insque)
 	movw	sr,d0
 	movw	#PSL_HIGHIPL,sr		| atomic