From nobody Sun Oct 26 00:02:36 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 15217562439906.12011866918408; Thu, 22 Mar 2018 15:04:03 -0700 (PDT) Received: from localhost ([::1]:35072 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ez8JX-0008At-68 for importer@patchew.org; Thu, 22 Mar 2018 18:04:03 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53334) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ez8Ev-0004c0-2w for qemu-devel@nongnu.org; Thu, 22 Mar 2018 17:59:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ez8Er-0004GE-St for qemu-devel@nongnu.org; Thu, 22 Mar 2018 17:59:17 -0400 Received: from mout.kundenserver.de ([212.227.17.13]:42127) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ez8Er-0004EJ-IX for qemu-devel@nongnu.org; Thu, 22 Mar 2018 17:59:13 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue102 [212.227.15.183]) with ESMTPSA (Nemesis) id 0MAvQq-1epC4N3sUW-009w8e; Thu, 22 Mar 2018 22:59:00 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Thu, 22 Mar 2018 22:58:31 +0100 Message-Id: <20180322215833.7713-4-laurent@vivier.eu> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180322215833.7713-1-laurent@vivier.eu> References: <20180322215833.7713-1-laurent@vivier.eu> X-Provags-ID: V03:K0:+oZzYC3vX/w4KzRjfvLIUcu/ZJv+k8GaoTFLlvtaM9lbPH0v8Jo k6vvIV9Pf5L5BrA9hmSwYw2BHKWtYV0vQyqPu/nnBGfjaJrRWjVC94XnYzPqA9CbpgKukMd x4Zoeu1eqxmxClYPnr2PqSOQHD/JEb7dwET4T7tKjQmW+oag/K0JpRyc+8bSRFiS/4aYhqL agGVvuWrcSb2skNe1orFg== X-UI-Out-Filterresults: notjunk:1;V01:K0:Qf3KWMbEzUE=:24Q/os5NMauLppbnG8F976 ARFMsfv/LMKHsH+zHbWpZ3G9FXQ3OmVt9sB90XQlzjMEOPq0WbH8MBmecz079WMZY3+BqDXAM 8X2zLe94FUfN73PEHFDTl/wF58GeenGWop68Y2oWSl7GONGpcd/xW1hg9rquvIwu783I7fFeD Bg+SY7u3H8o8ByIkLDe7LRs6t659ujH0gxbw77kfeltCGTakzALtjtvS875OVpK/KJ+VgTCv4 btdl3lazacIM5yaX+U65eO9Lv62vsXyLzgNIFKSISNVukWzvRzcOyAYd/Bh5G2AS3pUus0S55 HYUrpdL+gCfhKazUKkqq9Sy7ZMY3M8+2vML91RzGp7fLW2PdV9sR1PqMRu/K2VpFn5aSqwY9u 5+W3e11WEd8xwLA/Szt5b+CfHowobDeIJX+3xnpITAy8MfxavJYitvMTHL07OEQHuVc3KWaHK 6dWRXnjKICNsxiAZYXBw1/yYadpgwn50P0MZx28ju6F15SZq/PhUGUdqfceo/JAwjWauwNgTr xHbzMjTiZWLLVGdEy0UYrCET6YpAp7HUndtetG5h8eOa/CwfMa2AabUGiRxJHKAz2FUliRGtp w+p9evlWhACBHjAKdbBpTP7KL4oO8E1j2r4Ng1+x1ky71l4perS2SEiAf2yeQncF80tYYg9o3 8CMHe21m/YTSxeWSo/nYnVX1yU7UTCqHYujcrh0C+RsUOGF3pdgSQr/PsLFdM6C6h+UBSwYCL IaPoTkyM93qcX4bX5EXWfhrnCpbrAwkazYFP4w== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.17.13 Subject: [Qemu-devel] [PATCH for 2.13 3/5] linux-user: define TARGET_ARCH_HAS_SETUP_FRAME X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Riku Voipio , Laurent Vivier Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" instead of calling setup_frame() conditionnaly to a list of knowm targets, define TARGET_ARCH_HAS_SETUP_FRAME if the target provides the function and call it only if the macro is defined Signed-off-by: Laurent Vivier Reviewed-by: Peter Maydell --- linux-user/aarch64/signal.inc.c | 1 + linux-user/alpha/signal.inc.c | 1 + linux-user/arm/signal.inc.c | 1 + linux-user/cris/signal.inc.c | 1 + linux-user/i386/signal.inc.c | 1 + linux-user/m68k/signal.inc.c | 1 + linux-user/microblaze/signal.inc.c | 1 + linux-user/mips/signal.inc.c | 1 + linux-user/ppc/signal.inc.c | 1 + linux-user/s390x/signal.inc.c | 1 + linux-user/sh4/signal.inc.c | 1 + linux-user/signal.c | 11 +++-------- linux-user/sparc/signal.inc.c | 1 + 13 files changed, 15 insertions(+), 8 deletions(-) diff --git a/linux-user/aarch64/signal.inc.c b/linux-user/aarch64/signal.in= c.c index 28fa0f2f22..369741eae1 100644 --- a/linux-user/aarch64/signal.inc.c +++ b/linux-user/aarch64/signal.inc.c @@ -510,6 +510,7 @@ static void setup_rt_frame(int sig, struct target_sigac= tion *ka, target_setup_frame(sig, ka, info, set, env); } =20 +#define TARGET_ARCH_HAS_SETUP_FRAME static void setup_frame(int sig, struct target_sigaction *ka, target_sigset_t *set, CPUARMState *env) { diff --git a/linux-user/alpha/signal.inc.c b/linux-user/alpha/signal.inc.c index 52e379e214..5910a70ac6 100644 --- a/linux-user/alpha/signal.inc.c +++ b/linux-user/alpha/signal.inc.c @@ -103,6 +103,7 @@ static inline abi_ulong get_sigframe(struct target_siga= ction *sa, return (sp - framesize) & -32; } =20 +#define TARGET_ARCH_HAS_SETUP_FRAME static void setup_frame(int sig, struct target_sigaction *ka, target_sigset_t *set, CPUAlphaState *env) { diff --git a/linux-user/arm/signal.inc.c b/linux-user/arm/signal.inc.c index 1d6f9a1f7f..ecca4f2e7b 100644 --- a/linux-user/arm/signal.inc.c +++ b/linux-user/arm/signal.inc.c @@ -334,6 +334,7 @@ sigsegv: force_sigsegv(usig); } =20 +#define TARGET_ARCH_HAS_SETUP_FRAME static void setup_frame(int usig, struct target_sigaction *ka, target_sigset_t *set, CPUARMState *regs) { diff --git a/linux-user/cris/signal.inc.c b/linux-user/cris/signal.inc.c index 3f68793727..d910eb5257 100644 --- a/linux-user/cris/signal.inc.c +++ b/linux-user/cris/signal.inc.c @@ -74,6 +74,7 @@ static abi_ulong get_sigframe(CPUCRISState *env, int fram= esize) return sp - framesize; } =20 +#define TARGET_ARCH_HAS_SETUP_FRAME static void setup_frame(int sig, struct target_sigaction *ka, target_sigset_t *set, CPUCRISState *env) { diff --git a/linux-user/i386/signal.inc.c b/linux-user/i386/signal.inc.c index c522c449ae..8695806da9 100644 --- a/linux-user/i386/signal.inc.c +++ b/linux-user/i386/signal.inc.c @@ -289,6 +289,7 @@ get_sigframe(struct target_sigaction *ka, CPUX86State *= env, size_t frame_size) =20 #ifndef TARGET_X86_64 /* compare linux/arch/i386/kernel/signal.c:setup_frame() */ +#define TARGET_ARCH_HAS_SETUP_FRAME static void setup_frame(int sig, struct target_sigaction *ka, target_sigset_t *set, CPUX86State *env) { diff --git a/linux-user/m68k/signal.inc.c b/linux-user/m68k/signal.inc.c index 07db1cdeda..eabd4849e4 100644 --- a/linux-user/m68k/signal.inc.c +++ b/linux-user/m68k/signal.inc.c @@ -106,6 +106,7 @@ get_sigframe(struct target_sigaction *ka, CPUM68KState = *regs, return ((sp - frame_size) & -8UL); } =20 +#define TARGET_ARCH_HAS_SETUP_FRAME static void setup_frame(int sig, struct target_sigaction *ka, target_sigset_t *set, CPUM68KState *env) { diff --git a/linux-user/microblaze/signal.inc.c b/linux-user/microblaze/sig= nal.inc.c index 728bd33273..b0db5ab8c4 100644 --- a/linux-user/microblaze/signal.inc.c +++ b/linux-user/microblaze/signal.inc.c @@ -117,6 +117,7 @@ static abi_ulong get_sigframe(struct target_sigaction *= ka, return ((sp - frame_size) & -8UL); } =20 +#define TARGET_ARCH_HAS_SETUP_FRAME static void setup_frame(int sig, struct target_sigaction *ka, target_sigset_t *set, CPUMBState *env) { diff --git a/linux-user/mips/signal.inc.c b/linux-user/mips/signal.inc.c index 19e5b3aad4..76e7ad77c2 100644 --- a/linux-user/mips/signal.inc.c +++ b/linux-user/mips/signal.inc.c @@ -185,6 +185,7 @@ static void mips_set_hflags_isa_mode_from_pc(CPUMIPSSta= te *env) =20 # if defined(TARGET_ABI_MIPSO32) /* compare linux/arch/mips/kernel/signal.c:setup_frame() */ +#define TARGET_ARCH_HAS_SETUP_FRAME static void setup_frame(int sig, struct target_sigaction * ka, target_sigset_t *set, CPUMIPSState *regs) { diff --git a/linux-user/ppc/signal.inc.c b/linux-user/ppc/signal.inc.c index ea3ee45202..1aaef0dbd8 100644 --- a/linux-user/ppc/signal.inc.c +++ b/linux-user/ppc/signal.inc.c @@ -411,6 +411,7 @@ static void restore_user_regs(CPUPPCState *env, } =20 #if !defined(TARGET_PPC64) +#define TARGET_ARCH_HAS_SETUP_FRAME static void setup_frame(int sig, struct target_sigaction *ka, target_sigset_t *set, CPUPPCState *env) { diff --git a/linux-user/s390x/signal.inc.c b/linux-user/s390x/signal.inc.c index d0f362084f..3c17bdea0b 100644 --- a/linux-user/s390x/signal.inc.c +++ b/linux-user/s390x/signal.inc.c @@ -108,6 +108,7 @@ static void save_sigregs(CPUS390XState *env, target_sig= regs *sregs) } } =20 +#define TARGET_ARCH_HAS_SETUP_FRAME static void setup_frame(int sig, struct target_sigaction *ka, target_sigset_t *set, CPUS390XState *env) { diff --git a/linux-user/sh4/signal.inc.c b/linux-user/sh4/signal.inc.c index 4c6369bbdb..496e6aef60 100644 --- a/linux-user/sh4/signal.inc.c +++ b/linux-user/sh4/signal.inc.c @@ -143,6 +143,7 @@ static void restore_sigcontext(CPUSH4State *regs, struc= t target_sigcontext *sc) regs->flags &=3D ~(DELAY_SLOT_MASK | GUSA_MASK); } =20 +#define TARGET_ARCH_HAS_SETUP_FRAME static void setup_frame(int sig, struct target_sigaction *ka, target_sigset_t *set, CPUSH4State *regs) { diff --git a/linux-user/signal.c b/linux-user/signal.c index 514145b299..6bd5f136c3 100644 --- a/linux-user/signal.c +++ b/linux-user/signal.c @@ -886,18 +886,13 @@ static void handle_pending_signal(CPUArchState *cpu_e= nv, int sig, } #endif /* prepare the stack frame of the virtual CPU */ -#if defined(TARGET_ABI_MIPSN32) || defined(TARGET_ABI_MIPSN64) \ - || defined(TARGET_OPENRISC) || defined(TARGET_TILEGX) \ - || defined(TARGET_PPC64) || defined(TARGET_HPPA) \ - || defined(TARGET_NIOS2) || defined(TARGET_X86_64) \ - || defined(TARGET_RISCV) || defined(TARGET_XTENSA) - /* These targets do not have traditional signals. */ - setup_rt_frame(sig, sa, &k->info, &target_old_set, cpu_env); -#else +#if defined(TARGET_ARCH_HAS_SETUP_FRAME) if (sa->sa_flags & TARGET_SA_SIGINFO) setup_rt_frame(sig, sa, &k->info, &target_old_set, cpu_env); else setup_frame(sig, sa, &target_old_set, cpu_env); +#else + setup_rt_frame(sig, sa, &k->info, &target_old_set, cpu_env); #endif if (sa->sa_flags & TARGET_SA_RESETHAND) { sa->_sa_handler =3D TARGET_SIG_DFL; diff --git a/linux-user/sparc/signal.inc.c b/linux-user/sparc/signal.inc.c index fe5ab902f6..186376d240 100644 --- a/linux-user/sparc/signal.inc.c +++ b/linux-user/sparc/signal.inc.c @@ -153,6 +153,7 @@ setup_sigcontext(struct target_sigcontext *sc, /*struct= _fpstate *fpstate,*/ #endif #define NF_ALIGNEDSZ (((sizeof(struct target_signal_frame) + 7) & (~7))) =20 +#define TARGET_ARCH_HAS_SETUP_FRAME static void setup_frame(int sig, struct target_sigaction *ka, target_sigset_t *set, CPUSPARCState *env) { --=20 2.14.3