From: Peter Maydell <peter.maydell@linaro.org>
Date: Fri, 13 Aug 2021 13:18:04 +0000 (+0100)
Subject: linux-user/arm: Set siginfo_t addr field for SIGTRAP signals
X-Git-Tag: v6.2.0-rc0~88^2~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1af354120dc4d9187ee1162b95ac84aafd7c4df0;p=thirdparty%2Fqemu.git

linux-user/arm: Set siginfo_t addr field for SIGTRAP signals

When generating a TRAP_BRKPT SIGTRAP, set the siginfo_t addr field
to the PC where the breakpoint/singlestep trap occurred; this is
what the kernel does for this signal for this architecture.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20210813131809.28655-3-peter.maydell@linaro.org>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---

diff --git a/linux-user/arm/cpu_loop.c b/linux-user/arm/cpu_loop.c
index 07032b30061..0900d18105a 100644
--- a/linux-user/arm/cpu_loop.c
+++ b/linux-user/arm/cpu_loop.c
@@ -455,6 +455,7 @@ void cpu_loop(CPUARMState *env)
             info.si_signo = TARGET_SIGTRAP;
             info.si_errno = 0;
             info.si_code = TARGET_TRAP_BRKPT;
+            info._sifields._sigfault._addr = env->regs[15];
             queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info);
             break;
         case EXCP_KERNEL_TRAP: