PERFORCE change 39949 for review

[Juli Mallett]

http://perforce.freebsd.org/chv.cgi?CH=39949

Change 39949 by jmallett at jmallett_dalek on 2003/10/18 19:25:29

	remove dynamic status mask stuff

Affected files ...

.. //depot/projects/mips/sys/mips/include/asm.h#10 edit
.. //depot/projects/mips/sys/mips/mips/locore_mips3.S#10 edit
.. //depot/projects/mips/sys/mips/mips/mips_subr.S#10 edit

Differences ...

==== //depot/projects/mips/sys/mips/include/asm.h#10 (text+ko) ====

@@ -160,27 +160,4 @@
 #define	REG_LI	dli
 #define SZREG	8
 
-/*
- * The DYNAMIC_STATUS_MASK option adds an additional masking operation
- * when updating the hardware interrupt mask in the status register.
- *
- * This is useful for platforms that need to at run-time mask
- * interrupts based on motherboard configuration or to handle
- * slowly clearing interrupts.
- *
- * XXX this is only currently implemented for mips3.
- */
-#ifdef MIPS_DYNAMIC_STATUS_MASK
-#define DYNAMIC_STATUS_MASK(sr,scratch)	\
-	lw	scratch, mips_dynamic_status_mask; \
-	and	sr, sr, scratch
-
-#define DYNAMIC_STATUS_MASK_TOUSER(sr,scratch1)		\
-	ori	sr, (MIPS_INT_MASK | MIPS_SR_INT_IE);	\
-	DYNAMIC_STATUS_MASK(sr,scratch1)
-#else
-#define DYNAMIC_STATUS_MASK(sr,scratch)
-#define DYNAMIC_STATUS_MASK_TOUSER(sr,scratch1)
-#endif
-
 #endif /* !_MACHINE_ASM_H_ */

==== //depot/projects/mips/sys/mips/mips/locore_mips3.S#10 (text+ko) ====

@@ -213,7 +213,6 @@
 	nop
 #endif
 	li	t0, (MIPS_INT_MASK | MIPS_SR_INT_IE)
-	DYNAMIC_STATUS_MASK(t0,t1)		# machine dependent masking
 	mtc0	t0, MIPS_COP_0_STATUS		# enable all interrupts
 	COP0_SYNC
 	nop
@@ -228,14 +227,6 @@
 	nop
 #endif
 1:
-#ifdef MIPS_DYNAMIC_STATUS_MASK
-	# Do this again since the mask may have changed.
-	li	t3, (MIPS_INT_MASK | MIPS_SR_INT_IE)
-	DYNAMIC_STATUS_MASK(t3,t1)		# machine dependent masking
-	mtc0	t3, MIPS_COP_0_STATUS		# enable all interrupts
-	COP0_SYNC
-	nop
-#endif
 #if XXX
 	lw	t0, sched_whichqs	# look for non-empty queue
 	bne	t0, zero, 1f
@@ -303,7 +294,6 @@
 
 LEAF(longjmp)
 	REG_L	v0, SF_REG_SR(a0)
-	DYNAMIC_STATUS_MASK(v0,ra)		# machine dependent masking
 	REG_L	ra, SF_REG_RA(a0)
 	REG_L	s0, SF_REG_S0(a0)
 	REG_L	s1, SF_REG_S1(a0)

==== //depot/projects/mips/sys/mips/mips/mips_subr.S#10 (text+ko) ====

@@ -441,7 +441,6 @@
 	REG_L	t8, FRAME_T8(k1)
 	REG_L	t9, FRAME_T9(k1)
 	REG_L	k0, FRAME_SR(k1)
-	DYNAMIC_STATUS_MASK(k0, sp)		# machine dependent masking
 	REG_L	gp, FRAME_GP(k1)
 	REG_L	s8, FRAME_S8(k1)
 	REG_L	ra, FRAME_RA(k1)