OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

target/arm: Use aesdec_IMC 

This implements the AESIMC instruction.  We have converted everything
to crypto/aes-round.h; crypto/aes.h is no longer needed.

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
Richard Henderson 2023-06-02 02:07:44 -07:00
parent 8b103ed70e
commit bdb01515ed
1 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
target/arm/tcg/crypto_helper.c
View File

@ -14,7 +14,6 @@
#include "cpu.h"
#include "exec/helper-proto.h"
#include "tcg/tcg-gvec-desc.h"
#include "crypto/aes.h"
#include "crypto/aes-round.h"
#include "crypto/sm4.h"
#include "vec_internal.h"
@ -102,23 +101,6 @@ void HELPER(crypto_aesd)(void *vd, void *vn, void *vm, uint32_t desc)
clear_tail(vd, opr_sz, simd_maxsz(desc));
}
static void do_crypto_aesmc(uint64_t *rd, uint64_t *rm, const uint32_t *mc)
{
union CRYPTO_STATE st = { .l = { rm[0], rm[1] } };
int i;
for (i = 0; i < 16; i += 4) {
CR_ST_WORD(st, i >> 2) =
mc[CR_ST_BYTE(st, i)] ^
rol32(mc[CR_ST_BYTE(st, i + 1)], 8) ^
rol32(mc[CR_ST_BYTE(st, i + 2)], 16) ^
rol32(mc[CR_ST_BYTE(st, i + 3)], 24);
}
rd[0] = st.l[0];
rd[1] = st.l[1];
}
void HELPER(crypto_aesmc)(void *vd, void *vm, uint32_t desc)
{
intptr_t i, opr_sz = simd_oprsz(desc);
@ -147,7 +129,20 @@ void HELPER(crypto_aesimc)(void *vd, void *vm, uint32_t desc)
intptr_t i, opr_sz = simd_oprsz(desc);
for (i = 0; i < opr_sz; i += 16) {
do_crypto_aesmc(vd + i, vm + i, AES_imc_rot);
AESState *ad = (AESState *)(vd + i);
AESState *st = (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];
t.d[1] = st->d[0];
aesdec_IMC(&t, &t, false);
ad->d[0] = t.d[1];
ad->d[1] = t.d[0];
} else {
aesdec_IMC(ad, st, false);
}
}
clear_tail(vd, opr_sz, simd_maxsz(desc));
}