Rename from isar_feature_aa64_sve2_pmull128 to match the feature name: FEAT_SVE_PMULL128.
Signed-off-by: Richard Henderson <[email protected]> --- bsd-user/aarch64/target_arch_elf.h | 2 +- target/arm/cpu-features.h | 2 +- linux-user/aarch64/elfload.c | 2 +- target/arm/tcg/translate-sve.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bsd-user/aarch64/target_arch_elf.h b/bsd-user/aarch64/target_arch_elf.h index 2fb7dcd778..6f9d192b4f 100644 --- a/bsd-user/aarch64/target_arch_elf.h +++ b/bsd-user/aarch64/target_arch_elf.h @@ -127,7 +127,7 @@ static uint32_t get_elf_hwcap2(void) GET_FEATURE_ID(aa64_dcpodp, ARM_HWCAP2_A64_DCPODP); GET_FEATURE_ID(aa64_sve2, ARM_HWCAP2_A64_SVE2); GET_FEATURE_ID(aa64_sve_aes, ARM_HWCAP2_A64_SVEAES); - GET_FEATURE_ID(aa64_sve2_pmull128, ARM_HWCAP2_A64_SVEPMULL); + GET_FEATURE_ID(aa64_sve_pmull128, ARM_HWCAP2_A64_SVEPMULL); GET_FEATURE_ID(aa64_sve2_bitperm, ARM_HWCAP2_A64_SVEBITPERM); GET_FEATURE_ID(aa64_sve2_sha3, ARM_HWCAP2_A64_SVESHA3); GET_FEATURE_ID(aa64_sve2_sm4, ARM_HWCAP2_A64_SVESM4); diff --git a/target/arm/cpu-features.h b/target/arm/cpu-features.h index b29cd49020..750be9b1b1 100644 --- a/target/arm/cpu-features.h +++ b/target/arm/cpu-features.h @@ -1534,7 +1534,7 @@ static inline bool isar_feature_aa64_sve_aes(const ARMISARegisters *id) return FIELD_EX64_IDREG(id, ID_AA64ZFR0, AES) != 0; } -static inline bool isar_feature_aa64_sve2_pmull128(const ARMISARegisters *id) +static inline bool isar_feature_aa64_sve_pmull128(const ARMISARegisters *id) { return FIELD_EX64_IDREG(id, ID_AA64ZFR0, AES) >= 2; } diff --git a/linux-user/aarch64/elfload.c b/linux-user/aarch64/elfload.c index bcf2e6b9c1..40c5e1dbd3 100644 --- a/linux-user/aarch64/elfload.c +++ b/linux-user/aarch64/elfload.c @@ -193,7 +193,7 @@ abi_ulong get_elf_hwcap2(CPUState *cs) GET_FEATURE_ID(aa64_dcpodp, ARM_HWCAP2_A64_DCPODP); GET_FEATURE_ID(aa64_sve2, ARM_HWCAP2_A64_SVE2); GET_FEATURE_ID(aa64_sve_aes, ARM_HWCAP2_A64_SVEAES); - GET_FEATURE_ID(aa64_sve2_pmull128, ARM_HWCAP2_A64_SVEPMULL); + GET_FEATURE_ID(aa64_sve_pmull128, ARM_HWCAP2_A64_SVEPMULL); GET_FEATURE_ID(aa64_sve2_bitperm, ARM_HWCAP2_A64_SVEBITPERM); GET_FEATURE_ID(aa64_sve2_sha3, ARM_HWCAP2_A64_SVESHA3); GET_FEATURE_ID(aa64_sve2_sm4, ARM_HWCAP2_A64_SVESM4); diff --git a/target/arm/tcg/translate-sve.c b/target/arm/tcg/translate-sve.c index 52f370e47e..03d97dcaf5 100644 --- a/target/arm/tcg/translate-sve.c +++ b/target/arm/tcg/translate-sve.c @@ -7233,7 +7233,7 @@ static bool do_trans_pmull(DisasContext *s, arg_rrr_esz *a, bool sel) }; if (a->esz == 0) { - if (!dc_isar_feature(aa64_sve2_pmull128, s)) { + if (!dc_isar_feature(aa64_sve_pmull128, s)) { return false; } s->is_nonstreaming = !dc_isar_feature(aa64_ssve_aes, s); -- 2.43.0
