Date: Fri, 11 Sep 2009 15:31:13 +0000 (UTC) From: Nathan Whitehorn <nwhitehorn@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r197090 - projects/ppc64/sys/powerpc/aim64 Message-ID: <200909111531.n8BFVD3t055880@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: nwhitehorn Date: Fri Sep 11 15:31:13 2009 New Revision: 197090 URL: http://svn.freebsd.org/changeset/base/197090 Log: Use a more rational scheme to restore the USER_SR SLB bits. Modified: projects/ppc64/sys/powerpc/aim64/swtch.S Modified: projects/ppc64/sys/powerpc/aim64/swtch.S ============================================================================== --- projects/ppc64/sys/powerpc/aim64/swtch.S Fri Sep 11 15:07:36 2009 (r197089) +++ projects/ppc64/sys/powerpc/aim64/swtch.S Fri Sep 11 15:31:13 2009 (r197090) @@ -200,10 +200,15 @@ cpu_switchin: mtcr %r5 ld %r5,PCB_LR(%r3) /* Load the link register */ mtlr %r5 - ld %r5,PCB_AIM_USR_VSID(%r3) /* Load the USER_SR segment reg */ + + li %r5,USER_SR /* Load the USER_SR segment reg */ + sldi %r5,%r5,28 + slbie %r5 + ld %r5,PCB_AIM_USR_VSID(%r3) ld %r6,PCB_AIM_USR_ESID(%r3) ori %r6,%r6,USER_SR slbmte %r5,%r6 + isync ld %r1,PCB_SP(%r3) /* Load the stack pointer */ ld %r2,PCB_TOC(%r3) /* Load the TOC pointer */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200909111531.n8BFVD3t055880>