From: Richard Henderson <richard.henderson@linaro.org>
Date: Tue, 2 Jul 2024 15:49:11 +0000 (-0700)
Subject: target/arm: Use cpu_env in cpu_untagged_addr
X-Git-Tag: qemu-xen-4.20.0~78^2~12
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=efceb7d2bd5cb0f82045b7945810c5c029f60eb2;p=qemu-xen.git

target/arm: Use cpu_env in cpu_untagged_addr

In a completely artifical memset benchmark object_dynamic_cast_assert
dominates the profile, even above guest address resolution and
the underlying host memset.

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-id: 20240702154911.1667418-1-richard.henderson@linaro.org
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---

diff --git a/target/arm/cpu.h b/target/arm/cpu.h
index 4c656bdbb7..a12859fc53 100644
--- a/target/arm/cpu.h
+++ b/target/arm/cpu.h
@@ -3354,8 +3354,8 @@ extern const uint64_t pred_esz_masks[5];
  */
 static inline target_ulong cpu_untagged_addr(CPUState *cs, target_ulong x)
 {
-    ARMCPU *cpu = ARM_CPU(cs);
-    if (cpu->env.tagged_addr_enable) {
+    CPUARMState *env = cpu_env(cs);
+    if (env->tagged_addr_enable) {
         /*
          * TBI is enabled for userspace but not kernelspace addresses.
          * Only clear the tag if bit 55 is clear.