Re: [Qemu-devel] [PATCH for 4.1 v4 5/5] target/mips: Fix emulation of MSA pack instructions on big endian hosts

[Aleksandar Rikalo]

> From: Aleksandar Markovic <address@hidden>
> Sent: Monday, July 15, 2019 10:00 PM
> To: address@hidden
> Cc: address@hidden; Aleksandar Markovic; Aleksandar Rikalo
> Subject: [PATCH for 4.1 v4 5/5] target/mips: Fix emulation of MSA pack 
> instructions on big endian hosts
>
> From: Aleksandar Markovic <address@hidden>
>
> Fix emulation of MSA pack instructions on big endian hosts.
>
> Signed-off-by: Aleksandar Markovic <address@hidden>
> ---
>  target/mips/msa_helper.c | 74 
> ++++++++++++++++++++++++++++++++++++++++++++++++
>  1 file changed, 74 insertions(+)
>
> diff --git a/target/mips/msa_helper.c b/target/mips/msa_helper.c
> index a383c40..27560ac 100644
> --- a/target/mips/msa_helper.c
> +++ b/target/mips/msa_helper.c
> @@ -2113,6 +2113,24 @@ void helper_msa_pckev_df(CPUMIPSState *env, uint32_t 
> df, uint32_t wd,
>
>      switch (df) {
>      case DF_BYTE:
> +#if defined(HOST_WORDS_BIGENDIAN)
> +        pwd->b[8]  = pws->b[9];
> +        pwd->b[10] = pws->b[13];
> +        pwd->b[12] = pws->b[1];
> +        pwd->b[14] = pws->b[5];
> +        pwd->b[0]  = pwt->b[9];
> +        pwd->b[2]  = pwt->b[13];
> +        pwd->b[4]  = pwt->b[1];
> +        pwd->b[6]  = pwt->b[5];
> +        pwd->b[9]  = pws->b[11];
> +        pwd->b[13] = pws->b[3];
> +        pwd->b[1]  = pwt->b[11];
> +        pwd->b[5]  = pwt->b[3];
> +        pwd->b[11] = pws->b[15];
> +        pwd->b[3]  = pwt->b[15];
> +        pwd->b[15] = pws->b[7];
> +        pwd->b[7]  = pwt->b[7];
> +#else
>          pwd->b[15] = pws->b[14];
>          pwd->b[13] = pws->b[10];
>          pwd->b[11] = pws->b[6];
> @@ -2129,8 +2147,19 @@ void helper_msa_pckev_df(CPUMIPSState *env, uint32_t 
> df, uint32_t wd,
>          pwd->b[4]  = pwt->b[8];
>          pwd->b[8]  = pws->b[0];
>          pwd->b[0]  = pwt->b[0];
> +#endif
>          break;
>      case DF_HALF:
> +#if defined(HOST_WORDS_BIGENDIAN)
> +        pwd->h[4] = pws->h[5];
> +        pwd->h[6] = pws->h[1];
> +        pwd->h[0] = pwt->h[5];
> +        pwd->h[2] = pwt->h[1];
> +        pwd->h[5] = pws->h[7];
> +        pwd->h[1] = pwt->h[7];
> +        pwd->h[7] = pws->h[3];
> +        pwd->h[3] = pwt->h[3];
> +#else
>          pwd->h[7] = pws->h[6];
>          pwd->h[5] = pws->h[2];
>          pwd->h[3] = pwt->h[6];
> @@ -2139,12 +2168,20 @@ void helper_msa_pckev_df(CPUMIPSState *env, uint32_t 
> df, uint32_t wd,
>          pwd->h[2] = pwt->h[4];
>          pwd->h[4] = pws->h[0];
>          pwd->h[0] = pwt->h[0];
> +#endif
>          break;
>      case DF_WORD:
> +#if defined(HOST_WORDS_BIGENDIAN)
> +        pwd->w[2] = pws->w[3];
> +        pwd->w[0] = pwt->w[3];
> +        pwd->w[3] = pws->w[1];
> +        pwd->w[1] = pwt->w[1];
> +#else
>          pwd->w[3] = pws->w[2];
>          pwd->w[1] = pwt->w[2];
>          pwd->w[2] = pws->w[0];
>          pwd->w[0] = pwt->w[0];
> +#endif
>          break;
>      case DF_DOUBLE:
>          pwd->d[1] = pws->d[0];
> @@ -2164,6 +2201,24 @@ void helper_msa_pckod_df(CPUMIPSState *env, uint32_t 
> df, uint32_t wd,
>
>      switch (df) {
>      case DF_BYTE:
> +#if defined(HOST_WORDS_BIGENDIAN)
> +        pwd->b[7]  = pws->b[6];
> +        pwd->b[5]  = pws->b[2];
> +        pwd->b[3]  = pws->b[14];
> +        pwd->b[1]  = pws->b[10];
> +        pwd->b[15] = pwt->b[6];
> +        pwd->b[13] = pwt->b[2];
> +        pwd->b[11] = pwt->b[14];
> +        pwd->b[9]  = pwt->b[10];
> +        pwd->b[6]  = pws->b[4];
> +        pwd->b[2]  = pws->b[12];
> +        pwd->b[14] = pwt->b[4];
> +        pwd->b[10] = pwt->b[12];
> +        pwd->b[4]  = pws->b[0];
> +        pwd->b[12] = pwt->b[0];
> +        pwd->b[0]  = pws->b[8];
> +        pwd->b[8]  = pwt->b[8];
> +#else
>          pwd->b[0]  = pwt->b[1];
>          pwd->b[2]  = pwt->b[5];
>          pwd->b[4]  = pwt->b[9];
> @@ -2180,8 +2235,19 @@ void helper_msa_pckod_df(CPUMIPSState *env, uint32_t 
> df, uint32_t wd,
>          pwd->b[11] = pws->b[7];
>          pwd->b[7]  = pwt->b[15];
>          pwd->b[15] = pws->b[15];
> +#endif
>          break;
>      case DF_HALF:
> +#if defined(HOST_WORDS_BIGENDIAN)
> +        pwd->h[3] = pws->h[2];
> +        pwd->h[1] = pws->h[6];
> +        pwd->h[7] = pwt->h[2];
> +        pwd->h[5] = pwt->h[6];
> +        pwd->h[2] = pws->h[0];
> +        pwd->h[6] = pwt->h[0];
> +        pwd->h[0] = pws->h[4];
> +        pwd->h[4] = pwt->h[4];
> +#else
>          pwd->h[0] = pwt->h[1];
>          pwd->h[2] = pwt->h[5];
>          pwd->h[4] = pws->h[1];
> @@ -2190,12 +2256,20 @@ void helper_msa_pckod_df(CPUMIPSState *env, uint32_t 
> df, uint32_t wd,
>          pwd->h[5] = pws->h[3];
>          pwd->h[3] = pwt->h[7];
>          pwd->h[7] = pws->h[7];
> +#endif
>          break;
>      case DF_WORD:
> +#if defined(HOST_WORDS_BIGENDIAN)
> +        pwd->w[1] = pws->w[0];
> +        pwd->w[3] = pwt->w[0];
> +        pwd->w[0] = pws->w[2];
> +        pwd->w[2] = pwt->w[2];
> +#else
>          pwd->w[0] = pwt->w[1];
>          pwd->w[2] = pws->w[1];
>          pwd->w[1] = pwt->w[3];
>          pwd->w[3] = pws->w[3];
> +#endif
>          break;
>      case DF_DOUBLE:
>          pwd->d[0] = pwt->d[1];
> --
> 2.7.4

Reviewed-by: Aleksandar Rikalo <address@hidden>