@samitouri / QOSamiQemu / commits / bdb0813ba2

target/arm: Rename isar_feature_aa64_sve_sm4

Rename from isar_feature_aa64_sve2_sm4 to match the feature name: FEAT_SVE_SM4. Reviewed-by: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: Richard Henderson <richard.henderson@linaro.org> Message-id: 20260826174213.614571-19-richard.henderson@linaro.org Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

Richard Henderson committed Aug 26, 2026 at 10:42 UTC bdb0813ba2d51ba3b77ccc6592b0ef3bdda032b3
4 files changed +5 -5
bsd-user/aarch64/target_arch_elf.h
+1 -1
@@ -130,7 +130,7 @@ static uint32_t get_elf_hwcap2(void)
130 GET_FEATURE_ID(aa64_sve_pmull128, ARM_HWCAP2_A64_SVEPMULL);
131 GET_FEATURE_ID(aa64_sve_bitperm, ARM_HWCAP2_A64_SVEBITPERM);
132 GET_FEATURE_ID(aa64_sve_sha3, ARM_HWCAP2_A64_SVESHA3);
133 - GET_FEATURE_ID(aa64_sve2_sm4, ARM_HWCAP2_A64_SVESM4);
133 + GET_FEATURE_ID(aa64_sve_sm4, ARM_HWCAP2_A64_SVESM4);
134 GET_FEATURE_ID(aa64_condm_5, ARM_HWCAP2_A64_FLAGM2);
135 GET_FEATURE_ID(aa64_frint, ARM_HWCAP2_A64_FRINT);
136 GET_FEATURE_ID(aa64_sve_i8mm, ARM_HWCAP2_A64_SVEI8MM);
linux-user/aarch64/elfload.c
+1 -1
@@ -196,7 +196,7 @@ abi_ulong get_elf_hwcap2(CPUState *cs)
196 GET_FEATURE_ID(aa64_sve_pmull128, ARM_HWCAP2_A64_SVEPMULL);
197 GET_FEATURE_ID(aa64_sve_bitperm, ARM_HWCAP2_A64_SVEBITPERM);
198 GET_FEATURE_ID(aa64_sve_sha3, ARM_HWCAP2_A64_SVESHA3);
199 - GET_FEATURE_ID(aa64_sve2_sm4, ARM_HWCAP2_A64_SVESM4);
199 + GET_FEATURE_ID(aa64_sve_sm4, ARM_HWCAP2_A64_SVESM4);
200 GET_FEATURE_ID(aa64_condm_5, ARM_HWCAP2_A64_FLAGM2);
201 GET_FEATURE_ID(aa64_frint, ARM_HWCAP2_A64_FRINT);
202 GET_FEATURE_ID(aa64_sve_i8mm, ARM_HWCAP2_A64_SVEI8MM);
target/arm/cpu-features.h
+1 -1
@@ -1559,7 +1559,7 @@ static inline bool isar_feature_aa64_sve_sha3(const ARMISARegisters *id)
1559 return FIELD_EX64_IDREG(id, ID_AA64ZFR0, SHA3) != 0;
1560 }
1561
1562 -static inline bool isar_feature_aa64_sve2_sm4(const ARMISARegisters *id)
1562 +static inline bool isar_feature_aa64_sve_sm4(const ARMISARegisters *id)
1563 {
1564 return FIELD_EX64_IDREG(id, ID_AA64ZFR0, SM4) != 0;
1565 }
target/arm/tcg/translate-sve.c
+2 -2
@@ -8302,9 +8302,9 @@ TRANS_FEAT_STREAMING_IF(AESE, aa64_sve_aes, aa64_ssve_aes,
8302 TRANS_FEAT_STREAMING_IF(AESD, aa64_sve_aes, aa64_ssve_aes,
8303 gen_gvec_ool_arg_zzz, gen_helper_crypto_aesd, a, 0)
8304
8305 -TRANS_FEAT_NONSTREAMING(SM4E, aa64_sve2_sm4, gen_gvec_ool_arg_zzz,
8305 +TRANS_FEAT_NONSTREAMING(SM4E, aa64_sve_sm4, gen_gvec_ool_arg_zzz,
8306 gen_helper_crypto_sm4e, a, 0)
8307 -TRANS_FEAT_NONSTREAMING(SM4EKEY, aa64_sve2_sm4, gen_gvec_ool_arg_zzz,
8307 +TRANS_FEAT_NONSTREAMING(SM4EKEY, aa64_sve_sm4, gen_gvec_ool_arg_zzz,
8308 gen_helper_crypto_sm4ekey, a, 0)
8309
8310 TRANS_FEAT_STREAMING_IF(RAX1, aa64_sve_sha3, aa64_sme2p1,