Signed-off-by: Richard Henderson <[email protected]>
---
target/arm/tcg/helper-defs.h | 1 +
target/arm/tcg/crypto_helper.c | 47 +++++++++++++++++++++++++---------
target/arm/tcg/translate-sve.c | 2 ++
target/arm/tcg/sve.decode | 3 +++
4 files changed, 41 insertions(+), 12 deletions(-)
diff --git a/target/arm/tcg/helper-defs.h b/target/arm/tcg/helper-defs.h
index 9d71277b47..3719487754 100644
--- a/target/arm/tcg/helper-defs.h
+++ b/target/arm/tcg/helper-defs.h
@@ -463,6 +463,7 @@ DEF_HELPER_FLAGS_3(crypto_aesmc, TCG_CALL_NO_RWG, void,
ptr, ptr, i32)
DEF_HELPER_FLAGS_3(crypto_aesimc, TCG_CALL_NO_RWG, void, ptr, ptr, i32)
DEF_HELPER_FLAGS_4(crypto_aese_idx, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, i32)
+DEF_HELPER_FLAGS_4(crypto_aesd_idx, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, i32)
DEF_HELPER_FLAGS_4(crypto_sha1su0, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, i32)
DEF_HELPER_FLAGS_4(crypto_sha1c, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, i32)
diff --git a/target/arm/tcg/crypto_helper.c b/target/arm/tcg/crypto_helper.c
index 27b5813b6d..05f193b3d1 100644
--- a/target/arm/tcg/crypto_helper.c
+++ b/target/arm/tcg/crypto_helper.c
@@ -99,6 +99,23 @@ void HELPER(crypto_aese_idx)(void *vd, void *vn, void *vm,
uint32_t desc)
} while (s > 0);
}
+static void aesd_kernel(AESState *ad, const AESState *st, const AESState *rk)
+{
+ AESState t;
+
+ /* Our uint64_t are in the wrong order for big-endian. */
+ if (HOST_BIG_ENDIAN) {
+ t.d[0] = st->d[1] ^ rk->d[1];
+ t.d[1] = st->d[0] ^ rk->d[0];
+ aesdec_ISB_ISR_AK(&t, &t, &aes_zero, false);
+ ad->d[0] = t.d[1];
+ ad->d[1] = t.d[0];
+ } else {
+ t.v = st->v ^ rk->v;
+ aesdec_ISB_ISR_AK(ad, &t, &aes_zero, false);
+ }
+}
+
void HELPER(crypto_aesd)(void *vd, void *vn, void *vm, uint32_t desc)
{
intptr_t i, opr_sz = simd_oprsz(desc);
@@ -107,23 +124,29 @@ void HELPER(crypto_aesd)(void *vd, void *vn, void *vm,
uint32_t desc)
AESState *ad = (AESState *)(vd + i);
AESState *st = (AESState *)(vn + i);
AESState *rk = (AESState *)(vm + i);
- AESState t;
- /* Our uint64_t are in the wrong order for big-endian. */
- if (HOST_BIG_ENDIAN) {
- t.d[0] = st->d[1] ^ rk->d[1];
- t.d[1] = st->d[0] ^ rk->d[0];
- aesdec_ISB_ISR_AK(&t, &t, &aes_zero, false);
- ad->d[0] = t.d[1];
- ad->d[1] = t.d[0];
- } else {
- t.v = st->v ^ rk->v;
- aesdec_ISB_ISR_AK(ad, &t, &aes_zero, false);
- }
+ aesd_kernel(ad, st, rk);
}
clear_tail(vd, opr_sz, simd_maxsz(desc));
}
+void HELPER(crypto_aesd_idx)(void *vd, void *vn, void *vm, uint32_t desc)
+{
+ intptr_t opr_sz = simd_oprsz(desc);
+ intptr_t idx = simd_data(desc);
+ void *vm_idx = vm + idx * 16;
+ intptr_t s = opr_sz - 16;
+
+ do {
+ intptr_t base = ROUND_DOWN(s, 4 * 16);
+ AESState rk = *(AESState *)(vm_idx + base);
+ do {
+ aesd_kernel(vd + s, vn + s, &rk);
+ s -= 16;
+ } while (s >= base);
+ } while (s > 0);
+}
+
void HELPER(crypto_aesmc)(void *vd, void *vm, uint32_t desc)
{
intptr_t i, opr_sz = simd_oprsz(desc);
diff --git a/target/arm/tcg/translate-sve.c b/target/arm/tcg/translate-sve.c
index 5b6b66aaef..340ed7d975 100644
--- a/target/arm/tcg/translate-sve.c
+++ b/target/arm/tcg/translate-sve.c
@@ -8334,6 +8334,8 @@ static bool do_aes2_idx(DisasContext *s, arg_rx_n *a,
gen_helper_gvec_3 *fn)
TRANS_FEAT_STREAMING_IF(AESE_idx, aa64_sve_aes2, aa64_ssve_aes,
do_aes2_idx, a, gen_helper_crypto_aese_idx)
+TRANS_FEAT_STREAMING_IF(AESD_idx, aa64_sve_aes2, aa64_ssve_aes,
+ do_aes2_idx, a, gen_helper_crypto_aesd_idx)
TRANS_FEAT(FCVTNT_sh_m, aa64_sme_or_sve2, gen_gvec_fpst_arg_zpz,
gen_helper_sve2_fcvtnt_sh, a, 0, FPST_A64)
diff --git a/target/arm/tcg/sve.decode b/target/arm/tcg/sve.decode
index 64e0dd0eae..1ab1b4042b 100644
--- a/target/arm/tcg/sve.decode
+++ b/target/arm/tcg/sve.decode
@@ -1985,6 +1985,9 @@ SM4E 01000101 00 10001 1 11100 0 ..... .....
@rdn_rm_e0
AESE_idx 01000101 00 1 .. .10111010 ..... ....0 @aes2_2
AESE_idx 01000101 00 1 .. .10111010 ..... ...00 @aes2_4
+AESD_idx 01000101 00 1 .. .10111011 ..... ....0 @aes2_2
+AESD_idx 01000101 00 1 .. .10111011 ..... ...00 @aes2_4
+
# SVE2 crypto constructive binary operations
SM4EKEY 01000101 00 1 ..... 11110 0 ..... ..... @rd_rn_rm_e0
RAX1 01000101 00 1 ..... 11110 1 ..... ..... @rd_rn_rm_e0
--
2.43.0
