Re: [PATCH v3 29/29] user: Prefer fast cpu_env() over slower CPU QOM cast macro

[Richard Henderson]

On 1/30/24 02:45, Philippe Mathieu-Daudé wrote:

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

Signed-off-by: Philippe Mathieu-Daudé <phi...@linaro.org>
---
  bsd-user/signal.c   | 3 +--
  linux-user/signal.c | 6 ++----
  2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/bsd-user/signal.c b/bsd-user/signal.c
index ca31470772..c6f0b1be38 100644
--- a/bsd-user/signal.c
+++ b/bsd-user/signal.c
@@ -463,14 +463,13 @@ static int fatal_signal(int sig)
  void force_sig_fault(int sig, int code, abi_ulong addr)
  {
      CPUState *cpu = thread_cpu;
-    CPUArchState *env = cpu_env(cpu);
      target_siginfo_t info = {};

info.si_signo = sig;

      info.si_errno = 0;
      info.si_code = code;
      info.si_addr = addr;
-    queue_signal(env, sig, QEMU_SI_FAULT, &info);
+    queue_signal(cpu_env(cpu), sig, QEMU_SI_FAULT, &info);

Might as well propagate thread_cpu here, and remove local cpu variable.

@@ -631,7 +630,7 @@ void force_sig(int sig)
      info.si_code = TARGET_SI_KERNEL;
      info._sifields._kill._pid = 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);

More instances?

Either way,
Reviewed-by: Richard Henderson <richard.hender...@linaro.org>


r~