[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-arm] [PATCH] don't hardcode EL1 in extended_addresses_enabled
From: |
Stefano Stabellini |
Subject: |
[Qemu-arm] [PATCH] don't hardcode EL1 in extended_addresses_enabled |
Date: |
Wed, 18 Oct 2017 15:41:23 -0700 (PDT) |
User-agent: |
Alpine 2.10 (DEB 1266 2009-07-14) |
extended_addresses_enabled calls arm_el_is_aa64, hardcoding exception
level 1. Instead, retrieve the current el calling arm_current_el.
Signed-off-by: Stefano Stabellini <address@hidden>
diff --git a/target/arm/internals.h b/target/arm/internals.h
index 1f6efef..63507d9 100644
--- a/target/arm/internals.h
+++ b/target/arm/internals.h
@@ -187,7 +187,7 @@ static inline unsigned int arm_pamax(ARMCPU *cpu)
static inline bool extended_addresses_enabled(CPUARMState *env)
{
TCR *tcr = &env->cp15.tcr_el[arm_is_secure(env) ? 3 : 1];
- return arm_el_is_aa64(env, 1) ||
+ return arm_el_is_aa64(env, arm_current_el(env)) ||
(arm_feature(env, ARM_FEATURE_LPAE) && (tcr->raw_tcr & TTBCR_EAE));
}
- [Qemu-arm] [PATCH] don't hardcode EL1 in extended_addresses_enabled,
Stefano Stabellini <=