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: 325638 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 85A952C00C1 for ; Mon, 3 Mar 2014 06:45:22 +1100 (EST) Received: from localhost ([::1]:36466 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WKCDp-0003XC-Rh for incoming@patchwork.ozlabs.org; Sun, 02 Mar 2014 14:38:49 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49014) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WKCCH-0001x5-E1 for qemu-devel@nongnu.org; Sun, 02 Mar 2014 14:37:14 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WKCCG-00038f-CK for qemu-devel@nongnu.org; Sun, 02 Mar 2014 14:37:13 -0500 Received: from mnementh.archaic.org.uk ([2001:8b0:1d0::1]:46309) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WKCCG-00031Q-5y for qemu-devel@nongnu.org; Sun, 02 Mar 2014 14:37:12 -0500 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 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-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:8b0:1d0::1 Cc: Andreas Schwab , Riku Voipio , Michael Matz , Alexander Graf , patches@linaro.org Subject: [Qemu-devel] [PATCH 2/5] linux-user: AArch64: Implement SA_RESTORER for signal handlers 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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;