From patchwork Sun Mar 2 19:36:39 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 25581 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-oa0-f72.google.com (mail-oa0-f72.google.com [209.85.219.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id B87E0206F9 for ; Sun, 2 Mar 2014 19:36:49 +0000 (UTC) Received: by mail-oa0-f72.google.com with SMTP id g12sf17463843oah.3 for ; Sun, 02 Mar 2014 11:36:49 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=FukakDaVTCuT001jVzx3Vzst3G4Aad1p6cX1EOe1KUg=; b=cAIks9R1k7bcF7TAqufdJgcwsHOXjYhNkdVVCL2LriU2LrSQ2aW6DEXKkSwwhQpi3S 4AfMo7Al6fGTeNkn8F9y8jNODUbyaGxQlIEi4TbIc5i3x2VnC412D+MFxJD1RP76r/AU NEbtW4Mtda7YcI9Nruqt71hbsasfYqp9dg1mwoPG5YkbPgkukiQtRMzv4vzAuAzoZVyZ zwr+sHjcYJXuSRjGoZPqHaMEX3RQQtB+8OSA0OL2temIzbXmGAndNLh0SuIaBu51pH7d lY1Zpz1SRybxjbZoH4/sCQBgE4keCfohpH/nE2NpIO/peRafr9kyor32wfyb6on2DenI jMHQ== X-Gm-Message-State: ALoCoQkJaSxitMNYKzYuL1SP/dqGN8MYtkUKEM0vdVIQqOqBU62OLEW20NvosaQdndI6DvlTlumg X-Received: by 10.50.47.6 with SMTP id z6mr7058205igm.4.1393789009315; Sun, 02 Mar 2014 11:36:49 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.96.52 with SMTP id j49ls1829599qge.7.gmail; Sun, 02 Mar 2014 11:36:49 -0800 (PST) X-Received: by 10.220.88.204 with SMTP id b12mr13705301vcm.3.1393789009098; Sun, 02 Mar 2014 11:36:49 -0800 (PST) Received: from mail-ve0-f177.google.com (mail-ve0-f177.google.com [209.85.128.177]) by mx.google.com with ESMTPS id cp10si2478854ved.20.2014.03.02.11.36.49 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 02 Mar 2014 11:36:49 -0800 (PST) Received-SPF: neutral (google.com: 209.85.128.177 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.177; Received: by mail-ve0-f177.google.com with SMTP id sa20so2774348veb.8 for ; Sun, 02 Mar 2014 11:36:49 -0800 (PST) X-Received: by 10.52.237.167 with SMTP id vd7mr26519vdc.54.1393789008976; Sun, 02 Mar 2014 11:36:48 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.130.193 with SMTP id u1csp8763vcs; Sun, 2 Mar 2014 11:36:48 -0800 (PST) X-Received: by 10.66.227.193 with SMTP id sc1mr15602879pac.102.1393789007101; Sun, 02 Mar 2014 11:36:47 -0800 (PST) Received: from mnementh.archaic.org.uk (mnementh.archaic.org.uk. [2001:8b0:1d0::1]) by mx.google.com with ESMTPS id f1si8180020pbn.226.2014.03.02.11.36.45 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Sun, 02 Mar 2014 11:36:46 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 2001:8b0:1d0::1 as permitted sender) client-ip=2001:8b0:1d0::1; Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.80) (envelope-from ) id 1WKCBm-0007np-JX; Sun, 02 Mar 2014 19:36:42 +0000 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org, Alexander Graf , Michael Matz , Andreas Schwab , Riku Voipio Subject: [PATCH 2/5] linux-user: AArch64: Implement SA_RESTORER for signal handlers Date: Sun, 2 Mar 2014 19:36:39 +0000 Message-Id: <1393789002-29960-3-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1393789002-29960-1-git-send-email-peter.maydell@linaro.org> References: <1393789002-29960-1-git-send-email-peter.maydell@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: peter.maydell@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.128.177 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , From: Michael Matz Implement support for signal handlers with the SA_RESTORER flag set. Signed-off-by: Michael Matz [PMM: minor tweaks to make patch apply to current master] Signed-off-by: Peter Maydell --- linux-user/signal.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/linux-user/signal.c b/linux-user/signal.c index 29734b2..c8a1da0 100644 --- a/linux-user/signal.c +++ b/linux-user/signal.c @@ -1273,7 +1273,7 @@ static void target_setup_frame(int usig, struct target_sigaction *ka, CPUARMState *env) { struct target_rt_sigframe *frame; - abi_ulong frame_addr; + abi_ulong frame_addr, return_addr; frame_addr = get_sigframe(ka, env); if (!lock_user_struct(VERIFY_WRITE, frame, frame_addr, 0)) { @@ -1290,15 +1290,19 @@ static void target_setup_frame(int usig, struct target_sigaction *ka, __put_user(target_sigaltstack_used.ss_size, &frame->uc.tuc_stack.ss_size); target_setup_sigframe(frame, env, set); - /* mov x8,#__NR_rt_sigreturn; svc #0 */ - __put_user(0xd2801168, &frame->tramp[0]); - __put_user(0xd4000001, &frame->tramp[1]); + if (ka->sa_flags & TARGET_SA_RESTORER) { + return_addr = ka->sa_restorer; + } else { + /* mov x8,#__NR_rt_sigreturn; svc #0 */ + __put_user(0xd2801168, &frame->tramp[0]); + __put_user(0xd4000001, &frame->tramp[1]); + return_addr = frame_addr + offsetof(struct target_rt_sigframe, tramp); + } env->xregs[0] = usig; env->xregs[31] = frame_addr; env->xregs[29] = env->xregs[31] + offsetof(struct target_rt_sigframe, fp); env->pc = ka->_sa_handler; - env->xregs[30] = env->xregs[31] + - offsetof(struct target_rt_sigframe, tramp); + env->xregs[30] = return_addr; if (info) { if (copy_siginfo_to_user(&frame->info, info)) { goto give_sigsegv;