From owner-svn-src-user@FreeBSD.ORG  Tue Apr  6 09:26:55 2010
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0E89A106564A;
	Tue,  6 Apr 2010 09:26:55 +0000 (UTC)
	(envelope-from jmallett@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id F2ED88FC18;
	Tue,  6 Apr 2010 09:26:54 +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 o369Qsje012239;
	Tue, 6 Apr 2010 09:26:54 GMT (envelope-from jmallett@svn.freebsd.org)
Received: (from jmallett@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o369Qsgl012237;
	Tue, 6 Apr 2010 09:26:54 GMT (envelope-from jmallett@svn.freebsd.org)
Message-Id: <201004060926.o369Qsgl012237@svn.freebsd.org>
From: Juli Mallett <jmallett@FreeBSD.org>
Date: Tue, 6 Apr 2010 09:26:54 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r206258 - user/jmallett/octeon/sys/mips/mips
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 06 Apr 2010 09:26:55 -0000

Author: jmallett
Date: Tue Apr  6 09:26:54 2010
New Revision: 206258
URL: http://svn.freebsd.org/changeset/base/206258

Log:
  o) Reduce structural diffs with NetBSD wrt exception table lookup.
  o) Really, don't move 0 to CP0_STATUS.

Modified:
  user/jmallett/octeon/sys/mips/mips/exception.S

Modified: user/jmallett/octeon/sys/mips/mips/exception.S
==============================================================================
--- user/jmallett/octeon/sys/mips/mips/exception.S	Tue Apr  6 09:06:00 2010	(r206257)
+++ user/jmallett/octeon/sys/mips/mips/exception.S	Tue Apr  6 09:26:54 2010	(r206258)
@@ -179,16 +179,12 @@ VECTOR(MipsException, unknown)
 	and	k0, k0, SR_KSU_USER		# test for user mode
 						# sneaky but the bits are
 						# with us........
-#if defined(__mips_n64)
-	sll	k0, k0, 4			# shift user bit for cause index
-#else
 	sll	k0, k0, 3			# shift user bit for cause index
-#endif
 	and	k1, k1, CR_EXC_CODE		# Mask out the cause bits.
+	or	k1, k1, k0			# change index to user table
 #if defined(__mips_n64)
-	sll	k1, k1, 1			# shift code to get 8-byte offset
+	PTR_SLL	k1, k1, 1			# shift to get 8-byte offset
 #endif
-	or	k1, k1, k0			# change index to user table
 1:
 	PTR_LA	k0, _C_LABEL(machExceptionTable)  # get base of the jump table
 	PTR_ADDU k0, k0, k1			# Get the address of the
@@ -388,7 +384,6 @@ NNON_LEAF(MipsKernGenException, KERN_EXC
 	 * in trap handler
 	 */
 	mfc0	a0, COP_0_STATUS_REG
-	mtc0	zero, COP_0_STATUS_REG
 	and	a0, a0, SR_INT_MASK
 	RESTORE_REG(a1, SR, sp)
 	and	a1, a1, ~SR_INT_MASK