OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

linux-user/openrisc: Use force_sig_fault 

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: Stafford Horne <shorne@gmail.com>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20220107213243.212806-19-richard.henderson@linaro.org>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
This commit is contained in:
Richard Henderson 2022-01-07 13:32:37 -08:00 committed by Laurent Vivier
parent 0a3336f6fd
commit b600705669
1 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
linux-user/openrisc/cpu_loop.c
View File

@ -29,7 +29,6 @@ void cpu_loop(CPUOpenRISCState *env)
CPUState *cs = env_cpu(env); CPUState *cs = env_cpu(env);
int trapnr; int trapnr;
abi_long ret; abi_long ret;
target_siginfo_t info;
for (;;) { for (;;) {
cpu_exec_start(cs); cpu_exec_start(cs);
@ -55,27 +54,16 @@ void cpu_loop(CPUOpenRISCState *env)
} }
break; break;
case EXCP_ALIGN: case EXCP_ALIGN:
info.si_signo = TARGET_SIGBUS; force_sig_fault(TARGET_SIGBUS, TARGET_BUS_ADRALN, env->eear);
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);
break; break;
case EXCP_ILLEGAL: case EXCP_ILLEGAL:
info.si_signo = TARGET_SIGILL; force_sig_fault(TARGET_SIGILL, TARGET_ILL_ILLOPC, env->pc);
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);
break; break;
case EXCP_INTERRUPT: case EXCP_INTERRUPT:
/* We processed the pending cpu work above. */ /* We processed the pending cpu work above. */
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);