From patchwork Wed Mar 30 15:42:40 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chen Gang X-Patchwork-Id: 8698951 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 3EE269F44D for ; Wed, 30 Mar 2016 15:44:02 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A520520376 for ; Wed, 30 Mar 2016 15:44:01 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 1C5C520361 for ; Wed, 30 Mar 2016 15:43:56 +0000 (UTC) Received: from localhost ([::1]:54938 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1alIHj-0001EG-IW for patchwork-qemu-devel@patchwork.kernel.org; Wed, 30 Mar 2016 11:43:55 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40232) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1alIH8-0000ZP-VN for qemu-devel@nongnu.org; Wed, 30 Mar 2016 11:43:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1alIH5-0001xS-Jw for qemu-devel@nongnu.org; Wed, 30 Mar 2016 11:43:18 -0400 Received: from mail113-249.mail.alibaba.com ([205.204.113.249]:36535 helo=us-alimail-mta2.hst.scl.en.alidc.net) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1alIH5-0001wG-5j for qemu-devel@nongnu.org; Wed, 30 Mar 2016 11:43:15 -0400 X-Alimail-AntiSpam: AC=CONTINUE; BC=0.1005941|-1; FP=0|0|0|0|0|-1|-1|-1; HT=e02c03301; MF=chengang@emindsoft.com.cn; NM=1; PH=DS; RN=9; RT=8; SR=0; TI=SMTPD_----4euwx7g_1459352563; Received: from localhost.localdomain(mailfrom:chengang@emindsoft.com.cn ip:223.72.88.146) by smtp.aliyun-inc.com(10.147.43.230); Wed, 30 Mar 2016 23:42:49 +0800 From: chengang@emindsoft.com.cn To: rth@twiddle.net, peter.maydell@linaro.org, cmetcalf@ezchip.com, laurent@vivier.eu Date: Wed, 30 Mar 2016 23:42:40 +0800 Message-Id: <1459352560-4520-1-git-send-email-chengang@emindsoft.com.cn> X-Mailer: git-send-email 1.9.3 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 205.204.113.249 Cc: Chen Gang , riku.voipio@iki.fi, qemu-devel@nongnu.org, Chen Gang Subject: [Qemu-devel] [PATCH v2] Use frame->retcode instead of frame address for alpha target restorer X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Chen Gang The restorer needs the return code address which is frame->retcode, not frame itself. Signed-off-by: Chen Gang Reviewed-by: Richard Henderson Reviewed-by: Laurent Vivier --- linux-user/signal.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/linux-user/signal.c b/linux-user/signal.c index e487f9e..34367ce 100644 --- a/linux-user/signal.c +++ b/linux-user/signal.c @@ -5396,7 +5396,7 @@ static void setup_frame(int sig, struct target_sigaction *ka, &frame->retcode[1]); __put_user(INSN_CALLSYS, &frame->retcode[2]); /* imb() */ - r26 = frame_addr; + r26 = frame_addr + offsetof(struct target_sigframe, retcode); } unlock_user_struct(frame, frame_addr, 1); @@ -5455,7 +5455,7 @@ static void setup_rt_frame(int sig, struct target_sigaction *ka, &frame->retcode[1]); __put_user(INSN_CALLSYS, &frame->retcode[2]); /* imb(); */ - r26 = frame_addr; + r26 = frame_addr + offsetof(struct target_rt_sigframe, retcode); } if (err) {