Rename from isar_feature_aa64_sve2_sm4 to match the feature name: FEAT_SVE_SM4.
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 | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bsd-user/aarch64/target_arch_elf.h b/bsd-user/aarch64/target_arch_elf.h index 8669f3f833..0ec7a7b585 100644 --- a/bsd-user/aarch64/target_arch_elf.h +++ b/bsd-user/aarch64/target_arch_elf.h @@ -130,7 +130,7 @@ static uint32_t get_elf_hwcap2(void) GET_FEATURE_ID(aa64_sve_pmull128, ARM_HWCAP2_A64_SVEPMULL); GET_FEATURE_ID(aa64_sve_bitperm, ARM_HWCAP2_A64_SVEBITPERM); GET_FEATURE_ID(aa64_sve_sha3, ARM_HWCAP2_A64_SVESHA3); - GET_FEATURE_ID(aa64_sve2_sm4, ARM_HWCAP2_A64_SVESM4); + GET_FEATURE_ID(aa64_sve_sm4, ARM_HWCAP2_A64_SVESM4); GET_FEATURE_ID(aa64_condm_5, ARM_HWCAP2_A64_FLAGM2); GET_FEATURE_ID(aa64_frint, ARM_HWCAP2_A64_FRINT); GET_FEATURE_ID(aa64_sve_i8mm, ARM_HWCAP2_A64_SVEI8MM); diff --git a/target/arm/cpu-features.h b/target/arm/cpu-features.h index f94e8efe47..44dfc7d457 100644 --- a/target/arm/cpu-features.h +++ b/target/arm/cpu-features.h @@ -1554,7 +1554,7 @@ static inline bool isar_feature_aa64_sve_sha3(const ARMISARegisters *id) return FIELD_EX64_IDREG(id, ID_AA64ZFR0, SHA3) != 0; } -static inline bool isar_feature_aa64_sve2_sm4(const ARMISARegisters *id) +static inline bool isar_feature_aa64_sve_sm4(const ARMISARegisters *id) { return FIELD_EX64_IDREG(id, ID_AA64ZFR0, SM4) != 0; } diff --git a/linux-user/aarch64/elfload.c b/linux-user/aarch64/elfload.c index 83791768c6..7afbfca418 100644 --- a/linux-user/aarch64/elfload.c +++ b/linux-user/aarch64/elfload.c @@ -196,7 +196,7 @@ abi_ulong get_elf_hwcap2(CPUState *cs) GET_FEATURE_ID(aa64_sve_pmull128, ARM_HWCAP2_A64_SVEPMULL); GET_FEATURE_ID(aa64_sve_bitperm, ARM_HWCAP2_A64_SVEBITPERM); GET_FEATURE_ID(aa64_sve_sha3, ARM_HWCAP2_A64_SVESHA3); - GET_FEATURE_ID(aa64_sve2_sm4, ARM_HWCAP2_A64_SVESM4); + GET_FEATURE_ID(aa64_sve_sm4, ARM_HWCAP2_A64_SVESM4); GET_FEATURE_ID(aa64_condm_5, ARM_HWCAP2_A64_FLAGM2); GET_FEATURE_ID(aa64_frint, ARM_HWCAP2_A64_FRINT); GET_FEATURE_ID(aa64_sve_i8mm, ARM_HWCAP2_A64_SVEI8MM); diff --git a/target/arm/tcg/translate-sve.c b/target/arm/tcg/translate-sve.c index be7ff74add..0b522e22ef 100644 --- a/target/arm/tcg/translate-sve.c +++ b/target/arm/tcg/translate-sve.c @@ -8292,9 +8292,9 @@ TRANS_FEAT_STREAMING_IF(AESE, aa64_sve_aes, aa64_ssve_aes, TRANS_FEAT_STREAMING_IF(AESD, aa64_sve_aes, aa64_ssve_aes, gen_gvec_ool_arg_zzz, gen_helper_crypto_aesd, a, 0) -TRANS_FEAT_NONSTREAMING(SM4E, aa64_sve2_sm4, gen_gvec_ool_arg_zzz, +TRANS_FEAT_NONSTREAMING(SM4E, aa64_sve_sm4, gen_gvec_ool_arg_zzz, gen_helper_crypto_sm4e, a, 0) -TRANS_FEAT_NONSTREAMING(SM4EKEY, aa64_sve2_sm4, gen_gvec_ool_arg_zzz, +TRANS_FEAT_NONSTREAMING(SM4EKEY, aa64_sve_sm4, gen_gvec_ool_arg_zzz, gen_helper_crypto_sm4ekey, a, 0) TRANS_FEAT_STREAMING_IF(RAX1, aa64_sve_sha3, aa64_sme2p1, -- 2.43.0
