[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 21/23] linux-user/sparc: Implement setup_sigtramp
From: |
Richard Henderson |
Subject: |
[PATCH v2 21/23] linux-user/sparc: Implement setup_sigtramp |
Date: |
Fri, 18 Jun 2021 12:29:49 -0700 |
Create and record the two signal trampolines.
Use them when the guest does not use SA_RESTORER.
Cc: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
linux-user/sparc/target_signal.h | 4 ++++
linux-user/sparc/signal.c | 32 ++++++++++++++++++--------------
2 files changed, 22 insertions(+), 14 deletions(-)
diff --git a/linux-user/sparc/target_signal.h b/linux-user/sparc/target_signal.h
index 34f9a12519..e661ddd6ab 100644
--- a/linux-user/sparc/target_signal.h
+++ b/linux-user/sparc/target_signal.h
@@ -69,6 +69,10 @@ typedef struct target_sigaltstack {
#ifdef TARGET_ABI32
#define TARGET_ARCH_HAS_SETUP_FRAME
+#define TARGET_ARCH_HAS_SIGTRAMP_PAGE 1
+#else
+/* For sparc64, use of KA_RESTORER is mandatory. */
+#define TARGET_ARCH_HAS_SIGTRAMP_PAGE 0
#endif
/* bit-flags */
diff --git a/linux-user/sparc/signal.c b/linux-user/sparc/signal.c
index 0cc3db5570..65e9b7f8b4 100644
--- a/linux-user/sparc/signal.c
+++ b/linux-user/sparc/signal.c
@@ -290,13 +290,7 @@ void setup_frame(int sig, struct target_sigaction *ka,
if (ka->ka_restorer) {
env->regwptr[WREG_O7] = ka->ka_restorer;
} else {
- env->regwptr[WREG_O7] = sf_addr +
- offsetof(struct target_signal_frame, insns) - 2 * 4;
-
- /* mov __NR_sigreturn, %g1 */
- __put_user(0x821020d8u, &sf->insns[0]);
- /* t 0x10 */
- __put_user(0x91d02010u, &sf->insns[1]);
+ env->regwptr[WREG_O7] = default_sigreturn;
}
unlock_user(sf, sf_addr, sf_size);
}
@@ -357,13 +351,7 @@ void setup_rt_frame(int sig, struct target_sigaction *ka,
if (ka->ka_restorer) {
env->regwptr[WREG_O7] = ka->ka_restorer;
} else {
- env->regwptr[WREG_O7] =
- sf_addr + offsetof(struct target_rt_signal_frame, insns) - 2 * 4;
-
- /* mov __NR_rt_sigreturn, %g1 */
- __put_user(0x82102065u, &sf->insns[0]);
- /* t 0x10 */
- __put_user(0x91d02010u, &sf->insns[1]);
+ env->regwptr[WREG_O7] = default_rt_sigreturn;
}
#else
env->regwptr[WREG_O7] = ka->ka_restorer;
@@ -774,4 +762,20 @@ do_sigsegv:
unlock_user_struct(ucp, ucp_addr, 1);
force_sig(TARGET_SIGSEGV);
}
+#else
+void setup_sigtramp(abi_ulong sigtramp_page)
+{
+ uint32_t *tramp = lock_user(VERIFY_WRITE, sigtramp_page, 2 * 8, 0);
+ assert(tramp != NULL);
+
+ default_sigreturn = sigtramp_page;
+ __put_user(0x821020d8u, &tramp[0]); /* mov __NR_sigreturn, %g1 */
+ __put_user(0x91d02010u, &tramp[1]); /* t 0x10 */
+
+ default_rt_sigreturn = sigtramp_page + 8;
+ __put_user(0x82102065u, &tramp[2]); /* mov __NR_rt_sigreturn, %g1 */
+ __put_user(0x91d02010u, &tramp[3]); /* t 0x10 */
+
+ unlock_user(tramp, sigtramp_page, 2 * 8);
+}
#endif
--
2.25.1
- Re: [PATCH v2 07/23] linux-user/cris: Implement setup_sigtramp, (continued)
- [PATCH v2 12/23] linux-user/microblaze: Implement setup_sigtramp, Richard Henderson, 2021/06/18
- [PATCH v2 16/23] linux-user/openrisc: Implement setup_sigtramp, Richard Henderson, 2021/06/18
- [PATCH v2 20/23] linux-user/sh4: Implement setup_sigtramp, Richard Henderson, 2021/06/18
- [PATCH v2 14/23] linux-user/mips: Implement setup_sigtramp, Richard Henderson, 2021/06/18
- [PATCH v2 11/23] linux-user/m68k: Implement setup_sigtramp, Richard Henderson, 2021/06/18
- [PATCH v2 10/23] linux-user/i386: Implement setup_sigtramp, Richard Henderson, 2021/06/18
- [PATCH v2 17/23] linux-user/ppc: Implement setup_sigtramp, Richard Henderson, 2021/06/18
- [PATCH v2 21/23] linux-user/sparc: Implement setup_sigtramp,
Richard Henderson <=
- [PATCH v2 23/23] linux-user: Remove default for TARGET_ARCH_HAS_SIGTRAMP_PAGE, Richard Henderson, 2021/06/18
- [PATCH v2 19/23] linux-user/s390x: Implement setup_sigtramp, Richard Henderson, 2021/06/18
- [PATCH v2 15/23] linux-user/nios2: Document non-use of setup_sigtramp, Richard Henderson, 2021/06/18
- [PATCH v2 22/23] linux-user/xtensa: Implement setup_sigtramp, Richard Henderson, 2021/06/18
- [PATCH v2 18/23] linux-user/riscv: Implement setup_sigtramp, Richard Henderson, 2021/06/18