[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 42/59] linux-user/s390x: Set psw.mask properly for the signal hand
From: |
Laurent Vivier |
Subject: |
[PULL 42/59] linux-user/s390x: Set psw.mask properly for the signal handler |
Date: |
Tue, 18 May 2021 07:31:14 +0200 |
From: Richard Henderson <richard.henderson@linaro.org>
Note that PSW_ADDR_{64,32} are called PSW_MASK_{EA,BA}
in the kernel source.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: David Hildenbrand <david@redhat.com>
Message-Id: <20210428193408.233706-11-richard.henderson@linaro.org>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
linux-user/s390x/signal.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/linux-user/s390x/signal.c b/linux-user/s390x/signal.c
index 64a9eab09770..17f617c65581 100644
--- a/linux-user/s390x/signal.c
+++ b/linux-user/s390x/signal.c
@@ -162,6 +162,9 @@ void setup_frame(int sig, struct target_sigaction *ka,
/* Set up registers for signal handler */
env->regs[15] = frame_addr;
+ /* Force default amode and default user address space control. */
+ env->psw.mask = PSW_MASK_64 | PSW_MASK_32 | PSW_ASC_PRIMARY
+ | (env->psw.mask & ~PSW_MASK_ASC);
env->psw.addr = ka->_sa_handler;
env->regs[2] = sig; //map_signal(sig);
@@ -215,6 +218,9 @@ void setup_rt_frame(int sig, struct target_sigaction *ka,
/* Set up registers for signal handler */
env->regs[15] = frame_addr;
+ /* Force default amode and default user address space control. */
+ env->psw.mask = PSW_MASK_64 | PSW_MASK_32 | PSW_ASC_PRIMARY
+ | (env->psw.mask & ~PSW_MASK_ASC);
env->psw.addr = ka->_sa_handler;
env->regs[2] = sig; //map_signal(sig);
--
2.31.1
- [PULL 56/59] linux-user/alpha: Share code for TARGET_NR_sigaction, (continued)
- [PULL 56/59] linux-user/alpha: Share code for TARGET_NR_sigaction, Laurent Vivier, 2021/05/18
- [PULL 52/59] linux-user/alpha: Rename the sigaction restorer field, Laurent Vivier, 2021/05/18
- [PULL 55/59] linux-user/alpha: Define TARGET_ARCH_HAS_KA_RESTORER, Laurent Vivier, 2021/05/18
- [PULL 59/59] linux-user/elfload: add s390x core dumping support, Laurent Vivier, 2021/05/18
- [PULL 54/59] linux-user: Honor TARGET_ARCH_HAS_SA_RESTORER in do_syscall, Laurent Vivier, 2021/05/18
- [PULL 58/59] linux-user/elfload: fix filling psinfo->pr_psargs, Laurent Vivier, 2021/05/18
- [PULL 46/59] linux-user/s390x: Clean up signal.c, Laurent Vivier, 2021/05/18
- [PULL 51/59] linux-user/alpha: Fix rt sigframe return, Laurent Vivier, 2021/05/18
- [PULL 57/59] linux-user: Tidy TARGET_NR_rt_sigaction, Laurent Vivier, 2021/05/18
- [PULL 39/59] linux-user/s390x: Use tswap_sigset in setup_rt_frame, Laurent Vivier, 2021/05/18
- [PULL 42/59] linux-user/s390x: Set psw.mask properly for the signal handler,
Laurent Vivier <=
- [PULL 43/59] linux-user/s390x: Add stub sigframe argument for last_break, Laurent Vivier, 2021/05/18
- Re: [PULL 00/59] Linux user for 6.1 patches, Peter Maydell, 2021/05/18
- Re: [PULL 00/59] Linux user for 6.1 patches, Philippe Mathieu-Daudé, 2021/05/20