mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

target/s390x: Fix SIGILL and SIGFPE psw.addr reporting

Browse Source 
For SIGILL, SIGFPE and SIGTRAP the PSW must point after the
instruction, and at the instruction for other signals. Currently under
qemu-user for SIGFILL and SIGFPE it points at the instruction.

Fix by advancing psw.addr for these signals.

Co-developed-by: Ulrich Weigand <ulrich.weigand@de.ibm.com>
Signed-off-by: Ilya Leoshkevich <iii@linux.ibm.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
Buglink: https://gitlab.com/qemu-project/qemu/-/issues/319
Message-Id: <20210705210434.45824-2-iii@linux.ibm.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
This commit is contained in:
Ilya Leoshkevich 2021-07-05 23:04:33 +02:00 committed by Thomas Huth
parent 7f1cab9c62
commit 54ba2161d8
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
linux-user/s390x/cpu_loop.c
View File

@ -64,7 +64,13 @@ void cpu_loop(CPUS390XState *env)
case EXCP_DEBUG:
sig = TARGET_SIGTRAP;
n = TARGET_TRAP_BRKPT;
goto do_signal_pc;
/*
* For SIGTRAP the PSW must point after the instruction, which it
* already does thanks to s390x_tr_tb_stop(). si_addr doesn't need
* to be filled.
*/
addr = 0;
goto do_signal;
case EXCP_PGM:
n = env->int_pgm_code;
switch (n) {
@ -132,6 +138,10 @@ void cpu_loop(CPUS390XState *env)
do_signal_pc:
addr = env->psw.addr;
/*
* For SIGILL and SIGFPE the PSW must point after the instruction.
*/
env->psw.addr += env->int_pgm_ilen;
do_signal:
info.si_signo = sig;
info.si_errno = 0;