[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 20/24] linux-user/riscv: Use force_sig_fault
From: |
Richard Henderson |
Subject: |
[PATCH v4 20/24] linux-user/riscv: Use force_sig_fault |
Date: |
Mon, 20 Dec 2021 13:05:24 -0800 |
Use the new function instead of setting up a target_siginfo_t
and calling queue_signal. Fix missing PC from EXCP_DEBUG by
merging the case with EXCP_BREAKPOINT.
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
linux-user/riscv/cpu_loop.c | 31 +++++--------------------------
1 file changed, 5 insertions(+), 26 deletions(-)
diff --git a/linux-user/riscv/cpu_loop.c b/linux-user/riscv/cpu_loop.c
index b301dac802..92a5a113f6 100644
--- a/linux-user/riscv/cpu_loop.c
+++ b/linux-user/riscv/cpu_loop.c
@@ -30,8 +30,7 @@
void cpu_loop(CPURISCVState *env)
{
CPUState *cs = env_cpu(env);
- int trapnr, signum, sigcode;
- target_ulong sigaddr;
+ int trapnr;
target_ulong ret;
for (;;) {
@@ -40,10 +39,6 @@ void cpu_loop(CPURISCVState *env)
cpu_exec_end(cs);
process_queued_cpu_work(cs);
- signum = 0;
- sigcode = 0;
- sigaddr = 0;
-
switch (trapnr) {
case EXCP_INTERRUPT:
/* just indicate that signals should be handled asap */
@@ -79,39 +74,23 @@ void cpu_loop(CPURISCVState *env)
}
break;
case RISCV_EXCP_ILLEGAL_INST:
- signum = TARGET_SIGILL;
- sigcode = TARGET_ILL_ILLOPC;
+ force_sig_fault(TARGET_SIGILL, TARGET_ILL_ILLOPC, env->pc);
break;
case RISCV_EXCP_BREAKPOINT:
- signum = TARGET_SIGTRAP;
- sigcode = TARGET_TRAP_BRKPT;
- sigaddr = env->pc;
+ case EXCP_DEBUG:
+ gdbstep:
+ force_sig_fault(TARGET_SIGTRAP, TARGET_TRAP_BRKPT, env->pc);
break;
case RISCV_EXCP_SEMIHOST:
env->gpr[xA0] = do_common_semihosting(cs);
env->pc += 4;
break;
- case EXCP_DEBUG:
- gdbstep:
- signum = TARGET_SIGTRAP;
- sigcode = TARGET_TRAP_BRKPT;
- break;
default:
EXCP_DUMP(env, "\nqemu: unhandled CPU exception %#x - aborting\n",
trapnr);
exit(EXIT_FAILURE);
}
- if (signum) {
- target_siginfo_t info = {
- .si_signo = signum,
- .si_errno = 0,
- .si_code = sigcode,
- ._sifields._sigfault._addr = sigaddr
- };
- queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info);
- }
-
process_pending_signals(env);
}
}
--
2.25.1
- [PATCH v4 08/24] linux-user/hppa: Set FPE_CONDTRAP for COND, (continued)
- [PATCH v4 08/24] linux-user/hppa: Set FPE_CONDTRAP for COND, Richard Henderson, 2021/12/20
- [PATCH v4 09/24] linux-user/i386: Split out maybe_handle_vm86_trap, Richard Henderson, 2021/12/20
- [PATCH v4 10/24] linux-user/i386: Use force_sig, force_sig_fault, Richard Henderson, 2021/12/20
- [PATCH v4 11/24] linux-user/m68k: Use force_sig_fault, Richard Henderson, 2021/12/20
- [PATCH v4 12/24] linux-user/microblaze: Use force_sig_fault, Richard Henderson, 2021/12/20
- [PATCH v4 14/24] linux-user/mips: Improve do_break, Richard Henderson, 2021/12/20
- [PATCH v4 15/24] linux-user/mips: Use force_sig_fault, Richard Henderson, 2021/12/20
- [PATCH v4 16/24] target/mips: Extract break code into env->error_code, Richard Henderson, 2021/12/20
- [PATCH v4 13/24] linux-user/microblaze: Fix SIGFPE si_codes, Richard Henderson, 2021/12/20
- [PATCH v4 18/24] linux-user/openrisc: Use force_sig_fault, Richard Henderson, 2021/12/20
- [PATCH v4 20/24] linux-user/riscv: Use force_sig_fault,
Richard Henderson <=
- [PATCH v4 17/24] target/mips: Extract trap code into env->error_code, Richard Henderson, 2021/12/20
- [PATCH v4 19/24] linux-user/ppc: Use force_sig_fault, Richard Henderson, 2021/12/20
- [PATCH v4 21/24] linux-user/s390x: Use force_sig_fault, Richard Henderson, 2021/12/20
- [PATCH v4 23/24] linux-user/sparc: Use force_sig_fault, Richard Henderson, 2021/12/20
- [PATCH v4 22/24] linux-user/sh4: Use force_sig_fault, Richard Henderson, 2021/12/20
- [PATCH v4 24/24] linux-user/xtensa: Use force_sig_fault, Richard Henderson, 2021/12/20