Date: Mon, 5 Oct 2009 14:46:56 +0000 (UTC) From: Nathan Whitehorn <nwhitehorn@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r197774 - projects/ppc64/sys/powerpc/aim64 Message-ID: <200910051446.n95EkuuX015446@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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. */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200910051446.n95EkuuX015446>