From: Richard Henderson <[email protected]> Rename from isar_feature_aa64_ids to match the feature name: FEAT_IDST.
Reviewed-by: Peter Maydell <[email protected]> Reviewed-by: Philippe Mathieu-Daudé <[email protected]> Signed-off-by: Richard Henderson <[email protected]> Message-id: [email protected] Signed-off-by: Peter Maydell <[email protected]> --- target/arm/cpu-features.h | 2 +- target/arm/tcg/op_helper.c | 2 +- target/arm/tcg/translate-a64.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/target/arm/cpu-features.h b/target/arm/cpu-features.h index a9eebb45564..2fc1bf02cbe 100644 --- a/target/arm/cpu-features.h +++ b/target/arm/cpu-features.h @@ -1403,7 +1403,7 @@ static inline bool isar_feature_aa64_fwb(const ARMISARegisters *id) return FIELD_EX64_IDREG(id, ID_AA64MMFR2, FWB) != 0; } -static inline bool isar_feature_aa64_ids(const ARMISARegisters *id) +static inline bool isar_feature_aa64_idst(const ARMISARegisters *id) { return FIELD_EX64_IDREG(id, ID_AA64MMFR2, IDS) != 0; } diff --git a/target/arm/tcg/op_helper.c b/target/arm/tcg/op_helper.c index af56eff9f18..6a673e5ae6e 100644 --- a/target/arm/tcg/op_helper.c +++ b/target/arm/tcg/op_helper.c @@ -1136,7 +1136,7 @@ const void *HELPER(access_check_cp_reg)(CPUARMState *env, uint32_t key, break; case CP_ACCESS_UNDEFINED: /* CP_ACCESS_UNDEFINED is never direct to a specified EL */ - if (cpu_isar_feature(aa64_ids, cpu) && isread && + if (cpu_isar_feature(aa64_idst, cpu) && isread && arm_cpreg_in_idspace(ri)) { /* * FEAT_IDST says this should be reported as EC_SYSTEMREGISTERTRAP, diff --git a/target/arm/tcg/translate-a64.c b/target/arm/tcg/translate-a64.c index 5d5b11e2da9..0c712e7ac2e 100644 --- a/target/arm/tcg/translate-a64.c +++ b/target/arm/tcg/translate-a64.c @@ -2675,7 +2675,7 @@ static void gen_sysreg_undef(DisasContext *s, bool isread, */ uint32_t syndrome; - if (isread && dc_isar_feature(aa64_ids, s) && + if (isread && dc_isar_feature(aa64_idst, s) && arm_cpreg_encoding_in_idspace(op0, op1, op2, crn, crm)) { syndrome = syn_aa64_sysregtrap(op0, op1, op2, crn, crm, rt, isread); } else { -- 2.43.0
