aboutsummaryrefslogtreecommitdiff
path: root/linux-user
diff options
context:
space:
mode:
authorRichard Henderson <richard.henderson@linaro.org>2022-01-07 13:32:20 -0800
committerLaurent Vivier <laurent@vivier.eu>2022-01-11 18:40:43 +0100
commitd010b8bd93b833dcbe0addf54cbb7d763068e90d (patch)
tree7203d76ded64322bb05fc45d7c5c0862ab790547 /linux-user
parent64c01c7da449bcafc614b27ecf1325bb08031c84 (diff)
downloadqemu-d010b8bd93b833dcbe0addf54cbb7d763068e90d.zip
qemu-d010b8bd93b833dcbe0addf54cbb7d763068e90d.tar.gz
qemu-d010b8bd93b833dcbe0addf54cbb7d763068e90d.tar.bz2
linux-user/alpha: Set TRAP_UNK for bugchk and unknown gentrap
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> Message-Id: <20220107213243.212806-2-richard.henderson@linaro.org> Signed-off-by: Laurent Vivier <laurent@vivier.eu>
Diffstat (limited to 'linux-user')
-rw-r--r--linux-user/alpha/cpu_loop.c4
-rw-r--r--linux-user/syscall_defs.h1
2 files changed, 3 insertions, 2 deletions
diff --git a/linux-user/alpha/cpu_loop.c b/linux-user/alpha/cpu_loop.c
index 37c33f0..96466b2 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;
diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h
index cca561f..18bed55 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;