svn commit: r202698 - in head/sys/mips: include mips

[Neel Natu]

Author: neel
Date: Wed Jan 20 14:21:28 2010
New Revision: 202698
URL: http://svn.freebsd.org/changeset/base/202698

Log:
  Get rid of unused function MipsTLBInvalidException().
  
  Approved by: imp (mentor)

Modified:
  head/sys/mips/include/trap.h
  head/sys/mips/mips/db_trace.c
  head/sys/mips/mips/exception.S

Modified: head/sys/mips/include/trap.h
==============================================================================
--- head/sys/mips/include/trap.h	Wed Jan 20 14:17:41 2010	(r202697)
+++ head/sys/mips/include/trap.h	Wed Jan 20 14:21:28 2010	(r202698)
@@ -112,7 +112,6 @@ void MipsFPTrap(u_int, u_int, u_int);
 void MipsKernGenException(void);
 void MipsKernIntr(void);
 void MipsKernTLBInvalidException(void);
-void MipsTLBInvalidException(void);
 void MipsTLBMissException(void);
 void MipsUserGenException(void);
 void MipsUserIntr(void);

Modified: head/sys/mips/mips/db_trace.c
==============================================================================
--- head/sys/mips/mips/db_trace.c	Wed Jan 20 14:17:41 2010	(r202697)
+++ head/sys/mips/mips/db_trace.c	Wed Jan 20 14:21:28 2010	(r202698)
@@ -162,11 +162,8 @@ loop:
 		subr = (uintptr_t)MipsUserGenException;
 	else if (pcBetween(MipsKernIntr, MipsUserIntr))
 		subr = (uintptr_t)MipsKernIntr;
-	else if (pcBetween(MipsUserIntr, MipsTLBInvalidException))
+	else if (pcBetween(MipsUserIntr, MipsKernTLBInvalidException))
 		subr = (uintptr_t)MipsUserIntr;
-	else if (pcBetween(MipsTLBInvalidException,
-	    MipsKernTLBInvalidException))
-		subr = (uintptr_t)MipsTLBInvalidException;
 	else if (pcBetween(MipsKernTLBInvalidException,
 	    MipsUserTLBInvalidException))
 		subr = (uintptr_t)MipsKernTLBInvalidException;

Modified: head/sys/mips/mips/exception.S
==============================================================================
--- head/sys/mips/mips/exception.S	Wed Jan 20 14:17:41 2010	(r202697)
+++ head/sys/mips/mips/exception.S	Wed Jan 20 14:21:28 2010	(r202698)
@@ -830,35 +830,6 @@ NNON_LEAF(MipsUserIntr, STAND_FRAME_SIZE
 	.set	at
 END(MipsUserIntr)
 
-/*----------------------------------------------------------------------------
- *
- * MipsTLBInvalidException --
- *
- *	Handle a TLB invalid exception.
- *	The BaddVAddr, Context, and EntryHi registers contain the failed
- *	virtual address.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------------
- */
-NLEAF(MipsTLBInvalidException)
-	.set	noat
-	mfc0	k0, COP_0_STATUS_REG
-	nop
-	and	k0, k0, SR_KSU_USER
-	bne	k0, zero, _C_LABEL(MipsUserTLBInvalidException)
-	nop
-	.set	at
-END(MipsTLBInvalidException)
-/*
- * Fall through ...
- */
-
 NLEAF(MipsKernTLBInvalidException)
 	.set	noat
 	mfc0	k0, COP_0_BAD_VADDR	# get the fault address