system/qemu
system/qemu
1
0
Fork 0
mirror of https://gitlab.com/qemu-project/qemu synced 2024-11-05 20:35:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

linux-user/aarch64: Use force_sig_fault()

Browse source 
Use the new force_sig_fault() function instead of setting up
a target_siginfo_t and calling queue_signal().

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20210813131809.28655-8-peter.maydell@linaro.org>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
This commit is contained in:
Peter Maydell 2021-08-13 14:18:09 +01:00 committed by Laurent Vivier
parent 4c90f0ba9d
commit fce9608d02
1 changed files with 8 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
linux-user/aarch64/cpu_loop.c
View file

@ -79,9 +79,8 @@
void cpu_loop(CPUARMState *env) void cpu_loop(CPUARMState *env)
{ {
CPUState *cs = env_cpu(env); CPUState *cs = env_cpu(env);
int trapnr, ec, fsc; int trapnr, ec, fsc, si_code;
abi_long ret; abi_long ret;
target_siginfo_t info;
for (;;) { for (;;) {
cpu_exec_start(cs); cpu_exec_start(cs);
@ -110,18 +109,10 @@ void cpu_loop(CPUARMState *env)
/* just indicate that signals should be handled asap */ /* just indicate that signals should be handled asap */
break; break;
case EXCP_UDEF: case EXCP_UDEF:
info.si_signo = TARGET_SIGILL; force_sig_fault(TARGET_SIGILL, TARGET_ILL_ILLOPN, env->pc);
info.si_errno = 0;
info.si_code = TARGET_ILL_ILLOPN;
info._sifields._sigfault._addr = env->pc;
queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info);
break; break;
case EXCP_PREFETCH_ABORT: case EXCP_PREFETCH_ABORT:
case EXCP_DATA_ABORT: case EXCP_DATA_ABORT:
info.si_signo = TARGET_SIGSEGV;
info.si_errno = 0;
info._sifields._sigfault._addr = env->exception.vaddress;
/* We should only arrive here with EC in {DATAABORT, INSNABORT}. */ /* We should only arrive here with EC in {DATAABORT, INSNABORT}. */
ec = syn_get_ec(env->exception.syndrome); ec = syn_get_ec(env->exception.syndrome);
assert(ec == EC_DATAABORT || ec == EC_INSNABORT); assert(ec == EC_DATAABORT || ec == EC_INSNABORT);
@ -130,28 +121,24 @@ void cpu_loop(CPUARMState *env)
fsc = extract32(env->exception.syndrome, 0, 6); fsc = extract32(env->exception.syndrome, 0, 6);
switch (fsc) { switch (fsc) {
case 0x04 ... 0x07: /* Translation fault, level {0-3} */ case 0x04 ... 0x07: /* Translation fault, level {0-3} */
info.si_code = TARGET_SEGV_MAPERR; si_code = TARGET_SEGV_MAPERR;
break; break;
case 0x09 ... 0x0b: /* Access flag fault, level {1-3} */ case 0x09 ... 0x0b: /* Access flag fault, level {1-3} */
case 0x0d ... 0x0f: /* Permission fault, level {1-3} */ case 0x0d ... 0x0f: /* Permission fault, level {1-3} */
info.si_code = TARGET_SEGV_ACCERR; si_code = TARGET_SEGV_ACCERR;
break; break;
case 0x11: /* Synchronous Tag Check Fault */ case 0x11: /* Synchronous Tag Check Fault */
info.si_code = TARGET_SEGV_MTESERR; si_code = TARGET_SEGV_MTESERR;
break; break;
default: default:
g_assert_not_reached(); g_assert_not_reached();
} }
queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info); force_sig_fault(TARGET_SIGSEGV, si_code, env->exception.vaddress);
break; break;
case EXCP_DEBUG: case EXCP_DEBUG:
case EXCP_BKPT: case EXCP_BKPT:
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;
info._sifields._sigfault._addr = env->pc;
queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info);
break; break;
case EXCP_SEMIHOST: case EXCP_SEMIHOST:
env->xregs[0] = do_common_semihosting(cs); env->xregs[0] = do_common_semihosting(cs);
@ -171,11 +158,7 @@ void cpu_loop(CPUARMState *env)
/* Check for MTE asynchronous faults */ /* Check for MTE asynchronous faults */
if (unlikely(env->cp15.tfsr_el[0])) { if (unlikely(env->cp15.tfsr_el[0])) {
env->cp15.tfsr_el[0] = 0; env->cp15.tfsr_el[0] = 0;
info.si_signo = TARGET_SIGSEGV; force_sig_fault(TARGET_SIGSEGV, TARGET_SEGV_MTEAERR, 0);
info.si_errno = 0;
info._sifields._sigfault._addr = 0;
info.si_code = TARGET_SEGV_MTEAERR;
queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info);
} }
process_pending_signals(env); process_pending_signals(env);