diff options
| author | Jake Burkholder <jake@FreeBSD.org> | 2003-01-10 00:04:56 +0000 |
|---|---|---|
| committer | Jake Burkholder <jake@FreeBSD.org> | 2003-01-10 00:04:56 +0000 |
| commit | 4ee5222bac1ab213c3e47b42e9db67261d1e06ca (patch) | |
| tree | a296d9e8d9c6192cb38c55ae2f0c8b0f971a06ae | |
| parent | a9a7a91220b033233c9c015565b1d4078e67deb5 (diff) | |
Notes
| -rw-r--r-- | sys/sparc64/include/ucontext.h | 1 | ||||
| -rw-r--r-- | sys/sparc64/sparc64/machdep.c | 12 |
2 files changed, 9 insertions, 4 deletions
diff --git a/sys/sparc64/include/ucontext.h b/sys/sparc64/include/ucontext.h index b4550c6f0af9..c05ec26a9053 100644 --- a/sys/sparc64/include/ucontext.h +++ b/sys/sparc64/include/ucontext.h @@ -51,6 +51,7 @@ typedef struct __mcontext mcontext_t; #define mc_tpc mc_in[1] #define mc_tstate mc_in[2] #define mc_y mc_in[4] +#define mc_wstate mc_in[5] #define _MC_VERSION_SHIFT 0 #define _MC_VERSION_BITS 32 diff --git a/sys/sparc64/sparc64/machdep.c b/sys/sparc64/sparc64/machdep.c index df6722f73308..2c0efd8c5f6b 100644 --- a/sys/sparc64/sparc64/machdep.c +++ b/sys/sparc64/sparc64/machdep.c @@ -461,7 +461,9 @@ struct sigreturn_args { int sigreturn(struct thread *td, struct sigreturn_args *uap) { + struct trapframe *tf; struct proc *p; + mcontext_t *mc; ucontext_t uc; p = td->td_proc; @@ -476,9 +478,12 @@ sigreturn(struct thread *td, struct sigreturn_args *uap) return (EFAULT); } - if (!TSTATE_SECURE(uc.uc_mcontext.mc_tstate)) + mc = &uc.uc_mcontext; + tf = td->td_frame; + if (!TSTATE_SECURE(mc->mc_tstate)) return (EINVAL); - bcopy(&uc.uc_mcontext, td->td_frame, sizeof(*td->td_frame)); + mc->mc_wstate = tf->tf_wstate; + bcopy(mc, tf, sizeof(*tf)); PROC_LOCK(p); p->p_sigmask = uc.uc_sigmask; @@ -487,8 +492,7 @@ sigreturn(struct thread *td, struct sigreturn_args *uap) PROC_UNLOCK(p); CTR4(KTR_SIG, "sigreturn: return td=%p pc=%#lx sp=%#lx tstate=%#lx", - td, td->td_frame->tf_tpc, td->td_frame->tf_sp, - td->td_frame->tf_tstate); + td, tf->tf_tpc, tf->tf_sp, tf->tf_tstate); return (EJUSTRETURN); } |