From owner-svn-src-all@freebsd.org  Wed Aug 19 06:07:33 2015
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id DBF6E9BDE1D;
 Wed, 19 Aug 2015 06:07:33 +0000 (UTC)
 (envelope-from jhibbits@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id C9D7AE3C;
 Wed, 19 Aug 2015 06:07:33 +0000 (UTC)
 (envelope-from jhibbits@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t7J67XGW059407;
 Wed, 19 Aug 2015 06:07:33 GMT (envelope-from jhibbits@FreeBSD.org)
Received: (from jhibbits@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t7J67XeY059406;
 Wed, 19 Aug 2015 06:07:33 GMT (envelope-from jhibbits@FreeBSD.org)
Message-Id: <201508190607.t7J67XeY059406@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: jhibbits set sender to
 jhibbits@FreeBSD.org using -f
From: Justin Hibbits <jhibbits@FreeBSD.org>
Date: Wed, 19 Aug 2015 06:07:33 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r286916 - head/sys/powerpc/booke
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 19 Aug 2015 06:07:34 -0000

Author: jhibbits
Date: Wed Aug 19 06:07:32 2015
New Revision: 286916
URL: https://svnweb.freebsd.org/changeset/base/286916

Log:
  Save the registers at the correct offsets.
  
  When merging the AIM and BookE trap.c files, the offsets for BookE's setfault
  inadvertantly got munged.

Modified:
  head/sys/powerpc/booke/locore.S

Modified: head/sys/powerpc/booke/locore.S
==============================================================================
--- head/sys/powerpc/booke/locore.S	Wed Aug 19 02:37:30 2015	(r286915)
+++ head/sys/powerpc/booke/locore.S	Wed Aug 19 06:07:32 2015	(r286916)
@@ -723,11 +723,12 @@ setfault:
 	mfsprg0	%r4
 	lwz	%r4, TD_PCB(%r2)
 	stw	%r3, PCB_ONFAULT(%r4)
-	mfcr	%r10
+	mfcr	%r4
 	stw	%r0, 0(%r3)
 	stw	%r1, 4(%r3)
 	stw	%r2, 8(%r3)
-	stmw	%r13, 12(%r3)		/* store CR, CTR, XER, [r13 .. r31] */
+	stw	%r4, 8(%r3)
+	stmw	%r13, 16(%r3)		/* store CR, CTR, XER, [r13 .. r31] */
 	li	%r3, 0			/* return FALSE */
 	blr