From: Laurent Vivier <laurent@vivier.eu>
To: qemu-devel@nongnu.org
Cc: Laurent Vivier <laurent@vivier.eu>, Riku Voipio <riku.voipio@iki.fi>
Subject: [Qemu-devel] [PATCH for 2.13 3/5] linux-user: define TARGET_ARCH_HAS_SETUP_FRAME
Date: Thu, 22 Mar 2018 22:58:31 +0100 [thread overview]
Message-ID: <20180322215833.7713-4-laurent@vivier.eu> (raw)
In-Reply-To: <20180322215833.7713-1-laurent@vivier.eu>
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 <laurent@vivier.eu>
---
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.inc.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_sigaction *ka,
target_setup_frame(sig, ka, info, set, env);
}
+#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_sigaction *sa,
return (sp - framesize) & -32;
}
+#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);
}
+#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 framesize)
return sp - framesize;
}
+#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)
#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);
}
+#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/signal.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);
}
+#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(CPUMIPSState *env)
# 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,
}
#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_sigregs *sregs)
}
}
+#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, struct target_sigcontext *sc)
regs->flags &= ~(DELAY_SLOT_MASK | GUSA_MASK);
}
+#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_env, 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 = 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)))
+#define TARGET_ARCH_HAS_SETUP_FRAME
static void setup_frame(int sig, struct target_sigaction *ka,
target_sigset_t *set, CPUSPARCState *env)
{
--
2.14.3
next prev parent reply other threads:[~2018-03-22 21:59 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-22 21:58 [Qemu-devel] [PATCH for 2.13 0/5] linux-user: move arch specific parts to arch directories Laurent Vivier
2018-03-22 21:58 ` [Qemu-devel] [PATCH for 2.13 1/5] linux-user: cleanup signal.c Laurent Vivier
2018-03-23 14:22 ` Peter Maydell
2018-03-23 16:51 ` Laurent Vivier
2018-03-23 17:01 ` Peter Maydell
2018-03-22 21:58 ` [Qemu-devel] [PATCH for 2.13 2/5] linux-user: remove unneeded #ifdef in signal.c Laurent Vivier
2018-03-23 14:15 ` Peter Maydell
2018-03-22 21:58 ` Laurent Vivier [this message]
2018-03-23 14:17 ` [Qemu-devel] [PATCH for 2.13 3/5] linux-user: define TARGET_ARCH_HAS_SETUP_FRAME Peter Maydell
2018-03-22 21:58 ` [Qemu-devel] [PATCH for 2.13 4/5] linux-user: cleanup cpu_loop() Laurent Vivier
2018-03-23 2:21 ` Philippe Mathieu-Daudé
2018-03-22 21:58 ` [Qemu-devel] [PATCH for 2.13 5/5] linux-user: cleanup main() Laurent Vivier
2018-03-23 2:18 ` Philippe Mathieu-Daudé
2018-03-23 0:59 ` [Qemu-devel] [PATCH for 2.13 0/5] linux-user: move arch specific parts to arch directories no-reply
2018-03-23 9:43 ` Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180322215833.7713-4-laurent@vivier.eu \
--to=laurent@vivier.eu \
--cc=qemu-devel@nongnu.org \
--cc=riku.voipio@iki.fi \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).