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

Add some more info to traces.

Browse Source 
Fix a potential race in setting up the per-cpu pointer if the special
restore fails on return to user mode fails and we need to trap back
into the kernel to fault in more stack.
Remove debug code.
This commit is contained in:
Jake Burkholder 2002-01-01 21:04:27 +00:00
parent d89dbeb9e4
commit 52d966e949
2 changed files with 26 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1708,13 +1708,15 @@ ENTRY(tl1_spill_topcb)
stx %g1, [PCB_REG + PCB_NSAVED]
#if KTR_COMPILE & KTR_TRAP
CATR(KTR_TRAP, "tl1_spill_topcb: pc=%lx sp=%#lx nsaved=%d"
CATR(KTR_TRAP, "tl1_spill_topcb: pc=%#lx npc=%#lx sp=%#lx nsaved=%d"
, %g1, %g2, %g3, 7, 8, 9)
rdpr %tpc, %g2
stx %g2, [%g1 + KTR_PARM1]
stx %sp, [%g1 + KTR_PARM2]
rdpr %tnpc, %g2
stx %g2, [%g1 + KTR_PARM2]
stx %sp, [%g1 + KTR_PARM3]
ldx [PCB_REG + PCB_NSAVED], %g2
stx %g2, [%g1 + KTR_PARM3]
stx %g2, [%g1 + KTR_PARM4]
9:
#endif
@ -2332,18 +2334,6 @@ ENTRY(tl0_ret)
ldub [%sp + SPOFF + CCFSZ + TF_FPRS], %l4
ldub [%sp + SPOFF + CCFSZ + TF_WSTATE], %l5
set TSTATE_IE, %o0
andcc %l0, %o0, %g0
bnz %xcc, 1f
nop
ta %xcc, 1
1: set TSTATE_PEF, %o0
andcc %l0, %o0, %g0
bnz %xcc, 1f
nop
ta %xcc, 1
1:
wrpr %g0, PSTATE_ALT, %pstate
wrpr %g0, 0, %pil
@ -2393,10 +2383,12 @@ tl0_ret_fill:
tl0_ret_fill_end:
#if KTR_COMPILE & KTR_TRAP
CATR(KTR_TRAP, "tl0_ret: fill magic wstate=%#lx sp=%#lx"
CATR(KTR_TRAP, "tl0_ret: fill magic ps=%#lx ws=%#lx sp=%#lx"
, %l0, %l1, %l2, 7, 8, 9)
stx %l5, [%l0 + KTR_PARM1]
stx %sp, [%l0 + KTR_PARM2]
rdpr %pstate, %l1
stx %l1, [%l0 + KTR_PARM1]
stx %l5, [%l0 + KTR_PARM2]
stx %sp, [%l0 + KTR_PARM3]
9:
#endif
@ -2405,9 +2397,11 @@ tl0_ret_fill_end:
* which will copyin the window on the user's behalf.
*/
wrpr %l5, 0, %wstate
wrpr %g0, PSTATE_ALT, %pstate
mov PCPU_REG, %o0
wrpr %g0, PSTATE_KERNEL, %pstate
wrpr %g0, PSTATE_NORMAL, %pstate
mov %o0, PCPU_REG
wrpr %g0, PSTATE_KERNEL, %pstate
mov T_FILL, %o0
b %xcc, .Ltl0_trap_reenter
stw %o0, [%sp + SPOFF + CCFSZ + TF_TYPE]

32
sys/sparc64/sparc64/exception.s
View File

@ -1708,13 +1708,15 @@ ENTRY(tl1_spill_topcb)
stx %g1, [PCB_REG + PCB_NSAVED]
#if KTR_COMPILE & KTR_TRAP
CATR(KTR_TRAP, "tl1_spill_topcb: pc=%lx sp=%#lx nsaved=%d"
CATR(KTR_TRAP, "tl1_spill_topcb: pc=%#lx npc=%#lx sp=%#lx nsaved=%d"
, %g1, %g2, %g3, 7, 8, 9)
rdpr %tpc, %g2
stx %g2, [%g1 + KTR_PARM1]
stx %sp, [%g1 + KTR_PARM2]
rdpr %tnpc, %g2
stx %g2, [%g1 + KTR_PARM2]
stx %sp, [%g1 + KTR_PARM3]
ldx [PCB_REG + PCB_NSAVED], %g2
stx %g2, [%g1 + KTR_PARM3]
stx %g2, [%g1 + KTR_PARM4]
9:
#endif
@ -2332,18 +2334,6 @@ ENTRY(tl0_ret)
ldub [%sp + SPOFF + CCFSZ + TF_FPRS], %l4
ldub [%sp + SPOFF + CCFSZ + TF_WSTATE], %l5
set TSTATE_IE, %o0
andcc %l0, %o0, %g0
bnz %xcc, 1f
nop
ta %xcc, 1
1: set TSTATE_PEF, %o0
andcc %l0, %o0, %g0
bnz %xcc, 1f
nop
ta %xcc, 1
1:
wrpr %g0, PSTATE_ALT, %pstate
wrpr %g0, 0, %pil
@ -2393,10 +2383,12 @@ tl0_ret_fill:
tl0_ret_fill_end:
#if KTR_COMPILE & KTR_TRAP
CATR(KTR_TRAP, "tl0_ret: fill magic wstate=%#lx sp=%#lx"
CATR(KTR_TRAP, "tl0_ret: fill magic ps=%#lx ws=%#lx sp=%#lx"
, %l0, %l1, %l2, 7, 8, 9)
stx %l5, [%l0 + KTR_PARM1]
stx %sp, [%l0 + KTR_PARM2]
rdpr %pstate, %l1
stx %l1, [%l0 + KTR_PARM1]
stx %l5, [%l0 + KTR_PARM2]
stx %sp, [%l0 + KTR_PARM3]
9:
#endif
@ -2405,9 +2397,11 @@ tl0_ret_fill_end:
* which will copyin the window on the user's behalf.
*/
wrpr %l5, 0, %wstate
wrpr %g0, PSTATE_ALT, %pstate
mov PCPU_REG, %o0
wrpr %g0, PSTATE_KERNEL, %pstate
wrpr %g0, PSTATE_NORMAL, %pstate
mov %o0, PCPU_REG
wrpr %g0, PSTATE_KERNEL, %pstate
mov T_FILL, %o0
b %xcc, .Ltl0_trap_reenter
stw %o0, [%sp + SPOFF + CCFSZ + TF_TYPE]