From: Stafford Horne <shorne@gmail.com>
To: Richard Henderson <richard.henderson@linaro.org>
Cc: peter.maydell@linaro.org, qemu-devel@nongnu.org, laurent@vivier.eu
Subject: Re: [PATCH v3 17/23] linux-user/openrisc: Use force_sig_fault
Date: Thu, 4 Nov 2021 05:35:00 +0900 [thread overview]
Message-ID: <YYLydENWr/JMZZS8@antec> (raw)
In-Reply-To: <20211103140847.454070-18-richard.henderson@linaro.org>
On Wed, Nov 03, 2021 at 10:08:41AM -0400, Richard Henderson wrote:
> Use the new function instead of setting up a target_siginfo_t
> and calling queue_signal. Fill in the missing PC for SIGTRAP.
>
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> ---
> linux-user/openrisc/cpu_loop.c | 18 +++---------------
> 1 file changed, 3 insertions(+), 15 deletions(-)
>
> diff --git a/linux-user/openrisc/cpu_loop.c b/linux-user/openrisc/cpu_loop.c
> index 3cfdbbf037..9b3d6743d2 100644
> --- a/linux-user/openrisc/cpu_loop.c
> +++ b/linux-user/openrisc/cpu_loop.c
> @@ -29,7 +29,6 @@ void cpu_loop(CPUOpenRISCState *env)
> CPUState *cs = env_cpu(env);
> int trapnr;
> abi_long ret;
> - target_siginfo_t info;
>
> for (;;) {
> cpu_exec_start(cs);
> @@ -55,27 +54,16 @@ void cpu_loop(CPUOpenRISCState *env)
> }
> break;
> case EXCP_ALIGN:
> - info.si_signo = TARGET_SIGBUS;
> - info.si_errno = 0;
> - info.si_code = TARGET_BUS_ADRALN;
> - info._sifields._sigfault._addr = env->pc;
> - queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info);
> + force_sig_fault(TARGET_SIGBUS, TARGET_BUS_ADRALN, env->eear);
> break;
> case EXCP_ILLEGAL:
> - info.si_signo = TARGET_SIGILL;
> - info.si_errno = 0;
> - info.si_code = TARGET_ILL_ILLOPC;
> - info._sifields._sigfault._addr = env->pc;
> - queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info);
> + force_sig_fault(TARGET_SIGILL, TARGET_ILL_ILLOPC, env->pc);
> break;
> case EXCP_INTERRUPT:
> /* We processed the pending cpu work above. */
> 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);
This looks ok to me.
Reviewed-by: Stafford Horne <shorne@gmail.com>
next prev parent reply other threads:[~2021-11-03 20:37 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-03 14:08 [PATCH v3 00/23] linux-user: Clean up siginfo_t handling Richard Henderson
2021-11-03 14:08 ` [PATCH v3 01/23] linux-user/alpha: Set TRAP_UNK for bugchk and unknown gentrap Richard Henderson
2021-11-03 14:08 ` [PATCH v3 02/23] linux-user/alpha: Set FPE_FLTUNK for gentrap ROPRAND Richard Henderson
2021-11-03 14:08 ` [PATCH v3 03/23] linux-user/alpha: Use force_sig_fault Richard Henderson
2021-11-03 14:08 ` [PATCH v3 04/23] linux-user/cris: " Richard Henderson
2021-11-03 14:08 ` [PATCH v3 05/23] linux-user/hppa: " Richard Henderson
2021-11-03 14:08 ` [PATCH v3 06/23] linux-user/hppa: Use the proper si_code for PRIV_OPR, PRIV_REG, OVERFLOW Richard Henderson
2021-11-03 14:08 ` [PATCH v3 07/23] linux-user/hppa: Set FPE_CONDTRAP for COND Richard Henderson
2021-11-03 14:08 ` [PATCH v3 08/23] linux-user/i386: Split out maybe_handle_vm86_trap Richard Henderson
2021-11-03 14:08 ` [PATCH v3 09/23] linux-user/i386: Use force_sig, force_sig_fault Richard Henderson
2021-11-03 14:08 ` [PATCH v3 10/23] linux-user/m68k: Use force_sig_fault Richard Henderson
2021-11-03 14:08 ` [PATCH v3 11/23] linux-user/microblaze: " Richard Henderson
2021-11-03 14:08 ` [PATCH v3 12/23] linux-user/microblaze: Fix SIGFPE si_codes Richard Henderson
2021-11-03 14:08 ` [PATCH v3 13/23] linux-user/mips: Improve do_break Richard Henderson
2021-11-03 14:08 ` [PATCH v3 14/23] linux-user/mips: Use force_sig_fault Richard Henderson
2021-11-03 14:08 ` [PATCH v3 15/23] target/mips: Extract break code into env->error_code Richard Henderson
2021-11-03 15:11 ` Philippe Mathieu-Daudé
2021-11-03 15:38 ` Richard Henderson
2021-11-03 17:01 ` Philippe Mathieu-Daudé
2021-11-03 14:08 ` [PATCH v3 16/23] target/mips: Extract trap " Richard Henderson
2021-11-03 15:21 ` Philippe Mathieu-Daudé
2021-11-03 15:46 ` Richard Henderson
2021-11-03 17:04 ` Philippe Mathieu-Daudé
2021-11-03 14:08 ` [PATCH v3 17/23] linux-user/openrisc: Use force_sig_fault Richard Henderson
2021-11-03 20:35 ` Stafford Horne [this message]
2021-11-03 14:08 ` [PATCH v3 18/23] linux-user/ppc: " Richard Henderson
2021-11-03 14:08 ` [PATCH v3 19/23] linux-user/riscv: " Richard Henderson
2021-11-03 14:08 ` [PATCH v3 20/23] linux-user/s390x: " Richard Henderson
2021-11-03 14:08 ` [PATCH v3 21/23] linux-user/sh4: " Richard Henderson
2021-11-03 14:08 ` [PATCH v3 22/23] linux-user/sparc: " Richard Henderson
2021-11-03 14:08 ` [PATCH v3 23/23] linux-user/xtensa: " 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=YYLydENWr/JMZZS8@antec \
--to=shorne@gmail.com \
--cc=laurent@vivier.eu \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.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).