From owner-svn-src-head@FreeBSD.ORG  Sat Mar 10 05:38:04 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id BBB54106566B;
	Sat, 10 Mar 2012 05:38:04 +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 AA8848FC14;
	Sat, 10 Mar 2012 05:38:04 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q2A5c4HX041838;
	Sat, 10 Mar 2012 05:38:04 GMT
	(envelope-from jmallett@svn.freebsd.org)
Received: (from jmallett@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q2A5c4XF041836;
	Sat, 10 Mar 2012 05:38:04 GMT
	(envelope-from jmallett@svn.freebsd.org)
Message-Id: <201203100538.q2A5c4XF041836@svn.freebsd.org>
From: Juli Mallett <jmallett@FreeBSD.org>
Date: Sat, 10 Mar 2012 05:38:04 +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: r232765 - head/sys/mips/mips
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 10 Mar 2012 05:38:04 -0000

Author: jmallett
Date: Sat Mar 10 05:38:04 2012
New Revision: 232765
URL: http://svn.freebsd.org/changeset/base/232765

Log:
  o) Bump INTRCOUNT_COUNT to 256, since Octeon already has >128.
     XXX It would be good to use a better way to size intrcnt.
  o) Fix literal 4s that are supposed to be sizeof (u_long).
     XXX Why the * 2 here?  Is this an artifact of a different system that this
         code came from?  We seem to allocate twice as much space for intrcnt
         as we admit to in sintrcnt.

Modified:
  head/sys/mips/mips/exception.S

Modified: head/sys/mips/mips/exception.S
==============================================================================
--- head/sys/mips/mips/exception.S	Sat Mar 10 04:14:04 2012	(r232764)
+++ head/sys/mips/mips/exception.S	Sat Mar 10 05:38:04 2012	(r232765)
@@ -71,7 +71,7 @@
 /*
  * Reasonable limit
  */
-#define	INTRCNT_COUNT	128
+#define	INTRCNT_COUNT	256
 
 
 /*
@@ -1188,14 +1188,14 @@ sintrnames:
 	.int  INTRCNT_COUNT * (MAXCOMLEN + 1) * 2
 #endif
 
-	.align	4
+	.align	(_MIPS_SZLONG / 8)
 intrcnt:
-	.space  INTRCNT_COUNT * 4 * 2
+	.space  INTRCNT_COUNT * (_MIPS_SZLONG / 8) * 2
 sintrcnt:
 #ifdef __mips_n64
-	.quad  INTRCNT_COUNT * 4 * 2
+	.quad  INTRCNT_COUNT * (_MIPS_SZLONG / 8) * 2
 #else
-	.int  INTRCNT_COUNT * 4 * 2
+	.int  INTRCNT_COUNT * (_MIPS_SZLONG / 8) * 2
 #endif