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

user: Prefer fast cpu_env() over slower CPU QOM cast macro

Browse Source 
Mechanical patch produced running the command documented
in scripts/coccinelle/cpu_env.cocci_template header.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Warner Losh <imp@bsdimp.com>
Message-ID: <20240129164514.73104-30-philmd@linaro.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
This commit is contained in:
Philippe Mathieu-Daudé 2024-01-29 17:45:11 +01:00 committed by Thomas Huth
parent 52049266e5
commit 42e62aadfd
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bsd-user/signal.c
View File

@ -463,14 +463,13 @@ static int fatal_signal(int sig)
void force_sig_fault(int sig, int code, abi_ulong addr) void force_sig_fault(int sig, int code, abi_ulong addr)
{ {
CPUState *cpu = thread_cpu; CPUState *cpu = thread_cpu;
CPUArchState *env = cpu_env(cpu);
target_siginfo_t info = {}; target_siginfo_t info = {};
info.si_signo = sig; info.si_signo = sig;
info.si_errno = 0; info.si_errno = 0;
info.si_code = code; info.si_code = code;
info.si_addr = addr; info.si_addr = addr;
queue_signal(env, sig, QEMU_SI_FAULT, &info); queue_signal(cpu_env(cpu), sig, QEMU_SI_FAULT, &info);
} }
static void host_signal_handler(int host_sig, siginfo_t *info, void *puc) static void host_signal_handler(int host_sig, siginfo_t *info, void *puc)

6
linux-user/signal.c
View File

@ -623,7 +623,6 @@ void signal_init(void)
void force_sig(int sig) void force_sig(int sig)
{ {
CPUState *cpu = thread_cpu; CPUState *cpu = thread_cpu;
CPUArchState *env = cpu_env(cpu);
target_siginfo_t info = {}; target_siginfo_t info = {};
info.si_signo = sig; info.si_signo = sig;
@ -631,7 +630,7 @@ void force_sig(int sig)
info.si_code = TARGET_SI_KERNEL; info.si_code = TARGET_SI_KERNEL;
info._sifields._kill._pid = 0; info._sifields._kill._pid = 0;
info._sifields._kill._uid = 0; info._sifields._kill._uid = 0;
queue_signal(env, info.si_signo, QEMU_SI_KILL, &info); queue_signal(cpu_env(cpu), info.si_signo, QEMU_SI_KILL, &info);
} }
/* /*
@ -641,14 +640,13 @@ void force_sig(int sig)
void force_sig_fault(int sig, int code, abi_ulong addr) void force_sig_fault(int sig, int code, abi_ulong addr)
{ {
CPUState *cpu = thread_cpu; CPUState *cpu = thread_cpu;
CPUArchState *env = cpu_env(cpu);
target_siginfo_t info = {}; target_siginfo_t info = {};
info.si_signo = sig; info.si_signo = sig;
info.si_errno = 0; info.si_errno = 0;
info.si_code = code; info.si_code = code;
info._sifields._sigfault._addr = addr; info._sifields._sigfault._addr = addr;
queue_signal(env, sig, QEMU_SI_FAULT, &info); queue_signal(cpu_env(cpu), sig, QEMU_SI_FAULT, &info);
} }
/* Force a SIGSEGV if we couldn't write to memory trying to set /* Force a SIGSEGV if we couldn't write to memory trying to set