mirror of https://github.com/xemu-project/xemu.git
target/arm: Convert Cryptographic 3-register SHA512 to decodetree
Reviewed-by: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: Richard Henderson <richard.henderson@linaro.org> Message-id: 20240524232121.284515-13-richard.henderson@linaro.org Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
parent
66d1e1a402
commit
7010e36676
|
@ -31,6 +31,7 @@
|
||||||
@rr_q1e0 ........ ........ ...... rn:5 rd:5 &qrr_e q=1 esz=0
|
@rr_q1e0 ........ ........ ...... rn:5 rd:5 &qrr_e q=1 esz=0
|
||||||
@r2r_q1e0 ........ ........ ...... rm:5 rd:5 &qrrr_e rn=%rd q=1 esz=0
|
@r2r_q1e0 ........ ........ ...... rm:5 rd:5 &qrrr_e rn=%rd q=1 esz=0
|
||||||
@rrr_q1e0 ........ ... rm:5 ...... rn:5 rd:5 &qrrr_e q=1 esz=0
|
@rrr_q1e0 ........ ... rm:5 ...... rn:5 rd:5 &qrrr_e q=1 esz=0
|
||||||
|
@rrr_q1e3 ........ ... rm:5 ...... rn:5 rd:5 &qrrr_e q=1 esz=3
|
||||||
|
|
||||||
### Data Processing - Immediate
|
### Data Processing - Immediate
|
||||||
|
|
||||||
|
@ -620,3 +621,13 @@ SHA256SU1 0101 1110 000 ..... 011000 ..... ..... @rrr_q1e0
|
||||||
SHA1H 0101 1110 0010 1000 0000 10 ..... ..... @rr_q1e0
|
SHA1H 0101 1110 0010 1000 0000 10 ..... ..... @rr_q1e0
|
||||||
SHA1SU1 0101 1110 0010 1000 0001 10 ..... ..... @rr_q1e0
|
SHA1SU1 0101 1110 0010 1000 0001 10 ..... ..... @rr_q1e0
|
||||||
SHA256SU0 0101 1110 0010 1000 0010 10 ..... ..... @rr_q1e0
|
SHA256SU0 0101 1110 0010 1000 0010 10 ..... ..... @rr_q1e0
|
||||||
|
|
||||||
|
### Cryptographic three-register SHA512
|
||||||
|
|
||||||
|
SHA512H 1100 1110 011 ..... 100000 ..... ..... @rrr_q1e0
|
||||||
|
SHA512H2 1100 1110 011 ..... 100001 ..... ..... @rrr_q1e0
|
||||||
|
SHA512SU1 1100 1110 011 ..... 100010 ..... ..... @rrr_q1e0
|
||||||
|
RAX1 1100 1110 011 ..... 100011 ..... ..... @rrr_q1e3
|
||||||
|
SM3PARTW1 1100 1110 011 ..... 110000 ..... ..... @rrr_q1e0
|
||||||
|
SM3PARTW2 1100 1110 011 ..... 110001 ..... ..... @rrr_q1e0
|
||||||
|
SM4EKEY 1100 1110 011 ..... 110010 ..... ..... @rrr_q1e0
|
||||||
|
|
|
@ -1341,6 +1341,17 @@ static bool do_gvec_op3_ool(DisasContext *s, arg_qrrr_e *a, int data,
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static bool do_gvec_fn3(DisasContext *s, arg_qrrr_e *a, GVecGen3Fn *fn)
|
||||||
|
{
|
||||||
|
if (!a->q && a->esz == MO_64) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
if (fp_access_check(s)) {
|
||||||
|
gen_gvec_fn3(s, a->q, a->rd, a->rn, a->rm, fn, a->esz);
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* This utility function is for doing register extension with an
|
* This utility function is for doing register extension with an
|
||||||
* optional shift. You will likely want to pass a temporary for the
|
* optional shift. You will likely want to pass a temporary for the
|
||||||
|
@ -4589,7 +4600,7 @@ static bool trans_EXTR(DisasContext *s, arg_extract *a)
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Cryptographic AES, SHA
|
* Cryptographic AES, SHA, SHA512
|
||||||
*/
|
*/
|
||||||
|
|
||||||
TRANS_FEAT(AESE, aa64_aes, do_gvec_op3_ool, a, 0, gen_helper_crypto_aese)
|
TRANS_FEAT(AESE, aa64_aes, do_gvec_op3_ool, a, 0, gen_helper_crypto_aese)
|
||||||
|
@ -4610,6 +4621,15 @@ TRANS_FEAT(SHA1H, aa64_sha1, do_gvec_op2_ool, a, 0, gen_helper_crypto_sha1h)
|
||||||
TRANS_FEAT(SHA1SU1, aa64_sha1, do_gvec_op2_ool, a, 0, gen_helper_crypto_sha1su1)
|
TRANS_FEAT(SHA1SU1, aa64_sha1, do_gvec_op2_ool, a, 0, gen_helper_crypto_sha1su1)
|
||||||
TRANS_FEAT(SHA256SU0, aa64_sha256, do_gvec_op2_ool, a, 0, gen_helper_crypto_sha256su0)
|
TRANS_FEAT(SHA256SU0, aa64_sha256, do_gvec_op2_ool, a, 0, gen_helper_crypto_sha256su0)
|
||||||
|
|
||||||
|
TRANS_FEAT(SHA512H, aa64_sha512, do_gvec_op3_ool, a, 0, gen_helper_crypto_sha512h)
|
||||||
|
TRANS_FEAT(SHA512H2, aa64_sha512, do_gvec_op3_ool, a, 0, gen_helper_crypto_sha512h2)
|
||||||
|
TRANS_FEAT(SHA512SU1, aa64_sha512, do_gvec_op3_ool, a, 0, gen_helper_crypto_sha512su1)
|
||||||
|
TRANS_FEAT(RAX1, aa64_sha3, do_gvec_fn3, a, gen_gvec_rax1)
|
||||||
|
TRANS_FEAT(SM3PARTW1, aa64_sm3, do_gvec_op3_ool, a, 0, gen_helper_crypto_sm3partw1)
|
||||||
|
TRANS_FEAT(SM3PARTW2, aa64_sm3, do_gvec_op3_ool, a, 0, gen_helper_crypto_sm3partw2)
|
||||||
|
TRANS_FEAT(SM4EKEY, aa64_sm4, do_gvec_op3_ool, a, 0, gen_helper_crypto_sm4ekey)
|
||||||
|
|
||||||
|
|
||||||
/* Shift a TCGv src by TCGv shift_amount, put result in dst.
|
/* Shift a TCGv src by TCGv shift_amount, put result in dst.
|
||||||
* Note that it is the caller's responsibility to ensure that the
|
* Note that it is the caller's responsibility to ensure that the
|
||||||
* shift amount is in range (ie 0..31 or 0..63) and provide the ARM
|
* shift amount is in range (ie 0..31 or 0..63) and provide the ARM
|
||||||
|
@ -13510,80 +13530,6 @@ static void disas_simd_indexed(DisasContext *s, uint32_t insn)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Crypto three-reg SHA512
|
|
||||||
* 31 21 20 16 15 14 13 12 11 10 9 5 4 0
|
|
||||||
* +-----------------------+------+---+---+-----+--------+------+------+
|
|
||||||
* | 1 1 0 0 1 1 1 0 0 1 1 | Rm | 1 | O | 0 0 | opcode | Rn | Rd |
|
|
||||||
* +-----------------------+------+---+---+-----+--------+------+------+
|
|
||||||
*/
|
|
||||||
static void disas_crypto_three_reg_sha512(DisasContext *s, uint32_t insn)
|
|
||||||
{
|
|
||||||
int opcode = extract32(insn, 10, 2);
|
|
||||||
int o = extract32(insn, 14, 1);
|
|
||||||
int rm = extract32(insn, 16, 5);
|
|
||||||
int rn = extract32(insn, 5, 5);
|
|
||||||
int rd = extract32(insn, 0, 5);
|
|
||||||
bool feature;
|
|
||||||
gen_helper_gvec_3 *oolfn = NULL;
|
|
||||||
GVecGen3Fn *gvecfn = NULL;
|
|
||||||
|
|
||||||
if (o == 0) {
|
|
||||||
switch (opcode) {
|
|
||||||
case 0: /* SHA512H */
|
|
||||||
feature = dc_isar_feature(aa64_sha512, s);
|
|
||||||
oolfn = gen_helper_crypto_sha512h;
|
|
||||||
break;
|
|
||||||
case 1: /* SHA512H2 */
|
|
||||||
feature = dc_isar_feature(aa64_sha512, s);
|
|
||||||
oolfn = gen_helper_crypto_sha512h2;
|
|
||||||
break;
|
|
||||||
case 2: /* SHA512SU1 */
|
|
||||||
feature = dc_isar_feature(aa64_sha512, s);
|
|
||||||
oolfn = gen_helper_crypto_sha512su1;
|
|
||||||
break;
|
|
||||||
case 3: /* RAX1 */
|
|
||||||
feature = dc_isar_feature(aa64_sha3, s);
|
|
||||||
gvecfn = gen_gvec_rax1;
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
g_assert_not_reached();
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
switch (opcode) {
|
|
||||||
case 0: /* SM3PARTW1 */
|
|
||||||
feature = dc_isar_feature(aa64_sm3, s);
|
|
||||||
oolfn = gen_helper_crypto_sm3partw1;
|
|
||||||
break;
|
|
||||||
case 1: /* SM3PARTW2 */
|
|
||||||
feature = dc_isar_feature(aa64_sm3, s);
|
|
||||||
oolfn = gen_helper_crypto_sm3partw2;
|
|
||||||
break;
|
|
||||||
case 2: /* SM4EKEY */
|
|
||||||
feature = dc_isar_feature(aa64_sm4, s);
|
|
||||||
oolfn = gen_helper_crypto_sm4ekey;
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
unallocated_encoding(s);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!feature) {
|
|
||||||
unallocated_encoding(s);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!fp_access_check(s)) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (oolfn) {
|
|
||||||
gen_gvec_op3_ool(s, true, rd, rn, rm, 0, oolfn);
|
|
||||||
} else {
|
|
||||||
gen_gvec_fn3(s, true, rd, rn, rm, gvecfn, MO_64);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Crypto two-reg SHA512
|
/* Crypto two-reg SHA512
|
||||||
* 31 12 11 10 9 5 4 0
|
* 31 12 11 10 9 5 4 0
|
||||||
* +-----------------------------------------+--------+------+------+
|
* +-----------------------------------------+--------+------+------+
|
||||||
|
@ -13804,7 +13750,6 @@ static const AArch64DecodeTable data_proc_simd[] = {
|
||||||
{ 0x5e000400, 0xdfe08400, disas_simd_scalar_copy },
|
{ 0x5e000400, 0xdfe08400, disas_simd_scalar_copy },
|
||||||
{ 0x5f000000, 0xdf000400, disas_simd_indexed }, /* scalar indexed */
|
{ 0x5f000000, 0xdf000400, disas_simd_indexed }, /* scalar indexed */
|
||||||
{ 0x5f000400, 0xdf800400, disas_simd_scalar_shift_imm },
|
{ 0x5f000400, 0xdf800400, disas_simd_scalar_shift_imm },
|
||||||
{ 0xce608000, 0xffe0b000, disas_crypto_three_reg_sha512 },
|
|
||||||
{ 0xcec08000, 0xfffff000, disas_crypto_two_reg_sha512 },
|
{ 0xcec08000, 0xfffff000, disas_crypto_two_reg_sha512 },
|
||||||
{ 0xce000000, 0xff808000, disas_crypto_four_reg },
|
{ 0xce000000, 0xff808000, disas_crypto_four_reg },
|
||||||
{ 0xce800000, 0xffe00000, disas_crypto_xar },
|
{ 0xce800000, 0xffe00000, disas_crypto_xar },
|
||||||
|
|
Loading…
Reference in New Issue