[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 26/30] linux-user/riscv: Use force_sig_fault, force_sigsegv_fo
From: |
Richard Henderson |
Subject: |
[PATCH v2 26/30] linux-user/riscv: Use force_sig_fault, force_sigsegv_for_addr |
Date: |
Sat, 21 Aug 2021 20:55:33 -0700 |
Use the new functions instead of setting up a target_siginfo_t
and calling queue_signal.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
linux-user/riscv/cpu_loop.c | 36 +++++++-----------------------------
1 file changed, 7 insertions(+), 29 deletions(-)
diff --git a/linux-user/riscv/cpu_loop.c b/linux-user/riscv/cpu_loop.c
index 74a9628dc9..32c440365c 100644
--- a/linux-user/riscv/cpu_loop.c
+++ b/linux-user/riscv/cpu_loop.c
@@ -22,14 +22,14 @@
#include "qemu/error-report.h"
#include "qemu.h"
#include "cpu_loop-common.h"
+#include "signal-common.h"
#include "elf.h"
#include "semihosting/common-semi.h"
void cpu_loop(CPURISCVState *env)
{
CPUState *cs = env_cpu(env);
- int trapnr, signum, sigcode;
- target_ulong sigaddr;
+ int trapnr;
target_ulong ret;
for (;;) {
@@ -38,10 +38,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 */
@@ -77,46 +73,28 @@ 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_INST_PAGE_FAULT:
case RISCV_EXCP_LOAD_PAGE_FAULT:
case RISCV_EXCP_STORE_PAGE_FAULT:
- signum = TARGET_SIGSEGV;
- sigcode = TARGET_SEGV_MAPERR;
- sigaddr = env->badaddr;
+ force_sigsegv_for_addr(env->badaddr);
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 v2 11/30] linux-user/alpha: Use force_sig_fault, force_sigsegv_code, (continued)
- [PATCH v2 11/30] linux-user/alpha: Use force_sig_fault, force_sigsegv_code, Richard Henderson, 2021/08/21
- [PATCH v2 12/30] linux-user/cris: Use force_sig_fault, force_sigsegv_code, Richard Henderson, 2021/08/21
- [PATCH v2 15/30] linux-user/hppa: Use the proper si_code for PRIV_OPR, PRIV_REG, OVERFLOW, Richard Henderson, 2021/08/21
- [PATCH v2 20/30] linux-user/microblaze: Use force_sig_fault, force_sigsegv_for_addr, Richard Henderson, 2021/08/21
- [PATCH v2 21/30] linux-user/microblaze: Fix SIGFPE si_codes, Richard Henderson, 2021/08/21
- [PATCH v2 26/30] linux-user/riscv: Use force_sig_fault, force_sigsegv_for_addr,
Richard Henderson <=
- [PATCH v2 25/30] linux-user/ppc: Use force_sig_fault, force_sigsegv_for_addr, Richard Henderson, 2021/08/21
- [PATCH v2 28/30] linux-user/sh4: Use force_sig_fault, force_sigsegv_for_addr, Richard Henderson, 2021/08/21
- [PATCH v2 29/30] linux-user/sparc: Use force_sig_fault, force_sigsegv_for_addr, Richard Henderson, 2021/08/21
- [PATCH v2 16/30] linux-user/hppa: Set FPE_CONDTRAP for COND, Richard Henderson, 2021/08/21
- [PATCH v2 22/30] linux-user/mips: Improve do_break, Richard Henderson, 2021/08/21