haraldwolff/qemu-patch-raspberry4
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

linux-user/microblaze: Use force_sig_fault

Browse source 
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>
Message-Id: <20220107213243.212806-13-richard.henderson@linaro.org>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
This commit is contained in:
Richard Henderson 2022-01-07 13:32:31 -08:00 committed by Laurent Vivier
parent 71dc6f7488
commit 23ae825ab7
1 changed files with 25 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
linux-user/microblaze/cpu_loop.c
View file

@ -27,9 +27,8 @@
void cpu_loop(CPUMBState *env) void cpu_loop(CPUMBState *env)
{ {
CPUState *cs = env_cpu(env); CPUState *cs = env_cpu(env);
int trapnr, ret; int trapnr, ret, si_code;
target_siginfo_t info;
while (1) { while (1) {
cpu_exec_start(cs); cpu_exec_start(cs);
trapnr = cpu_exec(cs); trapnr = cpu_exec(cs);
@ -38,8 +37,8 @@ void cpu_loop(CPUMBState *env)
switch (trapnr) { switch (trapnr) {
case EXCP_INTERRUPT: case EXCP_INTERRUPT:
/* just indicate that signals should be handled asap */ /* just indicate that signals should be handled asap */
break; break;
case EXCP_SYSCALL: case EXCP_SYSCALL:
/* Return address is 4 bytes after the call. */ /* Return address is 4 bytes after the call. */
env->regs[14] += 4; env->regs[14] += 4;
@ -67,6 +66,7 @@ void cpu_loop(CPUMBState *env)
*/ */
env->regs[14] = env->pc; env->regs[14] = env->pc;
break; break;
case EXCP_HW_EXCP: case EXCP_HW_EXCP:
env->regs[17] = env->pc + 4; env->regs[17] = env->pc + 4;
if (env->iflags & D_FLAG) { if (env->iflags & D_FLAG) {
@ -74,42 +74,31 @@ void cpu_loop(CPUMBState *env)
env->pc -= 4; env->pc -= 4;
/* FIXME: if branch was immed, replay the imm as well. */ /* FIXME: if branch was immed, replay the imm as well. */
} }
env->iflags &= ~(IMM_FLAG | D_FLAG); env->iflags &= ~(IMM_FLAG | D_FLAG);
switch (env->esr & 31) { switch (env->esr & 31) {
case ESR_EC_DIVZERO: case ESR_EC_DIVZERO:
info.si_signo = TARGET_SIGFPE; si_code = TARGET_FPE_FLTDIV;
info.si_errno = 0; break;
info.si_code = TARGET_FPE_FLTDIV; case ESR_EC_FPU:
info._sifields._sigfault._addr = 0; si_code = 0;
queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info); if (env->fsr & FSR_IO) {
break; si_code = TARGET_FPE_FLTINV;
case ESR_EC_FPU: }
info.si_signo = TARGET_SIGFPE; if (env->fsr & FSR_DZ) {
info.si_errno = 0; si_code = TARGET_FPE_FLTDIV;
if (env->fsr & FSR_IO) { }
info.si_code = TARGET_FPE_FLTINV; break;
} default:
if (env->fsr & FSR_DZ) { fprintf(stderr, "Unhandled hw-exception: 0x%x\n",
info.si_code = TARGET_FPE_FLTDIV; env->esr & ESR_EC_MASK);
} cpu_dump_state(cs, stderr, 0);
info._sifields._sigfault._addr = 0; exit(EXIT_FAILURE);
queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info);
break;
default:
fprintf(stderr, "Unhandled hw-exception: 0x%x\n",
env->esr & ESR_EC_MASK);
cpu_dump_state(cs, stderr, 0);
exit(EXIT_FAILURE);
break;
} }
force_sig_fault(TARGET_SIGFPE, si_code, env->pc);
break; break;
case EXCP_DEBUG: case EXCP_DEBUG:
info.si_signo = TARGET_SIGTRAP; force_sig_fault(TARGET_SIGTRAP, TARGET_TRAP_BRKPT, env->pc);
info.si_errno = 0;
info.si_code = TARGET_TRAP_BRKPT;
queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info);
break; break;
case EXCP_ATOMIC: case EXCP_ATOMIC:
cpu_exec_step_atomic(cs); cpu_exec_step_atomic(cs);