[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 07/26] linux-user/cris: Implement setup_sigtramp
From: |
Laurent Vivier |
Subject: |
[PULL 07/26] linux-user/cris: Implement setup_sigtramp |
Date: |
Mon, 4 Oct 2021 09:44:02 +0200 |
From: Richard Henderson <richard.henderson@linaro.org>
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>
Message-Id: <20210929130553.121567-8-richard.henderson@linaro.org>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
linux-user/cris/signal.c | 29 +++++++++++++++++++++--------
linux-user/cris/target_signal.h | 2 ++
2 files changed, 23 insertions(+), 8 deletions(-)
diff --git a/linux-user/cris/signal.c b/linux-user/cris/signal.c
index 2c39bdf7277f..7f6aca934e10 100644
--- a/linux-user/cris/signal.c
+++ b/linux-user/cris/signal.c
@@ -97,6 +97,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)
{
@@ -112,14 +120,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);
@@ -135,7 +137,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;
@@ -187,3 +189,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);
+}
diff --git a/linux-user/cris/target_signal.h b/linux-user/cris/target_signal.h
index 495a14289681..83a515550745 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 */
--
2.31.1
- [PULL 05/26] linux-user/arm: Implement setup_sigtramp, (continued)
- [PULL 05/26] linux-user/arm: Implement setup_sigtramp, Laurent Vivier, 2021/10/04
- [PULL 11/26] linux-user/x86_64: Raise SIGSEGV if SA_RESTORER not set, Laurent Vivier, 2021/10/04
- [PULL 01/26] linux-user: Add infrastructure for a signal trampoline page, Laurent Vivier, 2021/10/04
- [PULL 16/26] linux-user/nios2: Document non-use of setup_sigtramp, Laurent Vivier, 2021/10/04
- [PULL 14/26] linux-user/mips: Tidy install_sigtramp, Laurent Vivier, 2021/10/04
- [PULL 04/26] linux-user/arm: Drop "_v2" from symbols in signal.c, Laurent Vivier, 2021/10/04
- [PULL 19/26] linux-user/ppc: Implement setup_sigtramp, Laurent Vivier, 2021/10/04
- [PULL 02/26] linux-user/aarch64: Implement setup_sigtramp, Laurent Vivier, 2021/10/04
- [PULL 03/26] linux-user/arm: Drop v1 signal frames, Laurent Vivier, 2021/10/04
- [PULL 15/26] linux-user/mips: Implement setup_sigtramp, Laurent Vivier, 2021/10/04
- [PULL 07/26] linux-user/cris: Implement setup_sigtramp,
Laurent Vivier <=
- [PULL 06/26] linux-user/alpha: Implement setup_sigtramp, Laurent Vivier, 2021/10/04
- [PULL 18/26] linux-user/ppc: Simplify encode_trampoline, Laurent Vivier, 2021/10/04
- [PULL 10/26] linux-user/i386: Implement setup_sigtramp, Laurent Vivier, 2021/10/04
- [PULL 20/26] linux-user/riscv: Implement setup_sigtramp, Laurent Vivier, 2021/10/04
- [PULL 13/26] linux-user/microblaze: Implement setup_sigtramp, Laurent Vivier, 2021/10/04
- [PULL 25/26] linux-user: Remove default for TARGET_ARCH_HAS_SIGTRAMP_PAGE, Laurent Vivier, 2021/10/04
- [PULL 12/26] linux-user/m68k: Implement setup_sigtramp, Laurent Vivier, 2021/10/04
- [PULL 23/26] linux-user/sparc: Implement setup_sigtramp, Laurent Vivier, 2021/10/04
- [PULL 17/26] linux-user/openrisc: Implement setup_sigtramp, Laurent Vivier, 2021/10/04
- [PULL 24/26] linux-user/xtensa: Implement setup_sigtramp, Laurent Vivier, 2021/10/04