Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sun4v: rft_kernel should pay attention to the number of register windows that can be restored. We cannot rely on fill traps to occur, since sun4v only has two trap levels available in privileged mode. Based on code from OpenBSD. ok martin@

Browse Source
This commit is contained in:
palle 2016-03-03 20:45:45 +00:00
parent 8142c3d9b6
commit 80fa20e7c1
1 changed files with 45 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
sys/arch/sparc64/sparc64/locore.s
View File

@ -1,4 +1,4 @@
/* $NetBSD: locore.s,v 1.388 2016/02/14 21:13:33 palle Exp $ */
/* $NetBSD: locore.s,v 1.389 2016/03/03 20:45:45 palle Exp $ */
/*
* Copyright (c) 2006-2010 Matthew R. Green
@ -355,6 +355,35 @@ cputyp: .word CPU_SUN4U ! Default to sun4u
#define CLRTT
#endif
/*
* Some macros to load and store a register window
*/
.macro SPILL storer,base,size,asi
.irpc n,01234567
\storer %l\n, [\base + (\n * \size)] \asi
.endr
.irpc n,01234567
\storer %i\n, [\base + ((8+\n) * \size)] \asi
.endr
.endm
.macro FILL loader, base, size, asi
.irpc n,01234567
\loader [\base + (\n * \size)] \asi, %l\n
.endr
.irpc n,01234567
\loader [\base + ((8+\n) * \size)] \asi, %i\n
.endr
.endm
/*
* Here are some oft repeated traps as macros.
*/
@ -4079,12 +4108,26 @@ return_from_trap:
*
*/
rft_kernel:
rdpr %tl, %g4 ! Grab a set of trap registers
rdpr %tl, %g4 ! Grab a set of trap registers
inc %g4
wrpr %g4, %g0, %tl
wrpr %g3, 0, %tnpc
wrpr %g2, 0, %tpc
wrpr %g1, 0, %tstate
rdpr %canrestore, %g2
brnz %g2, 1f
nop
wr %g0, ASI_NUCLEUS, %asi
rdpr %cwp, %g1
dec %g1
wrpr %g1, %cwp
FILL ldxa, %sp+BIAS, 8, %asi
restored
inc %g1
wrpr %g1, %cwp
1:
restore
rdpr %tstate, %g1 ! Since we may have trapped our regs may be toast
rdpr %cwp, %g2