mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2025-01-10 14:02:43 +00:00
Code Issues Releases Activity

* Use srlz.i to serialise changes to psr.ic

Browse Source 
* Don't enable psr.i at the same time as psr.dt and psr.ic

These changes improve stability considerably.
This commit is contained in:
Doug Rabson 2001-10-07 18:40:01 +00:00
parent 1c3749836f
commit e0e2fed358
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=84632
2 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sys/ia64/ia64/exception.S
View File

@ -876,7 +876,7 @@ ENTRY(exception_restore, 0)
rsm psr.ic|psr.dt|psr.i // disable interrupt collection and vm
add r3=16,sp;
;;
srlz.d
srlz.i
dep r3=0,r3,61,3 // physical address
;;
add r16=TF_CR_IPSR,r3
@ -1240,8 +1240,8 @@ ENTRY(exception_save, 0)
mov r14=cr.iim // break immediate
ssm psr.ic|psr.dt // enable interrupts & translation
;;
srlz.d // serialize
srlz.i // serialize
;;
br.sptk.few b0 // not br.ret - we were not br.call'ed
END(exception_save)
@ -1335,9 +1335,13 @@ ENTRY(do_syscall, 0)
mov r22=cr.ifs // record user's CFM
add r23=TF_CR_IFS,r18
;;
ssm psr.dt|psr.ic|psr.i // safe to take interrupts again
ssm psr.ic|psr.dt
;;
srlz.d // serialize psr.dt and psr.ic
srlz.i // serialize psr.ic and psr.dt
;;
ssm psr.i // safe to take interrupts again
;;
srlz.d // serialize psr.i
;;
st8 [r23]=r22 // save cr.ifs
;;
@ -1374,7 +1378,7 @@ ENTRY(do_syscall, 0)
rsm psr.dt|psr.ic|psr.i // get ready to restore
;;
srlz.d // serialise psr.dt and psr.ic
srlz.i // serialise psr.dt and psr.ic
dep r30=0,loc1,61,3 // physical address
mov gp=loc2 // restore user gp
add r16=SIZEOF_TRAPFRAME,loc1

16
sys/ia64/ia64/exception.s
View File

@ -876,7 +876,7 @@ ENTRY(exception_restore, 0)
rsm psr.ic|psr.dt|psr.i // disable interrupt collection and vm
add r3=16,sp;
;;
srlz.d
srlz.i
dep r3=0,r3,61,3 // physical address
;;
add r16=TF_CR_IPSR,r3
@ -1240,8 +1240,8 @@ ENTRY(exception_save, 0)
mov r14=cr.iim // break immediate
ssm psr.ic|psr.dt // enable interrupts & translation
;;
srlz.d // serialize
srlz.i // serialize
;;
br.sptk.few b0 // not br.ret - we were not br.call'ed
END(exception_save)
@ -1335,9 +1335,13 @@ ENTRY(do_syscall, 0)
mov r22=cr.ifs // record user's CFM
add r23=TF_CR_IFS,r18
;;
ssm psr.dt|psr.ic|psr.i // safe to take interrupts again
ssm psr.ic|psr.dt
;;
srlz.d // serialize psr.dt and psr.ic
srlz.i // serialize psr.ic and psr.dt
;;
ssm psr.i // safe to take interrupts again
;;
srlz.d // serialize psr.i
;;
st8 [r23]=r22 // save cr.ifs
;;
@ -1374,7 +1378,7 @@ ENTRY(do_syscall, 0)
rsm psr.dt|psr.ic|psr.i // get ready to restore
;;
srlz.d // serialise psr.dt and psr.ic
srlz.i // serialise psr.dt and psr.ic
dep r30=0,loc1,61,3 // physical address
mov gp=loc2 // restore user gp
add r16=SIZEOF_TRAPFRAME,loc1