[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 13/23] linux-user/mips: Improve do_break
From: |
Richard Henderson |
Subject: |
[PATCH v3 13/23] linux-user/mips: Improve do_break |
Date: |
Wed, 3 Nov 2021 10:08:37 -0400 |
Rename to do_tr_or_bp, as per the kernel function.
Add a 'trap' argument, akin to the kernel's si_code, but clearer.
The return value is always 0, so change the return value to void.
Use force_sig and force_sig_fault.
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
linux-user/mips/cpu_loop.c | 46 +++++++++++++++++++++-----------------
1 file changed, 26 insertions(+), 20 deletions(-)
diff --git a/linux-user/mips/cpu_loop.c b/linux-user/mips/cpu_loop.c
index b735c99a24..7317194cc3 100644
--- a/linux-user/mips/cpu_loop.c
+++ b/linux-user/mips/cpu_loop.c
@@ -40,29 +40,25 @@ enum {
BRK_DIVZERO = 7
};
-static int do_break(CPUMIPSState *env, target_siginfo_t *info,
- unsigned int code)
+static void do_tr_or_bp(CPUMIPSState *env, unsigned int code, bool trap)
{
- int ret = -1;
+ target_ulong pc = env->active_tc.PC;
switch (code) {
case BRK_OVERFLOW:
+ force_sig_fault(TARGET_SIGFPE, TARGET_FPE_INTOVF, pc);
+ break;
case BRK_DIVZERO:
- info->si_signo = TARGET_SIGFPE;
- info->si_errno = 0;
- info->si_code = (code == BRK_OVERFLOW) ? FPE_INTOVF : FPE_INTDIV;
- queue_signal(env, info->si_signo, QEMU_SI_FAULT, &*info);
- ret = 0;
+ force_sig_fault(TARGET_SIGFPE, TARGET_FPE_INTDIV, pc);
break;
default:
- info->si_signo = TARGET_SIGTRAP;
- info->si_errno = 0;
- queue_signal(env, info->si_signo, QEMU_SI_FAULT, &*info);
- ret = 0;
+ if (trap) {
+ force_sig(TARGET_SIGTRAP);
+ } else {
+ force_sig_fault(TARGET_SIGTRAP, TARGET_TRAP_BRKPT, pc);
+ }
break;
}
-
- return ret;
}
void cpu_loop(CPUMIPSState *env)
@@ -205,6 +201,13 @@ done_syscall:
abi_ulong trap_instr;
unsigned int code;
+ /*
+ * FIXME: It would be better to decode the trap number
+ * during translate, and store it in error_code while
+ * raising the exception. We should not be re-reading
+ * the opcode here.
+ */
+
if (env->hflags & MIPS_HFLAG_M16) {
if (env->insn_flags & ASE_MICROMIPS) {
/* microMIPS mode */
@@ -257,9 +260,7 @@ done_syscall:
}
}
- if (do_break(env, &info, code) != 0) {
- goto error;
- }
+ do_tr_or_bp(env, code, false);
}
break;
case EXCP_TRAP:
@@ -267,6 +268,13 @@ done_syscall:
abi_ulong trap_instr;
unsigned int code = 0;
+ /*
+ * FIXME: It would be better to decode the trap number
+ * during translate, and store it in error_code while
+ * raising the exception. We should not be re-reading
+ * the opcode here.
+ */
+
if (env->hflags & MIPS_HFLAG_M16) {
/* microMIPS mode */
abi_ulong instr[2];
@@ -293,9 +301,7 @@ done_syscall:
}
}
- if (do_break(env, &info, code) != 0) {
- goto error;
- }
+ do_tr_or_bp(env, code, true);
}
break;
case EXCP_ATOMIC:
--
2.25.1
- [PATCH v3 02/23] linux-user/alpha: Set FPE_FLTUNK for gentrap ROPRAND, (continued)
- [PATCH v3 02/23] linux-user/alpha: Set FPE_FLTUNK for gentrap ROPRAND, Richard Henderson, 2021/11/03
- [PATCH v3 05/23] linux-user/hppa: Use force_sig_fault, Richard Henderson, 2021/11/03
- [PATCH v3 09/23] linux-user/i386: Use force_sig, force_sig_fault, Richard Henderson, 2021/11/03
- [PATCH v3 06/23] linux-user/hppa: Use the proper si_code for PRIV_OPR, PRIV_REG, OVERFLOW, Richard Henderson, 2021/11/03
- [PATCH v3 07/23] linux-user/hppa: Set FPE_CONDTRAP for COND, Richard Henderson, 2021/11/03
- [PATCH v3 08/23] linux-user/i386: Split out maybe_handle_vm86_trap, Richard Henderson, 2021/11/03
- [PATCH v3 10/23] linux-user/m68k: Use force_sig_fault, Richard Henderson, 2021/11/03
- [PATCH v3 11/23] linux-user/microblaze: Use force_sig_fault, Richard Henderson, 2021/11/03
- [PATCH v3 12/23] linux-user/microblaze: Fix SIGFPE si_codes, Richard Henderson, 2021/11/03
- [PATCH v3 14/23] linux-user/mips: Use force_sig_fault, Richard Henderson, 2021/11/03
- [PATCH v3 13/23] linux-user/mips: Improve do_break,
Richard Henderson <=
- [PATCH v3 15/23] target/mips: Extract break code into env->error_code, Richard Henderson, 2021/11/03
- [PATCH v3 16/23] target/mips: Extract trap code into env->error_code, Richard Henderson, 2021/11/03
[PATCH v3 20/23] linux-user/s390x: Use force_sig_fault, Richard Henderson, 2021/11/03
[PATCH v3 17/23] linux-user/openrisc: Use force_sig_fault, Richard Henderson, 2021/11/03