From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Cc: Peter Maydell <peter.maydell@linaro.org>, laurent@vivier.eu
Subject: [PATCH v2 03/15] linux-user/m68k: Use force_sig_fault
Date: Thu, 2 Dec 2021 12:48:48 -0800 [thread overview]
Message-ID: <20211202204900.50973-4-richard.henderson@linaro.org> (raw)
In-Reply-To: <20211202204900.50973-1-richard.henderson@linaro.org>
Use the new function instead of setting up a target_siginfo_t
and calling queue_signal. Fill in the missing PC for SIGTRAP.
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
linux-user/m68k/cpu_loop.c | 24 ++++--------------------
1 file changed, 4 insertions(+), 20 deletions(-)
diff --git a/linux-user/m68k/cpu_loop.c b/linux-user/m68k/cpu_loop.c
index 287f24cc60..396f98bd6c 100644
--- a/linux-user/m68k/cpu_loop.c
+++ b/linux-user/m68k/cpu_loop.c
@@ -29,7 +29,6 @@ void cpu_loop(CPUM68KState *env)
CPUState *cs = env_cpu(env);
int trapnr;
unsigned int n;
- target_siginfo_t info;
for(;;) {
cpu_exec_start(cs);
@@ -46,25 +45,13 @@ void cpu_loop(CPUM68KState *env)
case EXCP_ILLEGAL:
case EXCP_LINEA:
case EXCP_LINEF:
- info.si_signo = TARGET_SIGILL;
- info.si_errno = 0;
- info.si_code = TARGET_ILL_ILLOPN;
- info._sifields._sigfault._addr = env->pc;
- queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info);
+ force_sig_fault(TARGET_SIGILL, TARGET_ILL_ILLOPN, env->pc);
break;
case EXCP_CHK:
- info.si_signo = TARGET_SIGFPE;
- info.si_errno = 0;
- info.si_code = TARGET_FPE_INTOVF;
- info._sifields._sigfault._addr = env->pc;
- queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info);
+ force_sig_fault(TARGET_SIGFPE, TARGET_FPE_INTOVF, env->pc);
break;
case EXCP_DIV0:
- info.si_signo = TARGET_SIGFPE;
- info.si_errno = 0;
- info.si_code = TARGET_FPE_INTDIV;
- info._sifields._sigfault._addr = env->pc;
- queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info);
+ force_sig_fault(TARGET_SIGFPE, TARGET_FPE_INTDIV, env->pc);
break;
case EXCP_TRAP0:
{
@@ -90,10 +77,7 @@ void cpu_loop(CPUM68KState *env)
/* just indicate that signals should be handled asap */
break;
case EXCP_DEBUG:
- info.si_signo = TARGET_SIGTRAP;
- info.si_errno = 0;
- info.si_code = TARGET_TRAP_BRKPT;
- queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info);
+ force_sig_fault(TARGET_SIGTRAP, TARGET_TRAP_BRKPT, env->pc);
break;
case EXCP_ATOMIC:
cpu_exec_step_atomic(cs);
--
2.25.1
next prev parent reply other threads:[~2021-12-02 20:56 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-02 20:48 [PATCH v2 00/15] target/m68k: Conditional traps + trap cleanup Richard Henderson
2021-12-02 20:48 ` [PATCH v2 01/15] target/m68k: Raise the TRAPn exception with the correct pc Richard Henderson
2021-12-03 9:04 ` Laurent Vivier
2021-12-02 20:48 ` [PATCH v2 02/15] target/m68k: Switch over exception type in m68k_interrupt_all Richard Henderson
2021-12-03 9:02 ` Philippe Mathieu-Daudé
2021-12-03 9:06 ` Laurent Vivier
2021-12-02 20:48 ` Richard Henderson [this message]
2021-12-02 20:48 ` [PATCH v2 04/15] linux-user/m68k: Handle EXCP_TRAP1 through EXCP_TRAP15 Richard Henderson
2021-12-02 20:48 ` [PATCH v2 05/15] target/m68k: Remove retaddr in m68k_interrupt_all Richard Henderson
2021-12-03 9:03 ` Philippe Mathieu-Daudé
2021-12-03 9:08 ` Laurent Vivier
2021-12-02 20:48 ` [PATCH v2 06/15] target/m68k: Fix address argument for EXCP_CHK Richard Henderson
2021-12-03 14:27 ` Laurent Vivier
2021-12-03 14:29 ` Richard Henderson
2021-12-03 14:58 ` Laurent Vivier
2021-12-02 20:48 ` [PATCH v2 07/15] target/m68k: Fix pc, c flag, and address argument for EXCP_DIV0 Richard Henderson
2021-12-04 16:50 ` Laurent Vivier
2021-12-02 20:48 ` [PATCH v2 08/15] target/m68k: Fix address argument for EXCP_TRACE Richard Henderson
2021-12-03 14:21 ` Richard Henderson
2021-12-02 20:48 ` [PATCH v2 09/15] target/m68k: Implement TRAPcc Richard Henderson
2021-12-02 20:48 ` [PATCH v2 10/15] target/m68k: Implement TRAPV Richard Henderson
2021-12-02 20:48 ` [PATCH v2 11/15] target/m68k: Implement FTRAPcc Richard Henderson
2021-12-02 20:48 ` [PATCH v2 12/15] target/m68k: Fix stack frame for EXCP_ILLEGAL Richard Henderson
2021-12-02 20:48 ` [PATCH v2 13/15] tests/tcg/m68k: Add trap.c Richard Henderson
2021-12-02 20:48 ` [PATCH v2 14/15] linux-user/strace: Fix print_syscall_err Richard Henderson
2021-12-03 8:57 ` Philippe Mathieu-Daudé
2021-12-02 20:49 ` [PATCH v2 15/15] linux-user/strace: Adjust get_thread_area for m68k Richard Henderson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211202204900.50973-4-richard.henderson@linaro.org \
--to=richard.henderson@linaro.org \
--cc=laurent@vivier.eu \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).