Re: [PATCH 35/39] crypto: Move SM4_SBOXWORD from target/riscv

[Richard Henderson]

On 2/2/23 02:42, Lawrence Hunter wrote:
> From: Max Chou <max.chou@sifive.com>
>
>      - Share SM4_SBOXWORD between target/riscv and target/arm.
>
> Signed-off-by: Max Chou <max.chou@sifive.com>
> Reviewed-by: Frank Chang <frank.chang@sifive.com>
> ---
>   include/crypto/sm4.h       |  7 +++++++
>   target/arm/crypto_helper.c | 10 ++--------
>   2 files changed, 9 insertions(+), 8 deletions(-)
>
> diff --git a/include/crypto/sm4.h b/include/crypto/sm4.h
> index 9bd3ebc62e..33478562a4 100644
> --- a/include/crypto/sm4.h
> +++ b/include/crypto/sm4.h
> @@ -1,6 +1,13 @@
>   #ifndef QEMU_SM4_H
>   #define QEMU_SM4_H
>   
> +#define SM4_SBOXWORD(WORD) ( \
> +    sm4_sbox[((WORD) >> 24) & 0xff] << 24 | \
> +    sm4_sbox[((WORD) >> 16) & 0xff] << 16 | \
> +    sm4_sbox[((WORD) >>  8) & 0xff] <<  8 | \
> +    sm4_sbox[((WORD) >>  0) & 0xff] <<  0   \
> +)
> +
>   extern const uint8_t sm4_sbox[256];

I think this would be better as an inline function, so that the types are clear.


r~