[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 13/26] linux-user/microblaze: Implement setup_sigtramp
From: |
Laurent Vivier |
Subject: |
[PULL 13/26] linux-user/microblaze: Implement setup_sigtramp |
Date: |
Mon, 4 Oct 2021 09:44:08 +0200 |
From: Richard Henderson <richard.henderson@linaro.org>
Create and record the rt signal 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-14-richard.henderson@linaro.org>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
linux-user/microblaze/signal.c | 24 +++++++++++++++++-------
linux-user/microblaze/target_signal.h | 2 ++
2 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/linux-user/microblaze/signal.c b/linux-user/microblaze/signal.c
index b822679d1805..8ebb6a1b7dfe 100644
--- a/linux-user/microblaze/signal.c
+++ b/linux-user/microblaze/signal.c
@@ -161,17 +161,11 @@ void setup_rt_frame(int sig, struct target_sigaction *ka,
/* Kernel does not use SA_RESTORER. */
- /* addi r12, r0, __NR_sigreturn */
- __put_user(0x31800000U | TARGET_NR_rt_sigreturn, frame->tramp + 0);
- /* brki r14, 0x8 */
- __put_user(0xb9cc0008U, frame->tramp + 1);
-
/*
* Return from sighandler will jump to the tramp.
* Negative 8 offset because return is rtsd r15, 8
*/
- env->regs[15] =
- frame_addr + offsetof(struct target_rt_sigframe, tramp) - 8;
+ env->regs[15] = default_rt_sigreturn - 8;
/* Set up registers for signal handler */
env->regs[1] = frame_addr;
@@ -220,3 +214,19 @@ long do_rt_sigreturn(CPUMBState *env)
force_sig(TARGET_SIGSEGV);
return -TARGET_QEMU_ESIGRETURN;
}
+
+void setup_sigtramp(abi_ulong sigtramp_page)
+{
+ uint32_t *tramp = lock_user(VERIFY_WRITE, sigtramp_page, 8, 0);
+ assert(tramp != NULL);
+
+ /*
+ * addi r12, r0, __NR_rt_sigreturn
+ * brki r14, 0x8
+ */
+ __put_user(0x31800000U | TARGET_NR_rt_sigreturn, tramp);
+ __put_user(0xb9cc0008U, tramp + 1);
+
+ default_rt_sigreturn = sigtramp_page;
+ unlock_user(tramp, sigtramp_page, 8);
+}
diff --git a/linux-user/microblaze/target_signal.h
b/linux-user/microblaze/target_signal.h
index 1c326296de42..e8b510f6b182 100644
--- a/linux-user/microblaze/target_signal.h
+++ b/linux-user/microblaze/target_signal.h
@@ -21,4 +21,6 @@ typedef struct target_sigaltstack {
#include "../generic/signal.h"
+#define TARGET_ARCH_HAS_SIGTRAMP_PAGE 1
+
#endif /* MICROBLAZE_TARGET_SIGNAL_H */
--
2.31.1
- [PULL 04/26] linux-user/arm: Drop "_v2" from symbols in signal.c, (continued)
- [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, 2021/10/04
- [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 <=
- [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
- [PULL 09/26] linux-user/hppa: Document non-use of setup_sigtramp, Laurent Vivier, 2021/10/04
- [PULL 21/26] linux-user/s390x: Implement setup_sigtramp, Laurent Vivier, 2021/10/04
- [PULL 26/26] tests/tcg/multiarch: Re-enable signals test for most guests, Laurent Vivier, 2021/10/04
- [PULL 22/26] linux-user/sh4: Implement setup_sigtramp, Laurent Vivier, 2021/10/04
- [PULL 08/26] linux-user/hexagon: Implement setup_sigtramp, Laurent Vivier, 2021/10/04