d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- For the case when tl1_align(_trap) is used to call rsf_fatal via

Browse Source 
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().
This commit is contained in:
Marius Strobl 2011-06-07 23:15:21 +00:00
parent baa256da8c
commit ab267f9dbf
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sys/sparc64/sparc64/exception.S
View File

@ -1280,6 +1280,7 @@ ENTRY(tl1_data_excptn_trap)
END(tl1_data_excptn_trap) END(tl1_data_excptn_trap)
.macro tl1_align .macro tl1_align
wrpr %g0, PSTATE_ALT, %pstate
ba,a %xcc, tl1_align_trap ba,a %xcc, tl1_align_trap
nop nop
.align 32 .align 32
@ -1289,7 +1290,7 @@ ENTRY(tl1_align_trap)
RESUME_SPILLFILL_ALIGN RESUME_SPILLFILL_ALIGN
ba %xcc, tl1_sfsr_trap ba %xcc, tl1_sfsr_trap
mov T_MEM_ADDRESS_NOT_ALIGNED | T_KERNEL, %g2 mov T_MEM_ADDRESS_NOT_ALIGNED | T_KERNEL, %g2
END(tl1_data_excptn_trap) END(tl1_align_trap)
ENTRY(tl1_sfsr_trap) ENTRY(tl1_sfsr_trap)
wr %g0, ASI_DMMU, %asi wr %g0, ASI_DMMU, %asi
@ -2702,7 +2703,7 @@ tl0_ret_fill_end:
, %l0, %l1, %l2, 7, 8, 9) , %l0, %l1, %l2, 7, 8, 9)
rdpr %pstate, %l1 rdpr %pstate, %l1
stx %l1, [%l0 + KTR_PARM1] stx %l1, [%l0 + KTR_PARM1]
stx %l5, [%l0 + KTR_PARM2] stx %l6, [%l0 + KTR_PARM2]
stx %sp, [%l0 + KTR_PARM3] stx %sp, [%l0 + KTR_PARM3]
9: 9: