| Message ID | 20211220210529.150423-9-richard.henderson@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | linux-user: Clean up siginfo_t handling | expand |
On 12/20/21 22:05, Richard Henderson wrote: > This si_code was changed in 75abf64287cab, for linux 4.17. > > Signed-off-by: Richard Henderson <richard.henderson@linaro.org> > --- > linux-user/syscall_defs.h | 1 + > linux-user/hppa/cpu_loop.c | 2 ++ > 2 files changed, 3 insertions(+) > > diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h > index a738bdcecf..f9240702eb 100644 > --- a/linux-user/syscall_defs.h > +++ b/linux-user/syscall_defs.h > @@ -688,6 +688,7 @@ typedef struct target_siginfo { > #define TARGET_FPE_FLTINV (7) /* floating point invalid operation */ > #define TARGET_FPE_FLTSUB (8) /* subscript out of range */ > #define TARGET_FPE_FLTUNK (14) /* undiagnosed fp exception */ > +#define TARGET_FPE_CONDTRAP (15) /* trap on condition */ > > /* > * SIGSEGV si_codes > diff --git a/linux-user/hppa/cpu_loop.c b/linux-user/hppa/cpu_loop.c > index 8e13f84a64..c33a59fef5 100644 > --- a/linux-user/hppa/cpu_loop.c > +++ b/linux-user/hppa/cpu_loop.c > @@ -156,6 +156,8 @@ void cpu_loop(CPUHPPAState *env) > force_sig_fault(TARGET_SIGFPE, TARGET_FPE_INTOVF, env->iaoq_f); > break; > case EXCP_COND: > + force_sig_fault(TARGET_SIGFPE, TARGET_FPE_CONDTRAP, env->iaoq_f); > + break; > case EXCP_ASSIST: > force_sig_fault(TARGET_SIGFPE, 0, env->iaoq_f); > break; Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h index a738bdcecf..f9240702eb 100644 --- a/linux-user/syscall_defs.h +++ b/linux-user/syscall_defs.h @@ -688,6 +688,7 @@ typedef struct target_siginfo { #define TARGET_FPE_FLTINV (7) /* floating point invalid operation */ #define TARGET_FPE_FLTSUB (8) /* subscript out of range */ #define TARGET_FPE_FLTUNK (14) /* undiagnosed fp exception */ +#define TARGET_FPE_CONDTRAP (15) /* trap on condition */ /* * SIGSEGV si_codes diff --git a/linux-user/hppa/cpu_loop.c b/linux-user/hppa/cpu_loop.c index 8e13f84a64..c33a59fef5 100644 --- a/linux-user/hppa/cpu_loop.c +++ b/linux-user/hppa/cpu_loop.c @@ -156,6 +156,8 @@ void cpu_loop(CPUHPPAState *env) force_sig_fault(TARGET_SIGFPE, TARGET_FPE_INTOVF, env->iaoq_f); break; case EXCP_COND: + force_sig_fault(TARGET_SIGFPE, TARGET_FPE_CONDTRAP, env->iaoq_f); + break; case EXCP_ASSIST: force_sig_fault(TARGET_SIGFPE, 0, env->iaoq_f); break;
This si_code was changed in 75abf64287cab, for linux 4.17. Signed-off-by: Richard Henderson <richard.henderson@linaro.org> --- linux-user/syscall_defs.h | 1 + linux-user/hppa/cpu_loop.c | 2 ++ 2 files changed, 3 insertions(+)