diff options
| author | Ilya Leoshkevich <iii@linux.ibm.com> | 2021-07-05 23:04:33 +0200 |
|---|---|---|
| committer | Thomas Huth <thuth@redhat.com> | 2021-08-03 15:17:32 +0200 |
| commit | 54ba2161d8c40235d7b486d68ac3803ae0818f43 (patch) | |
| tree | 9b7aeb3d66e912ca2f974e024e464fb3d7800d1e | |
| parent | 7f1cab9c628a798ae2607940993771e6300e9e00 (diff) | |
| download | focaccia-qemu-54ba2161d8c40235d7b486d68ac3803ae0818f43.tar.gz focaccia-qemu-54ba2161d8c40235d7b486d68ac3803ae0818f43.zip | |
target/s390x: Fix SIGILL and SIGFPE psw.addr reporting
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>
| -rw-r--r-- | linux-user/s390x/cpu_loop.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/linux-user/s390x/cpu_loop.c b/linux-user/s390x/cpu_loop.c index f2d1215fb1..22f2e89c62 100644 --- a/linux-user/s390x/cpu_loop.c +++ b/linux-user/s390x/cpu_loop.c @@ -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; |