OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

linux-user/s390x: Set psw.mask properly for the signal handler

Browse Source 
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>
This commit is contained in:
Richard Henderson 2021-04-28 12:34:03 -07:00 committed by Laurent Vivier
parent 2080734880
commit 7e5355578e
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
linux-user/s390x/signal.c
View File

@ -162,6 +162,9 @@ void setup_frame(int sig, struct target_sigaction *ka,
/* Set up registers for signal handler */ /* Set up registers for signal handler */
env->regs[15] = frame_addr; 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->psw.addr = ka->_sa_handler;
env->regs[2] = sig; //map_signal(sig); 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 */ /* Set up registers for signal handler */
env->regs[15] = frame_addr; 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->psw.addr = ka->_sa_handler;
env->regs[2] = sig; //map_signal(sig); env->regs[2] = sig; //map_signal(sig);