[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 11/21] linux-user/microblaze: Implement setup_sigtramp
From: |
Richard Henderson |
Subject: |
[PATCH 11/21] linux-user/microblaze: Implement setup_sigtramp |
Date: |
Tue, 15 Jun 2021 18:11:59 -0700 |
Create and record the rt signal trampoline.
Cc: Edgar E. Iglesias <edgar.iglesias@gmail.com>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
linux-user/microblaze/target_signal.h | 2 ++
linux-user/microblaze/signal.c | 24 +++++++++++++++++-------
2 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/linux-user/microblaze/target_signal.h
b/linux-user/microblaze/target_signal.h
index 1c326296de..e8b510f6b1 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 */
diff --git a/linux-user/microblaze/signal.c b/linux-user/microblaze/signal.c
index 4c483bd8c6..aa27454931 100644
--- a/linux-user/microblaze/signal.c
+++ b/linux-user/microblaze/signal.c
@@ -160,17 +160,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;
@@ -219,3 +213,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);
+}
--
2.25.1
- RE: [PATCH 07/21] linux-user/hexagon: Implement setup_sigtramp, (continued)
[PATCH 08/21] linux-user/hppa: Document non-use of setup_sigtramp, Richard Henderson, 2021/06/15
[PATCH 10/21] linux-user/m68k: Implement setup_sigtramp, Richard Henderson, 2021/06/15
[PATCH 11/21] linux-user/microblaze: Implement setup_sigtramp,
Richard Henderson <=
[PATCH 06/21] linux-user/cris: Implement setup_sigtramp, Richard Henderson, 2021/06/15
[PATCH 12/21] linux-user/mips: Implement setup_sigtramp, Richard Henderson, 2021/06/15
[PATCH 14/21] linux-user/openrisc: Implement setup_sigtramp, Richard Henderson, 2021/06/15
[PATCH 13/21] linux-user/nios2: Document non-use of setup_sigtramp, Richard Henderson, 2021/06/15
[PATCH 17/21] linux-user/s390x: Implement setup_sigtramp, Richard Henderson, 2021/06/15