]> git.ipfire.org Git - thirdparty/qemu.git/commitdiff
target/arm: Use el local indexing mair_el
authorRichard Henderson <richard.henderson@linaro.org>
Thu, 23 Oct 2025 12:12:50 +0000 (13:12 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Thu, 23 Oct 2025 12:12:50 +0000 (13:12 +0100)
We already have regime_el() computed to a local.

Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20251014195017.421681-6-richard.henderson@linaro.org
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
target/arm/ptw.c

index 54c45fc9febb448088e0992ca41a450f530feb6f..5fcf10427267310fcc938d32cd3f879a38127e20 100644 (file)
@@ -2319,7 +2319,7 @@ static bool get_phys_addr_lpae(CPUARMState *env, S1Translate *ptw,
 
         /* Index into MAIR registers for cache attributes */
         attrindx = extract32(attrs, 2, 3);
-        mair = env->cp15.mair_el[regime_el(mmu_idx)];
+        mair = env->cp15.mair_el[el];
         result->cacheattrs.is_s2_format = false;
         result->cacheattrs.attrs = extract64(mair, attrindx * 8, 8);