From owner-svn-src-projects@FreeBSD.ORG  Mon Oct  5 14:46:57 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 19D901065670;
	Mon,  5 Oct 2009 14:46:57 +0000 (UTC)
	(envelope-from nwhitehorn@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 090238FC12;
	Mon,  5 Oct 2009 14:46: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 n95EkuaA015448;
	Mon, 5 Oct 2009 14:46:56 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n95EkuuX015446;
	Mon, 5 Oct 2009 14:46:56 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <200910051446.n95EkuuX015446@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Mon, 5 Oct 2009 14:46:56 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r197774 - projects/ppc64/sys/powerpc/aim64
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 05 Oct 2009 14:46:57 -0000

Author: nwhitehorn
Date: Mon Oct  5 14:46:56 2009
New Revision: 197774
URL: http://svn.freebsd.org/changeset/base/197774

Log:
  Shove boot errors further down the line. The 288 bytes below the stack
  frame are available as scratch space, so take care not to overwrite them
  in the trap handlers. Real hardware now boots to the point of trying to
  start init.

Modified:
  projects/ppc64/sys/powerpc/aim64/trap_subr.S

Modified: projects/ppc64/sys/powerpc/aim64/trap_subr.S
==============================================================================
--- projects/ppc64/sys/powerpc/aim64/trap_subr.S	Mon Oct  5 14:28:23 2009	(r197773)
+++ projects/ppc64/sys/powerpc/aim64/trap_subr.S	Mon Oct  5 14:46:56 2009	(r197774)
@@ -110,7 +110,7 @@ nslb:
 	mtmsr	%r30;			/* stack can now be accessed */	\
 	isync;								\
 	mfsprg1	%r31;			/* get saved SP */		\
-	stdu	%r31,-FRAMELEN(%r1);	/* save it in the callframe */	\
+	stdu	%r31,-(FRAMELEN+288)(%r1); /* save it in the callframe */ \
 	std	%r0, FRAME_0+48(%r1);	/* save r0 in the trapframe */	\
 	std	%r31,FRAME_1+48(%r1);	/* save SP   "      "       */	\
 	std	%r2, FRAME_2+48(%r1);	/* save r2   "      "       */	\
@@ -386,7 +386,7 @@ disitrap:
 	sub.	%r30,%r31,%r30		/* SP - DAR */
 	bge	1f
 	neg	%r30,%r30		/* modulo value */
-1:	cmplwi	%cr0,%r30,4096		/* is DAR within a page of SP? */
+1:	cmpldi	%cr0,%r30,4096		/* is DAR within a page of SP? */
 	bge	%cr0,realtrap		/* no, too far away. */
 
 	/* Now convert this DSI into a DDB trap.  */