From owner-svn-src-user@FreeBSD.ORG  Fri Mar 26 22:04:57 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 DBAEA106566B;
	Fri, 26 Mar 2010 22:04:57 +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 CBD768FC1B;
	Fri, 26 Mar 2010 22:04:57 +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 o2QM4vYM073644;
	Fri, 26 Mar 2010 22:04:57 GMT
	(envelope-from jmallett@svn.freebsd.org)
Received: (from jmallett@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o2QM4vYW073642;
	Fri, 26 Mar 2010 22:04:57 GMT
	(envelope-from jmallett@svn.freebsd.org)
Message-Id: <201003262204.o2QM4vYW073642@svn.freebsd.org>
From: Juli Mallett <jmallett@FreeBSD.org>
Date: Fri, 26 Mar 2010 22:04:57 +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: r205715 - 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: Fri, 26 Mar 2010 22:04:57 -0000

Author: jmallett
Date: Fri Mar 26 22:04:57 2010
New Revision: 205715
URL: http://svn.freebsd.org/changeset/base/205715

Log:
  Shift exception code to get offset into table of 64-bit pointers.

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	Fri Mar 26 22:04:11 2010	(r205714)
+++ user/jmallett/octeon/sys/mips/mips/exception.S	Fri Mar 26 22:04:57 2010	(r205715)
@@ -203,6 +203,9 @@ VECTOR(MipsException, unknown)
 	sll	k0, k0, 3			# shift user bit for cause index
 #endif
 	and	k1, k1, CR_EXC_CODE		# Mask out the cause bits.
+#if defined(__mips_n64)
+	sll	k1, k1, 1			# shift code 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