[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 18/36] linux-user/cris: Implement setup_sigtramp
From: |
Richard Henderson |
Subject: |
[PATCH v2 18/36] linux-user/cris: Implement setup_sigtramp |
Date: |
Tue, 6 Jul 2021 16:49:14 -0700 |
Split out setup_sigreturn so that we can continue to
initialize the words on the stack, as documented.
However, use the off-stack trampoline.
Cc: Edgar E. Iglesias <edgar.iglesias@gmail.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
linux-user/cris/target_signal.h | 2 ++
linux-user/cris/signal.c | 29 +++++++++++++++++++++--------
2 files changed, 23 insertions(+), 8 deletions(-)
diff --git a/linux-user/cris/target_signal.h b/linux-user/cris/target_signal.h
index 495a142896..83a5155507 100644
--- a/linux-user/cris/target_signal.h
+++ b/linux-user/cris/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 /* CRIS_TARGET_SIGNAL_H */
diff --git a/linux-user/cris/signal.c b/linux-user/cris/signal.c
index 1e02194377..9dad50f31f 100644
--- a/linux-user/cris/signal.c
+++ b/linux-user/cris/signal.c
@@ -96,6 +96,14 @@ static abi_ulong get_sigframe(CPUCRISState *env, int
framesize)
return sp - framesize;
}
+static void setup_sigreturn(uint16_t *retcode)
+{
+ /* This is movu.w __NR_sigreturn, r9; break 13; */
+ __put_user(0x9c5f, retcode + 0);
+ __put_user(TARGET_NR_sigreturn, retcode + 1);
+ __put_user(0xe93d, retcode + 2);
+}
+
void setup_frame(int sig, struct target_sigaction *ka,
target_sigset_t *set, CPUCRISState *env)
{
@@ -111,14 +119,8 @@ void setup_frame(int sig, struct target_sigaction *ka,
/*
* The CRIS signal return trampoline. A real linux/CRIS kernel doesn't
* use this trampoline anymore but it sets it up for GDB.
- * In QEMU, using the trampoline simplifies things a bit so we use it.
- *
- * This is movu.w __NR_sigreturn, r9; break 13;
*/
- __put_user(0x9c5f, frame->retcode+0);
- __put_user(TARGET_NR_sigreturn,
- frame->retcode + 1);
- __put_user(0xe93d, frame->retcode + 2);
+ setup_sigreturn(frame->retcode);
/* Save the mask. */
__put_user(set->sig[0], &frame->sc.oldmask);
@@ -134,7 +136,7 @@ void setup_frame(int sig, struct target_sigaction *ka,
env->regs[10] = sig;
env->pc = (unsigned long) ka->_sa_handler;
/* Link SRP so the guest returns through the trampoline. */
- env->pregs[PR_SRP] = frame_addr + offsetof(typeof(*frame), retcode);
+ env->pregs[PR_SRP] = default_sigreturn;
unlock_user_struct(frame, frame_addr, 1);
return;
@@ -186,3 +188,14 @@ long do_rt_sigreturn(CPUCRISState *env)
qemu_log_mask(LOG_UNIMP, "do_rt_sigreturn: not implemented\n");
return -TARGET_ENOSYS;
}
+
+void setup_sigtramp(abi_ulong sigtramp_page)
+{
+ uint16_t *tramp = lock_user(VERIFY_WRITE, sigtramp_page, 6, 0);
+ assert(tramp != NULL);
+
+ default_sigreturn = sigtramp_page;
+ setup_sigreturn(tramp);
+
+ unlock_user(tramp, sigtramp_page, 6);
+}
--
2.25.1
- [PATCH v2 10/36] linux-user: Load vdso image if available, (continued)
- [PATCH v2 10/36] linux-user: Load vdso image if available, Richard Henderson, 2021/07/06
- [PATCH v2 11/36] linux-user: Add gen-vdso tool, Richard Henderson, 2021/07/06
- [PATCH v2 13/36] linux-user/arm: Drop v1 signal frames, Richard Henderson, 2021/07/06
- [PATCH v2 14/36] linux-user/arm: Drop "_v2" from symbols in signal.c, Richard Henderson, 2021/07/06
- [PATCH v2 12/36] linux-user/aarch64: Add vdso and use it for rt_sigreturn, Richard Henderson, 2021/07/06
- [PATCH v2 15/36] target/arm: Add isar_feature_aa32_a32, Richard Henderson, 2021/07/06
- [PATCH v2 17/36] linux-user/alpha: Implement setup_sigtramp, Richard Henderson, 2021/07/06
- [PATCH v2 18/36] linux-user/cris: Implement setup_sigtramp,
Richard Henderson <=
- [PATCH v2 16/36] linux-user/arm: Add vdso and use it for rt_sigreturn, Richard Henderson, 2021/07/06
- [PATCH v2 19/36] linux-user/hexagon: Implement setup_sigtramp, Richard Henderson, 2021/07/06
- [PATCH v2 20/36] linux-user/hppa: Add vdso and use it for rt_sigreturn, Richard Henderson, 2021/07/06
- [PATCH v2 21/36] linux-user/x86_64: Raise SIGSEGV if SA_RESTORER not set, Richard Henderson, 2021/07/06
- [PATCH v2 23/36] linux-user/x86_64: Add vdso, Richard Henderson, 2021/07/06
- [PATCH v2 22/36] linux-user/i386: Add vdso and use it for sigreturn, Richard Henderson, 2021/07/06
- [PATCH v2 28/36] linux-user/nios2: Document non-use of setup_sigtramp, Richard Henderson, 2021/07/06
- [PATCH v2 25/36] linux-user/microblaze: Implement setup_sigtramp, Richard Henderson, 2021/07/06