From owner-svn-src-all@FreeBSD.ORG Wed Jan 20 14:21:28 2010 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A50061065694; Wed, 20 Jan 2010 14:21:28 +0000 (UTC) (envelope-from neel@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 7B67E8FC15; Wed, 20 Jan 2010 14:21:28 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o0KELSg9026265; Wed, 20 Jan 2010 14:21:28 GMT (envelope-from neel@svn.freebsd.org) Received: (from neel@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o0KELSeN026261; Wed, 20 Jan 2010 14:21:28 GMT (envelope-from neel@svn.freebsd.org) Message-Id: <201001201421.o0KELSeN026261@svn.freebsd.org> From: Neel Natu Date: Wed, 20 Jan 2010 14:21:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r202698 - in head/sys/mips: include mips X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Jan 2010 14:21:28 -0000 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