From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B8B75C433ED for ; Tue, 18 May 2021 06:22:40 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 461B561108 for ; Tue, 18 May 2021 06:22:40 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 461B561108 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=vivier.eu Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:49168 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lit7n-0006Sp-6C for qemu-devel@archiver.kernel.org; Tue, 18 May 2021 02:22:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38890) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lisKv-00082c-Js for qemu-devel@nongnu.org; Tue, 18 May 2021 01:32:09 -0400 Received: from mout.kundenserver.de ([212.227.126.133]:36443) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lisKn-0007At-TL for qemu-devel@nongnu.org; Tue, 18 May 2021 01:32:09 -0400 Received: from quad ([82.142.31.78]) by mrelayeu.kundenserver.de (mreue012 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MY5XR-1lz3kQ3ZOv-00YUrr; Tue, 18 May 2021 07:32:00 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 52/59] linux-user/alpha: Rename the sigaction restorer field Date: Tue, 18 May 2021 07:31:24 +0200 Message-Id: <20210518053131.87212-53-laurent@vivier.eu> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210518053131.87212-1-laurent@vivier.eu> References: <20210518053131.87212-1-laurent@vivier.eu> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Provags-ID: V03:K1:K2psfa9jXqEEivhDCg+2n6aQTY9DWHOizqKOq3PZCCjgYx2pY4h i7g8TDkRNxflnWxZ1LgzMlQ6rtE9VSmCY2Er6udjyW29Wf+6zOJb6XUR0CmCTUTrxdTNSNh YxGswmwviR8RDi6vHP+9ADEED871dKPWktc6Z/ctmeXaGJWnidmV2TbYU15N79gOXL+xnLs ZKLRXsbqHnVI3hmFfDGCA== X-UI-Out-Filterresults: notjunk:1;V03:K0:i3+9xms7wIg=:Dz5kCIVe6H34KCYiYKhPE4 g74QqcE5myoZT74nBs+4Igfi06VGOL4eDxhbwmhQLE2RC0or0gvE99nVj9a9tVIOj9rZFPUql 1Cwe6FKn8GmLfGAi6+uyqRg379+hDyNYwylmV0EOB3TmoiZAH4RQfJR8LoTImhJkxzBWbrhwh fQmFtgy7jktQ3rApDZxBt+XKuXJ3NpjjQPCViwNw+ZFX+g+yn9wd0HD6cBbJwdNFJlQCxSSiR 22D875CG62Hl3+Nb3fwUtxxIL+YtAsCR06vgWQGJtWQIurRqlnB9bKKuIW45SJZO+zf+rzUMk Y0RYwLgix2QdoSSlZUbuUv1deYcT7vwd1Lg6H04Vr+KGSSQl9XHeimOupBonDQPYIjdtLN1+d chsJFripOM2JOehtqB/u1PIGR/bfbicqVDNWPk9s7O9bCF4ufwFEqVMx3lBcrOXCMcqakxgMx M0wgKjV6trMd00F63PXY1kHeIrTdTvMw6VOSWNPefOdchliN3sssEc1KpG6ePLnSUb23YAcho E/IRwEllqwNGdkxHHqfhT0= Received-SPF: none client-ip=212.227.126.133; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Richard Henderson , Laurent Vivier Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Richard Henderson Use ka_restorer, in line with TARGET_ARCH_HAS_KA_RESTORER vs TARGET_ARCH_HAS_SA_RESTORER, since Alpha passes this field as a syscall argument. Signed-off-by: Richard Henderson Reviewed-by: Alex Bennée Message-Id: <20210422230227.314751-3-richard.henderson@linaro.org> Signed-off-by: Laurent Vivier --- linux-user/alpha/signal.c | 8 ++++---- linux-user/syscall.c | 4 ++-- linux-user/syscall_defs.h | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/linux-user/alpha/signal.c b/linux-user/alpha/signal.c index 0eec9ba3fd82..1129ffeea1d8 100644 --- a/linux-user/alpha/signal.c +++ b/linux-user/alpha/signal.c @@ -138,8 +138,8 @@ void setup_frame(int sig, struct target_sigaction *ka, setup_sigcontext(&frame->sc, env, frame_addr, set); - if (ka->sa_restorer) { - r26 = ka->sa_restorer; + if (ka->ka_restorer) { + r26 = ka->ka_restorer; } else { __put_user(INSN_MOV_R30_R16, &frame->retcode[0]); __put_user(INSN_LDI_R0 + TARGET_NR_sigreturn, @@ -192,8 +192,8 @@ void setup_rt_frame(int sig, struct target_sigaction *ka, __put_user(set->sig[i], &frame->uc.tuc_sigmask.sig[i]); } - if (ka->sa_restorer) { - r26 = ka->sa_restorer; + if (ka->ka_restorer) { + r26 = ka->ka_restorer; } else { __put_user(INSN_MOV_R30_R16, &frame->retcode[0]); __put_user(INSN_LDI_R0 + TARGET_NR_rt_sigreturn, diff --git a/linux-user/syscall.c b/linux-user/syscall.c index e05870c33884..82736540ebcc 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -8989,7 +8989,7 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1, act._sa_handler = old_act->_sa_handler; target_siginitset(&act.sa_mask, old_act->sa_mask); act.sa_flags = old_act->sa_flags; - act.sa_restorer = 0; + act.ka_restorer = 0; unlock_user_struct(old_act, arg2, 0); pact = &act; } @@ -9085,7 +9085,7 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1, act._sa_handler = rt_act->_sa_handler; act.sa_mask = rt_act->sa_mask; act.sa_flags = rt_act->sa_flags; - act.sa_restorer = arg5; + act.ka_restorer = arg5; unlock_user_struct(rt_act, arg2, 0); pact = &act; } diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h index 25be414727f5..693d4f3788d4 100644 --- a/linux-user/syscall_defs.h +++ b/linux-user/syscall_defs.h @@ -519,7 +519,7 @@ struct target_sigaction { abi_ulong _sa_handler; abi_ulong sa_flags; target_sigset_t sa_mask; - abi_ulong sa_restorer; + abi_ulong ka_restorer; }; #elif defined(TARGET_MIPS) struct target_sigaction { -- 2.31.1