[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v5 01/24] linux-user/alpha: Set TRAP_UNK for bugchk and unknown g
From: |
Richard Henderson |
Subject: |
[PATCH v5 01/24] linux-user/alpha: Set TRAP_UNK for bugchk and unknown gentrap |
Date: |
Fri, 7 Jan 2022 13:32:20 -0800 |
These si_codes were changed in 535906c684fca, for linux 4.17.
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
linux-user/syscall_defs.h | 1 +
linux-user/alpha/cpu_loop.c | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h
index cca561f622..18bed558fe 100644
--- a/linux-user/syscall_defs.h
+++ b/linux-user/syscall_defs.h
@@ -715,6 +715,7 @@ typedef struct target_siginfo {
#define TARGET_TRAP_TRACE (2) /* process trace trap */
#define TARGET_TRAP_BRANCH (3) /* process taken branch trap */
#define TARGET_TRAP_HWBKPT (4) /* hardware breakpoint/watchpoint */
+#define TARGET_TRAP_UNK (5) /* undiagnosed trap */
struct target_rlimit {
abi_ulong rlim_cur;
diff --git a/linux-user/alpha/cpu_loop.c b/linux-user/alpha/cpu_loop.c
index 37c33f0ccd..96466b23f9 100644
--- a/linux-user/alpha/cpu_loop.c
+++ b/linux-user/alpha/cpu_loop.c
@@ -86,7 +86,7 @@ void cpu_loop(CPUAlphaState *env)
/* BUGCHK */
info.si_signo = TARGET_SIGTRAP;
info.si_errno = 0;
- info.si_code = 0;
+ info.si_code = TARGET_TRAP_UNK;
info._sifields._sigfault._addr = env->pc;
queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info);
break;
@@ -155,7 +155,7 @@ void cpu_loop(CPUAlphaState *env)
break;
default:
info.si_signo = TARGET_SIGTRAP;
- info.si_code = 0;
+ info.si_code = TARGET_TRAP_UNK;
break;
}
info.si_errno = 0;
--
2.25.1
- [PATCH v5 00/24] linux-user: Clean up siginfo_t handling, Richard Henderson, 2022/01/07
- [PATCH v5 02/24] linux-user/alpha: Set FPE_FLTUNK for gentrap ROPRAND, Richard Henderson, 2022/01/07
- [PATCH v5 01/24] linux-user/alpha: Set TRAP_UNK for bugchk and unknown gentrap,
Richard Henderson <=
- [PATCH v5 04/24] linux-user/cris: Use force_sig_fault, Richard Henderson, 2022/01/07
- [PATCH v5 08/24] linux-user/hppa: Set FPE_CONDTRAP for COND, Richard Henderson, 2022/01/07
- [PATCH v5 12/24] linux-user/microblaze: Use force_sig_fault, Richard Henderson, 2022/01/07
- [PATCH v5 06/24] linux-user/hppa: Use the proper si_code for PRIV_OPR, PRIV_REG, OVERFLOW, Richard Henderson, 2022/01/07
- [PATCH v5 05/24] linux-user/hppa: Use force_sig_fault, Richard Henderson, 2022/01/07
- [PATCH v5 07/24] linux-user: Remove TARGET_NSIGFPE, Richard Henderson, 2022/01/07
- [PATCH v5 09/24] linux-user/i386: Split out maybe_handle_vm86_trap, Richard Henderson, 2022/01/07
- [PATCH v5 10/24] linux-user/i386: Use force_sig, force_sig_fault, Richard Henderson, 2022/01/07
- [PATCH v5 11/24] linux-user/m68k: Use force_sig_fault, Richard Henderson, 2022/01/07
- [PATCH v5 15/24] linux-user/mips: Use force_sig_fault, Richard Henderson, 2022/01/07