From patchwork Mon May 17 18:14:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 440221 Delivered-To: patch@linaro.org Received: by 2002:a02:7a1b:0:0:0:0:0 with SMTP id a27csp1357932jac; Mon, 17 May 2021 12:01:43 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyoPWKefp3L80oShc7q53zrMiBU9bXyZlfMzSpceIRKWfPMbrh/H3OidgEMArve7cFH3drz X-Received: by 2002:a6b:e719:: with SMTP id b25mr1136303ioh.49.1621278103113; Mon, 17 May 2021 12:01:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621278103; cv=none; d=google.com; s=arc-20160816; b=ICxudNxqttwe+8/7m4YPt6FUHdIY08IxsRIiiPRNy9x8k7YzWOlsgn9YdzLgUIEcSu Jv34Gbz4KH4B5bGWLgzlriXdsIS4h+/iGllLvUcMLB6yPBlV73DGXQy19kxfa2XhNW7U UULLSaauxpBLoul9ble6Hs+nWOyn/BNKMh1ttFXNwUgM+EcQnqglmCDu3tNVNIShKklX dKx5l9s/rTYNnVPkDaHUv7nOP34mcUfOhAqr3p6/YOnrLYOsuh+oogLuiIWqZwqoPLlu G//UF+t05t1rBlpCk5lUEQzA5wkT6FQhmOqk9LahyzXul2plVXhhP6RlaMjPOWsy2z2+ b5pg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from; bh=RJ+sW+zzu1E0vb86Cj/GRhjd4ax6PDfQ4xz4vzCw+mI=; b=U7CKRPLFBiagMr9H8GMOWjXJFVgDjKJdIkQ0WucGX3WwWRkbihBHNrsFBc+SYOUM++ p7ySV6A68pVCm8/kdOSZ0hR2wQmvhHVQjHVYuEUAWoZr/bfcyMCuDo9XRBL1m1SrylYz ORDy0V4Et+G4MxlEr5thkBjSLAhGsLbM+DoioLeanLgMY/nay+uc4TK7ziwH0IO8GeIr bXWAVjTGn2FT/C3L/PSaeGBPHWciqtlG5cs1b2exDu+0T3h2zTN+h7mQWWWOlxpeRTKG ISYuOxXKR25RD3LLREKi/upJiq2RLS+PECBB7z7eA0Q8DaTbyqwZdqbHAGM8QDIE2k/F hNAQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id a14si17997161iol.90.2021.05.17.12.01.43 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 17 May 2021 12:01:43 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Received: from localhost ([::1]:45630 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1liiUo-00047T-Ey for patch@linaro.org; Mon, 17 May 2021 15:01:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34354) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lihm6-00075I-HI for qemu-devel@nongnu.org; Mon, 17 May 2021 14:15:30 -0400 Received: from mout.kundenserver.de ([212.227.126.133]:38539) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lihlZ-0004ZG-CS for qemu-devel@nongnu.org; Mon, 17 May 2021 14:15:30 -0400 Received: from quad ([82.142.31.78]) by mrelayeu.kundenserver.de (mreue012 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MQgtC-1m5J7L0wA2-00Njdv; Mon, 17 May 2021 20:14:53 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 52/59] linux-user/alpha: Rename the sigaction restorer field Date: Mon, 17 May 2021 20:14:17 +0200 Message-Id: <20210517181424.8093-53-laurent@vivier.eu> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210517181424.8093-1-laurent@vivier.eu> References: <20210517181424.8093-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:NP6yylL70NuXkOy5Nv5OEZ/Gv8VXtFibyGr6DK5bfs628kFBpwQ fZI/os3F00E0ZjFfpNoxe7VmkRaDImrbNqNL5K40P1TX3iMaYQsq+H4uRuvNKctrw/ov73S hSQsQOtdaGvtJaZCIFN4nsP7bndcsPAawjRSgfK/pBKMDV39tvBwp6jaCpv+TbWqyKH4tlW Lfy2YBf5NEIWQdm0mtu5g== X-UI-Out-Filterresults: notjunk:1; V03:K0:V3ySZRcyrng=:g0h+yZJes7maFtDWlL2oEy 8fLcdPH4lZME0YUVsg2jJ89INhIyAtzEoIwdI463TgN6NeBM+yqScL9M0GwPgjV2Dv6jTLn4S njAv9Cj+YtF745m7kGaQvWQKwmi19zC8Y+rZ4aVm7tZ+X9GjMS7h8a3HlCAtS3f8FPYrw1NeD ou2YANGhJEJ178kvCQaPe626r9YgsJb2qjTgdVrrA+kJDq0+ZVQVevhlDaHk99C/hW09VBYfz 3NujW1ennkQTcPrIB0mVmbf9otnhiU967oUTYkRkJqqSpBeJYDY+gp2C+Ut8pfBsZAxNuP6PN BCC1NoCwoPEacIsIPrGrVeSjzyMiqB9CIo8SSz1LO7q6HklQ+0sQVhl84RqZlAkmKBUr0KwPs TZPHeC5vLwTAjwM3I69DhW75LJzdE+q8ChY+nG8jn1kYx05aCkSYxknyTttRykyH385+sxf7K 3PvpOg3tA2R6w9l0bGhNjGjpLZDqbnkqgg+M2USmSzCWdU2GqenhZF8wiUcG5n7GTFgZGwzN6 RXjGq2kIdVzxVSGFmXxYr8= 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=unavailable 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_Benn=C3=A9e?= , Richard Henderson , Laurent Vivier Errors-To: qemu-devel-bounces+patch=linaro.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(-) -- 2.31.1 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 {