[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v5 22/26] linux-user/sh4: Implement setup_sigtramp
From: |
Richard Henderson |
Subject: |
[PATCH v5 22/26] linux-user/sh4: Implement setup_sigtramp |
Date: |
Wed, 29 Sep 2021 09:05:49 -0400 |
Create and record the two signal trampolines.
Use them when the guest does not use SA_RESTORER.
Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
linux-user/sh4/target_signal.h | 2 ++
linux-user/sh4/signal.c | 40 +++++++++++++++++++---------------
2 files changed, 24 insertions(+), 18 deletions(-)
diff --git a/linux-user/sh4/target_signal.h b/linux-user/sh4/target_signal.h
index d7309b7136..04069cba66 100644
--- a/linux-user/sh4/target_signal.h
+++ b/linux-user/sh4/target_signal.h
@@ -22,4 +22,6 @@ typedef struct target_sigaltstack {
#include "../generic/signal.h"
#define TARGET_ARCH_HAS_SETUP_FRAME
+#define TARGET_ARCH_HAS_SIGTRAMP_PAGE 1
+
#endif /* SH4_TARGET_SIGNAL_H */
diff --git a/linux-user/sh4/signal.c b/linux-user/sh4/signal.c
index d70d744bef..faa869fb19 100644
--- a/linux-user/sh4/signal.c
+++ b/linux-user/sh4/signal.c
@@ -52,7 +52,6 @@ struct target_sigframe
{
struct target_sigcontext sc;
target_ulong extramask[TARGET_NSIG_WORDS-1];
- uint16_t retcode[3];
};
@@ -68,7 +67,6 @@ struct target_rt_sigframe
{
struct target_siginfo info;
struct target_ucontext uc;
- uint16_t retcode[3];
};
@@ -190,15 +188,9 @@ void setup_frame(int sig, struct target_sigaction *ka,
/* Set up to return from userspace. If provided, use a stub
already in userspace. */
if (ka->sa_flags & TARGET_SA_RESTORER) {
- regs->pr = (unsigned long) ka->sa_restorer;
+ regs->pr = ka->sa_restorer;
} else {
- /* Generate return code (system call to sigreturn) */
- abi_ulong retcode_addr = frame_addr +
- offsetof(struct target_sigframe, retcode);
- __put_user(MOVW(2), &frame->retcode[0]);
- __put_user(TRAP_NOARG, &frame->retcode[1]);
- __put_user((TARGET_NR_sigreturn), &frame->retcode[2]);
- regs->pr = (unsigned long) retcode_addr;
+ regs->pr = default_sigreturn;
}
/* Set up registers for signal handler */
@@ -248,15 +240,9 @@ void setup_rt_frame(int sig, struct target_sigaction *ka,
/* Set up to return from userspace. If provided, use a stub
already in userspace. */
if (ka->sa_flags & TARGET_SA_RESTORER) {
- regs->pr = (unsigned long) ka->sa_restorer;
+ regs->pr = ka->sa_restorer;
} else {
- /* Generate return code (system call to sigreturn) */
- abi_ulong retcode_addr = frame_addr +
- offsetof(struct target_rt_sigframe, retcode);
- __put_user(MOVW(2), &frame->retcode[0]);
- __put_user(TRAP_NOARG, &frame->retcode[1]);
- __put_user((TARGET_NR_rt_sigreturn), &frame->retcode[2]);
- regs->pr = (unsigned long) retcode_addr;
+ regs->pr = default_rt_sigreturn;
}
/* Set up registers for signal handler */
@@ -334,3 +320,21 @@ badframe:
force_sig(TARGET_SIGSEGV);
return -TARGET_QEMU_ESIGRETURN;
}
+
+void setup_sigtramp(abi_ulong sigtramp_page)
+{
+ uint16_t *tramp = lock_user(VERIFY_WRITE, sigtramp_page, 2 * 6, 0);
+ assert(tramp != NULL);
+
+ default_sigreturn = sigtramp_page;
+ __put_user(MOVW(2), &tramp[0]);
+ __put_user(TRAP_NOARG, &tramp[1]);
+ __put_user(TARGET_NR_sigreturn, &tramp[2]);
+
+ default_rt_sigreturn = sigtramp_page + 6;
+ __put_user(MOVW(2), &tramp[3]);
+ __put_user(TRAP_NOARG, &tramp[4]);
+ __put_user(TARGET_NR_rt_sigreturn, &tramp[5]);
+
+ unlock_user(tramp, sigtramp_page, 2 * 6);
+}
--
2.25.1
- [PATCH v5 11/26] linux-user/x86_64: Raise SIGSEGV if SA_RESTORER not set, (continued)
- [PATCH v5 11/26] linux-user/x86_64: Raise SIGSEGV if SA_RESTORER not set, Richard Henderson, 2021/09/29
- [PATCH v5 13/26] linux-user/microblaze: Implement setup_sigtramp, Richard Henderson, 2021/09/29
- [PATCH v5 14/26] linux-user/mips: Tidy install_sigtramp, Richard Henderson, 2021/09/29
- [PATCH v5 12/26] linux-user/m68k: Implement setup_sigtramp, Richard Henderson, 2021/09/29
- [PATCH v5 15/26] linux-user/mips: Implement setup_sigtramp, Richard Henderson, 2021/09/29
- [PATCH v5 18/26] linux-user/ppc: Simplify encode_trampoline, Richard Henderson, 2021/09/29
- [PATCH v5 16/26] linux-user/nios2: Document non-use of setup_sigtramp, Richard Henderson, 2021/09/29
- [PATCH v5 17/26] linux-user/openrisc: Implement setup_sigtramp, Richard Henderson, 2021/09/29
- [PATCH v5 19/26] linux-user/ppc: Implement setup_sigtramp, Richard Henderson, 2021/09/29
- [PATCH v5 20/26] linux-user/riscv: Implement setup_sigtramp, Richard Henderson, 2021/09/29
- [PATCH v5 22/26] linux-user/sh4: Implement setup_sigtramp,
Richard Henderson <=
- [PATCH v5 23/26] linux-user/sparc: Implement setup_sigtramp, Richard Henderson, 2021/09/29
- [PATCH v5 21/26] linux-user/s390x: Implement setup_sigtramp, Richard Henderson, 2021/09/29
- [PATCH v5 24/26] linux-user/xtensa: Implement setup_sigtramp, Richard Henderson, 2021/09/29
- [PATCH v5 25/26] linux-user: Remove default for TARGET_ARCH_HAS_SIGTRAMP_PAGE, Richard Henderson, 2021/09/29
- [PATCH v5 26/26] tests/tcg/multiarch: Re-enable signals test for most guests, Richard Henderson, 2021/09/29