svn commit: r224355 - stable/7/sys/sparc64/sparc64

[Marius Strobl]

Author: marius
Date: Mon Jul 25 17:56:06 2011
New Revision: 224355
URL: http://svn.freebsd.org/changeset/base/224355

Log:
  MFC: r222840
  
  - For the case when tl1_align(_trap) is used to call rsf_fatal via
    RSF_FATAL we need to switch to alternate globals for KSTACK_CHECK just
    like tl1_data_excptn(_trap) does. This is more or less cosmetic because
    in case RSF_FATAL is called we're already heading south.
  - Correct an END().
  - Read the window state from the correct register for a CATR().

Modified:
  stable/7/sys/sparc64/sparc64/exception.S
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/sparc64/sparc64/exception.S
==============================================================================
--- stable/7/sys/sparc64/sparc64/exception.S	Mon Jul 25 17:56:06 2011	(r224354)
+++ stable/7/sys/sparc64/sparc64/exception.S	Mon Jul 25 17:56:06 2011	(r224355)
@@ -1276,6 +1276,7 @@ ENTRY(tl1_data_excptn_trap)
 END(tl1_data_excptn_trap)
 
 	.macro	tl1_align
+	wrpr	%g0, PSTATE_ALT, %pstate
 	ba,a	%xcc, tl1_align_trap
 	 nop
 	.align	32
@@ -1285,7 +1286,7 @@ ENTRY(tl1_align_trap)
 	RESUME_SPILLFILL_ALIGN
 	ba	%xcc, tl1_sfsr_trap
 	 mov	T_MEM_ADDRESS_NOT_ALIGNED | T_KERNEL, %g2
-END(tl1_data_excptn_trap)
+END(tl1_align_trap)
 
 ENTRY(tl1_sfsr_trap)
 	wr	%g0, ASI_DMMU, %asi
@@ -2616,7 +2617,7 @@ tl0_ret_fill_end:
 	    , %l0, %l1, %l2, 7, 8, 9)
 	rdpr	%pstate, %l1
 	stx	%l1, [%l0 + KTR_PARM1]
-	stx	%l5, [%l0 + KTR_PARM2]
+	stx	%l6, [%l0 + KTR_PARM2]
 	stx	%sp, [%l0 + KTR_PARM3]
 9:
 #endif