[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 03/23] linux-user/arm: Split out v2_frame
From: |
Richard Henderson |
Subject: |
[PATCH v2 03/23] linux-user/arm: Split out v2_frame |
Date: |
Fri, 18 Jun 2021 12:29:31 -0700 |
Split out a helper function to test for a v2 signal frame.
Cc: qemu-arm@nongnu.org
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
linux-user/arm/signal.c | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/linux-user/arm/signal.c b/linux-user/arm/signal.c
index 32b68ee302..cb65623965 100644
--- a/linux-user/arm/signal.c
+++ b/linux-user/arm/signal.c
@@ -165,6 +165,11 @@ static inline int valid_user_regs(CPUARMState *regs)
return 1;
}
+static bool v2_frame(void)
+{
+ return get_osversion() >= 0x020612;
+}
+
static void
setup_sigcontext(struct target_sigcontext *sc, /*struct _fpstate *fpstate,*/
CPUARMState *env, abi_ulong mask)
@@ -422,7 +427,7 @@ sigsegv:
void setup_frame(int usig, struct target_sigaction *ka,
target_sigset_t *set, CPUARMState *regs)
{
- if (get_osversion() >= 0x020612) {
+ if (v2_frame()) {
setup_frame_v2(usig, ka, set, regs);
} else {
setup_frame_v1(usig, ka, set, regs);
@@ -516,7 +521,7 @@ void setup_rt_frame(int usig, struct target_sigaction *ka,
target_siginfo_t *info,
target_sigset_t *set, CPUARMState *env)
{
- if (get_osversion() >= 0x020612) {
+ if (v2_frame()) {
setup_rt_frame_v2(usig, ka, info, set, env);
} else {
setup_rt_frame_v1(usig, ka, info, set, env);
@@ -734,7 +739,7 @@ badframe:
long do_sigreturn(CPUARMState *env)
{
- if (get_osversion() >= 0x020612) {
+ if (v2_frame()) {
return do_sigreturn_v2(env);
} else {
return do_sigreturn_v1(env);
@@ -823,7 +828,7 @@ badframe:
long do_rt_sigreturn(CPUARMState *env)
{
- if (get_osversion() >= 0x020612) {
+ if (v2_frame()) {
return do_rt_sigreturn_v2(env);
} else {
return do_rt_sigreturn_v1(env);
--
2.25.1
- [PATCH v2 03/23] linux-user/arm: Split out v2_frame,
Richard Henderson <=