From owner-svn-src-head@FreeBSD.ORG  Tue Dec  8 00:44:24 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0299C106566C;
	Tue,  8 Dec 2009 00:44:24 +0000 (UTC)
	(envelope-from marcel@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id E627F8FC15;
	Tue,  8 Dec 2009 00:44:23 +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 nB80iNIQ070644;
	Tue, 8 Dec 2009 00:44:23 GMT (envelope-from marcel@svn.freebsd.org)
Received: (from marcel@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id nB80iNmv070642;
	Tue, 8 Dec 2009 00:44:23 GMT (envelope-from marcel@svn.freebsd.org)
Message-Id: <200912080044.nB80iNmv070642@svn.freebsd.org>
From: Marcel Moolenaar <marcel@FreeBSD.org>
Date: Tue, 8 Dec 2009 00:44:23 +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: r200240 - head/sys/ia64/ia64
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: Tue, 08 Dec 2009 00:44:24 -0000

Author: marcel
Date: Tue Dec  8 00:44:23 2009
New Revision: 200240
URL: http://svn.freebsd.org/changeset/base/200240

Log:
  In exception_save, write-back ar.rnat after switching the backing-
  store. Writing to ar.bspstore is defined to leave ar.rnat undefined.
  
  PR:		ia64/120315
  MFC after:	3 days

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

Modified: head/sys/ia64/ia64/exception.S
==============================================================================
--- head/sys/ia64/ia64/exception.S	Mon Dec  7 21:30:54 2009	(r200239)
+++ head/sys/ia64/ia64/exception.S	Tue Dec  8 00:44:23 2009	(r200240)
@@ -228,43 +228,42 @@ exception_save_restart:
 (p13)	dep		r20=r20,r21,0,9		// align dirty registers
 	;;
 }
-	// r20=bspstore, r22=iip, r23=ipsr
+	// r19=rnat, r20=bspstore, r22=iip, r23=ipsr
 {	.mmi
 	st8		[r31]=r23,16		// psr
 (p13)	mov		ar.bspstore=r20
 	nop		0
 	;;
 }
-{	.mmi
+{	.mmb
+(p13)	mov		ar.rnat=r19
 	mov		r18=ar.bsp
-	;;
-	mov		r19=cr.ifs
-	sub		r18=r18,r20
+	nop		0
 	;;
 }
 {	.mmi
+	mov		r19=cr.ifs
 	st8.spill	[r30]=gp,16		// gp
-	st8		[r31]=r18,16		// ndirty
-	nop		0
+	sub		r18=r18,r20
 	;;
 }
 	// r19=ifs, r22=iip
-{	.mmi
+{	.mmb
+	st8		[r31]=r18,16		// ndirty
 	st8		[r30]=r19,16		// cfm
-	st8		[r31]=r22,16		// iip
 	nop		0
 	;;
 }
 {	.mmi
-	st8		[r30]=r17		// ifa
 	mov		r18=cr.isr
+	st8		[r31]=r22,16		// iip
 	add		r29=16,r30
 	;;
 }
-{	.mmi
-	st8		[r31]=r18		// isr
-	add		r30=8,r29
-	add		r31=16,r29
+{	.mmb
+	st8		[r30]=r17,24		// ifa
+	st8		[r31]=r18,24		// isr
+	nop		0
 	;;
 }
 {	.mmi