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

linux-user/alpha: Use force_sig_fault 

Use the new function instead of setting up a target_siginfo_t
and calling queue_signal.

Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20220107213243.212806-4-richard.henderson@linaro.org>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
This commit is contained in:
Richard Henderson 2022-01-07 13:32:22 -08:00 committed by Laurent Vivier
parent d9c5d7cf4d
commit 1c165977de
1 changed files with 19 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
linux-user/alpha/cpu_loop.c
View File

@ -27,8 +27,7 @@
void cpu_loop(CPUAlphaState *env) void cpu_loop(CPUAlphaState *env)
{ {
CPUState *cs = env_cpu(env); CPUState *cs = env_cpu(env);
int trapnr; int trapnr, si_code;
target_siginfo_t info;
abi_long sysret; abi_long sysret;
while (1) { while (1) {
@ -56,18 +55,10 @@ void cpu_loop(CPUAlphaState *env)
break; break;
case EXCP_OPCDEC: case EXCP_OPCDEC:
do_sigill: do_sigill:
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_ARITH: case EXCP_ARITH:
info.si_signo = TARGET_SIGFPE; force_sig_fault(TARGET_SIGFPE, TARGET_FPE_FLTINV, env->pc);
info.si_errno = 0;
info.si_code = TARGET_FPE_FLTINV;
info._sifields._sigfault._addr = env->pc;
queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info);
break; break;
case EXCP_FEN: case EXCP_FEN:
/* No-op. Linux simply re-enables the FPU. */ /* No-op. Linux simply re-enables the FPU. */
@ -76,20 +67,10 @@ void cpu_loop(CPUAlphaState *env)
switch (env->error_code) { switch (env->error_code) {
case 0x80: case 0x80:
/* BPT */ /* BPT */
info.si_signo = TARGET_SIGTRAP; goto do_sigtrap_brkpt;
info.si_errno = 0;
info.si_code = TARGET_TRAP_BRKPT;
info._sifields._sigfault._addr = env->pc;
queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info);
break;
case 0x81: case 0x81:
/* BUGCHK */ /* BUGCHK */
info.si_signo = TARGET_SIGTRAP; goto do_sigtrap_unk;
info.si_errno = 0;
info.si_code = TARGET_TRAP_UNK;
info._sifields._sigfault._addr = env->pc;
queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info);
break;
case 0x83: case 0x83:
/* CALLSYS */ /* CALLSYS */
trapnr = env->ir[IR_V0]; trapnr = env->ir[IR_V0];
@ -130,47 +111,43 @@ void cpu_loop(CPUAlphaState *env)
abort(); abort();
case 0xAA: case 0xAA:
/* GENTRAP */ /* GENTRAP */
info.si_signo = TARGET_SIGFPE;
switch (env->ir[IR_A0]) { switch (env->ir[IR_A0]) {
case TARGET_GEN_INTOVF: case TARGET_GEN_INTOVF:
info.si_code = TARGET_FPE_INTOVF; si_code = TARGET_FPE_INTOVF;
break; break;
case TARGET_GEN_INTDIV: case TARGET_GEN_INTDIV:
info.si_code = TARGET_FPE_INTDIV; si_code = TARGET_FPE_INTDIV;
break; break;
case TARGET_GEN_FLTOVF: case TARGET_GEN_FLTOVF:
info.si_code = TARGET_FPE_FLTOVF; si_code = TARGET_FPE_FLTOVF;
break; break;
case TARGET_GEN_FLTUND: case TARGET_GEN_FLTUND:
info.si_code = TARGET_FPE_FLTUND; si_code = TARGET_FPE_FLTUND;
break; break;
case TARGET_GEN_FLTINV: case TARGET_GEN_FLTINV:
info.si_code = TARGET_FPE_FLTINV; si_code = TARGET_FPE_FLTINV;
break; break;
case TARGET_GEN_FLTINE: case TARGET_GEN_FLTINE:
info.si_code = TARGET_FPE_FLTRES; si_code = TARGET_FPE_FLTRES;
break; break;
case TARGET_GEN_ROPRAND: case TARGET_GEN_ROPRAND:
info.si_code = TARGET_FPE_FLTUNK; si_code = TARGET_FPE_FLTUNK;
break; break;
default: default:
info.si_signo = TARGET_SIGTRAP; goto do_sigtrap_unk;
info.si_code = TARGET_TRAP_UNK;
break;
} }
info.si_errno = 0; force_sig_fault(TARGET_SIGFPE, si_code, env->pc);
info._sifields._sigfault._addr = env->pc;
queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info);
break; break;
default: default:
goto do_sigill; goto do_sigill;
} }
break; break;
case EXCP_DEBUG: case EXCP_DEBUG:
info.si_signo = TARGET_SIGTRAP; do_sigtrap_brkpt:
info.si_errno = 0; force_sig_fault(TARGET_SIGTRAP, TARGET_TRAP_BRKPT, env->pc);
info.si_code = TARGET_TRAP_BRKPT; break;
queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info); do_sigtrap_unk:
force_sig_fault(TARGET_SIGTRAP, TARGET_TRAP_UNK, env->pc);
break; break;
case EXCP_INTERRUPT: case EXCP_INTERRUPT:
/* Just indicate that signals should be handled asap. */ /* Just indicate that signals should be handled asap. */