From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NnyuL-0008Cu-Ug for qemu-devel@nongnu.org; Sat, 06 Mar 2010 13:39:26 -0500 Received: from [199.232.76.173] (port=33716 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NnyuL-0008Ch-3z for qemu-devel@nongnu.org; Sat, 06 Mar 2010 13:39:25 -0500 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1NnyuH-0005Hg-FA for qemu-devel@nongnu.org; Sat, 06 Mar 2010 13:39:24 -0500 Received: from hall.aurel32.net ([88.191.82.174]:59284) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NnyuG-0005HL-TT for qemu-devel@nongnu.org; Sat, 06 Mar 2010 13:39:21 -0500 Date: Sat, 6 Mar 2010 19:39:11 +0100 From: Aurelien Jarno Subject: Re: [Qemu-devel] [PATCH] sh4 linux-user: Save/restore fpu registers to signal context. Message-ID: <20100306183911.GH14275@volta.aurel32.net> References: <201002171546.o1HFkjhW009910@smtp09.dti.ne.jp> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-15 Content-Disposition: inline In-Reply-To: <201002171546.o1HFkjhW009910@smtp09.dti.ne.jp> List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: takasi-y@ops.dti.ne.jp Cc: qemu-devel@nongnu.org On Thu, Feb 18, 2010 at 12:46:45AM +0900, takasi-y@ops.dti.ne.jp wrote: > As "todo" comment in source code. > And modify restore_sigcontext() to have three args as kernel's does. > > Signed-off-by: Takashi YOSHII Thanks, applied. > --- > linux-user/signal.c | 27 +++++++++++++++++++-------- > 1 files changed, 19 insertions(+), 8 deletions(-) > > diff --git a/linux-user/signal.c b/linux-user/signal.c > index b0faf2e..8697511 100644 > --- a/linux-user/signal.c > +++ b/linux-user/signal.c > @@ -2812,6 +2812,7 @@ static int setup_sigcontext(struct target_sigcontext *sc, > CPUState *regs, unsigned long mask) > { > int err = 0; > + int i; > > #define COPY(x) err |= __put_user(regs->x, &sc->sc_##x) > COPY(gregs[0]); COPY(gregs[1]); > @@ -2827,7 +2828,10 @@ static int setup_sigcontext(struct target_sigcontext *sc, > COPY(sr); COPY(pc); > #undef COPY > > - /* todo: save FPU registers here */ > + for (i=0; i<16; i++) > + err |= __put_user(regs->fregs[i], &sc->sc_fpregs[i]); > + err |= __put_user(regs->fpscr, &sc->sc_fpscr); > + err |= __put_user(regs->fpul, &sc->sc_fpul); > > /* non-iBCS2 extensions.. */ > err |= __put_user(mask, &sc->oldmask); > @@ -2835,10 +2839,11 @@ static int setup_sigcontext(struct target_sigcontext *sc, > return err; > } > > -static int restore_sigcontext(CPUState *regs, > - struct target_sigcontext *sc) > +static int restore_sigcontext(CPUState *regs, struct target_sigcontext *sc, > + target_ulong *r0_p) > { > unsigned int err = 0; > + int i; > > #define COPY(x) err |= __get_user(regs->x, &sc->sc_##x) > COPY(gregs[1]); > @@ -2854,9 +2859,13 @@ static int restore_sigcontext(CPUState *regs, > COPY(sr); COPY(pc); > #undef COPY > > - /* todo: restore FPU registers here */ > + for (i=0; i<16; i++) > + err |= __get_user(regs->fregs[i], &sc->sc_fpregs[i]); > + err |= __get_user(regs->fpscr, &sc->sc_fpscr); > + err |= __get_user(regs->fpul, &sc->sc_fpul); > > regs->tra = -1; /* disable syscall checks */ > + err |= __get_user(*r0_p, &sc->sc_gregs[0]); > return err; > } > > @@ -2980,6 +2989,7 @@ long do_sigreturn(CPUState *regs) > abi_ulong frame_addr; > sigset_t blocked; > target_sigset_t target_set; > + target_ulong r0; > int i; > int err = 0; > > @@ -3001,11 +3011,11 @@ long do_sigreturn(CPUState *regs) > target_to_host_sigset_internal(&blocked, &target_set); > sigprocmask(SIG_SETMASK, &blocked, NULL); > > - if (restore_sigcontext(regs, &frame->sc)) > + if (restore_sigcontext(regs, &frame->sc, &r0)) > goto badframe; > > unlock_user_struct(frame, frame_addr, 0); > - return regs->gregs[0]; > + return r0; > > badframe: > unlock_user_struct(frame, frame_addr, 0); > @@ -3018,6 +3028,7 @@ long do_rt_sigreturn(CPUState *regs) > struct target_rt_sigframe *frame; > abi_ulong frame_addr; > sigset_t blocked; > + target_ulong r0; > > #if defined(DEBUG_SIGNAL) > fprintf(stderr, "do_rt_sigreturn\n"); > @@ -3029,7 +3040,7 @@ long do_rt_sigreturn(CPUState *regs) > target_to_host_sigset(&blocked, &frame->uc.uc_sigmask); > sigprocmask(SIG_SETMASK, &blocked, NULL); > > - if (restore_sigcontext(regs, &frame->uc.uc_mcontext)) > + if (restore_sigcontext(regs, &frame->uc.uc_mcontext, &r0)) > goto badframe; > > if (do_sigaltstack(frame_addr + > @@ -3038,7 +3049,7 @@ long do_rt_sigreturn(CPUState *regs) > goto badframe; > > unlock_user_struct(frame, frame_addr, 0); > - return regs->gregs[0]; > + return r0; > > badframe: > unlock_user_struct(frame, frame_addr, 0); > -- > 1.6.5 > > > > -- Aurelien Jarno GPG: 1024D/F1BCDB73 aurelien@aurel32.net http://www.aurel32.net