From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48128) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1akuSo-0002bM-6N for qemu-devel@nongnu.org; Tue, 29 Mar 2016 10:17:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1akuSj-000641-6L for qemu-devel@nongnu.org; Tue, 29 Mar 2016 10:17:46 -0400 Received: from mout.kundenserver.de ([212.227.17.24]:54572) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1akuSi-00063w-Te for qemu-devel@nongnu.org; Tue, 29 Mar 2016 10:17:41 -0400 References: <1459259629-5312-1-git-send-email-chengang@emindsoft.com.cn> From: Laurent Vivier Message-ID: <56FA8E6B.7020507@vivier.eu> Date: Tue, 29 Mar 2016 16:17:15 +0200 MIME-Version: 1.0 In-Reply-To: <1459259629-5312-1-git-send-email-chengang@emindsoft.com.cn> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Subject: Re: [Qemu-devel] [PATCH v2] linux-user/signal.c: Generate opcode data for restorer in setup_rt_frame List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: chengang@emindsoft.com.cn, rth@twiddle.net, peter.maydell@linaro.org, cmetcalf@ezchip.com Cc: walt@tilera.com, riku.voipio@iki.fi, qemu-devel@nongnu.org, Chen Gang Le 29/03/2016 15:53, chengang@emindsoft.com.cn a écrit : > From: Chen Gang > > Original implementation uses do_rt_sigreturn directly in host space, > when a guest program is in unwind procedure in guest space, it will get > an incorrect restore address, then causes unwind failure. > > Also cleanup the original incorrect indentation. > > Signed-off-by: Chen Gang Reviewed-by: Laurent Vivier > --- > linux-user/signal.c | 12 ++++++++++-- > 1 file changed, 10 insertions(+), 2 deletions(-) > > diff --git a/linux-user/signal.c b/linux-user/signal.c > index 96e86c0..e487f9e 100644 > --- a/linux-user/signal.c > +++ b/linux-user/signal.c > @@ -5559,8 +5559,13 @@ struct target_rt_sigframe { > unsigned char save_area[16]; /* caller save area */ > struct target_siginfo info; > struct target_ucontext uc; > + abi_ulong retcode[2]; > }; > > +#define INSN_MOVELI_R10_139 0x00045fe551483000ULL /* { moveli r10, 139 } */ > +#define INSN_SWINT1 0x286b180051485000ULL /* { swint1 } */ > + > + > static void setup_sigcontext(struct target_sigcontext *sc, > CPUArchState *env, int signo) > { > @@ -5636,9 +5641,12 @@ static void setup_rt_frame(int sig, struct target_sigaction *ka, > __put_user(target_sigaltstack_used.ss_size, &frame->uc.tuc_stack.ss_size); > setup_sigcontext(&frame->uc.tuc_mcontext, env, info->si_signo); > > - restorer = (unsigned long) do_rt_sigreturn; > if (ka->sa_flags & TARGET_SA_RESTORER) { > - restorer = (unsigned long) ka->sa_restorer; > + restorer = (unsigned long) ka->sa_restorer; > + } else { > + __put_user(INSN_MOVELI_R10_139, &frame->retcode[0]); > + __put_user(INSN_SWINT1, &frame->retcode[1]); > + restorer = frame_addr + offsetof(struct target_rt_sigframe, retcode); > } > env->pc = (unsigned long) ka->_sa_handler; > env->regs[TILEGX_R_SP] = (unsigned long) frame; >