On Wed, 10 Jul 2024 at 04:30, Richard Henderson <richard.hender...@linaro.org> wrote: > > 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.hender...@linaro.org> > --- > target/arm/cpu.h | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/target/arm/cpu.h b/target/arm/cpu.h > index d8eb986a04..ccfb9349a3 100644 > --- a/target/arm/cpu.h > +++ b/target/arm/cpu.h > @@ -3309,8 +3309,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.
(This one's now upstream as commit efceb7d2bd5c.) -- PMM