Message ID | 1561543629-20327-9-git-send-email-aleksandar.markovic@rt-rk.com |
---|---|
State | New |
Headers | show |
Series | target/mips: Improve MSA TCG tests | expand |
> From: Aleksandar Markovic <aleksandar.markovic@rt-rk.com> > Sent: Wednesday, June 26, 2019 12:07 PM > To: qemu-devel@nongnu.org > Cc: Aleksandar Markovic; Aleksandar Rikalo > Subject: [PATCH v6 8/8] target/mips: Fix big endian host behavior for interleave MSA instructions > > From: Aleksandar Markovic <amarkovic@wavecomp.com> > > Fix big endian host behavior for interleave MSA instructions. Previous > fix used TARGET_WORDS_BIGENDIAN instead of HOST_WORDS_BIGENDIAN, which > was a mistake. > > Signed-off-by: Aleksandar Markovic <amarkovic@wavecomp.com> > --- > target/mips/msa_helper.c | 24 ++++++++++++------------ > 1 file changed, 12 insertions(+), 12 deletions(-) > > diff --git a/target/mips/msa_helper.c b/target/mips/msa_helper.c > index 7a9bfb3..8bad636 100644 > --- a/target/mips/msa_helper.c > +++ b/target/mips/msa_helper.c > @@ -1737,7 +1737,7 @@ void helper_msa_ilvev_df(CPUMIPSState *env, uint32_t df, uint32_t wd, > > switch (df) { > case DF_BYTE: > -#if defined(TARGET_WORDS_BIGENDIAN) > +#if defined(HOST_WORDS_BIGENDIAN) > pwd->b[8] = pws->b[9]; > pwd->b[9] = pwt->b[9]; > pwd->b[10] = pws->b[11]; > @@ -1774,7 +1774,7 @@ void helper_msa_ilvev_df(CPUMIPSState *env, uint32_t df, uint32_t wd, > #endif > break; > case DF_HALF: > -#if defined(TARGET_WORDS_BIGENDIAN) > +#if defined(HOST_WORDS_BIGENDIAN) > pwd->h[4] = pws->h[5]; > pwd->h[5] = pwt->h[5]; > pwd->h[6] = pws->h[7]; > @@ -1795,7 +1795,7 @@ void helper_msa_ilvev_df(CPUMIPSState *env, uint32_t df, uint32_t wd, > #endif > break; > case DF_WORD: > -#if defined(TARGET_WORDS_BIGENDIAN) > +#if defined(HOST_WORDS_BIGENDIAN) > pwd->w[2] = pws->w[3]; > pwd->w[3] = pwt->w[3]; > pwd->w[0] = pws->w[1]; > @@ -1825,7 +1825,7 @@ void helper_msa_ilvod_df(CPUMIPSState *env, uint32_t df, uint32_t wd, > > switch (df) { > case DF_BYTE: > -#if defined(TARGET_WORDS_BIGENDIAN) > +#if defined(HOST_WORDS_BIGENDIAN) > pwd->b[7] = pwt->b[6]; > pwd->b[6] = pws->b[6]; > pwd->b[5] = pwt->b[4]; > @@ -1862,7 +1862,7 @@ void helper_msa_ilvod_df(CPUMIPSState *env, uint32_t df, uint32_t wd, > #endif > break; > case DF_HALF: > -#if defined(TARGET_WORDS_BIGENDIAN) > +#if defined(HOST_WORDS_BIGENDIAN) > pwd->h[3] = pwt->h[2]; > pwd->h[2] = pws->h[2]; > pwd->h[1] = pwt->h[0]; > @@ -1883,7 +1883,7 @@ void helper_msa_ilvod_df(CPUMIPSState *env, uint32_t df, uint32_t wd, > #endif > break; > case DF_WORD: > -#if defined(TARGET_WORDS_BIGENDIAN) > +#if defined(HOST_WORDS_BIGENDIAN) > pwd->w[1] = pwt->w[0]; > pwd->w[0] = pws->w[0]; > pwd->w[3] = pwt->w[2]; > @@ -1913,7 +1913,7 @@ void helper_msa_ilvl_df(CPUMIPSState *env, uint32_t df, uint32_t wd, > > switch (df) { > case DF_BYTE: > -#if defined(TARGET_WORDS_BIGENDIAN) > +#if defined(HOST_WORDS_BIGENDIAN) > pwd->b[7] = pwt->b[15]; > pwd->b[6] = pws->b[15]; > pwd->b[5] = pwt->b[14]; > @@ -1950,7 +1950,7 @@ void helper_msa_ilvl_df(CPUMIPSState *env, uint32_t df, uint32_t wd, > #endif > break; > case DF_HALF: > -#if defined(TARGET_WORDS_BIGENDIAN) > +#if defined(HOST_WORDS_BIGENDIAN) > pwd->h[3] = pwt->h[7]; > pwd->h[2] = pws->h[7]; > pwd->h[1] = pwt->h[6]; > @@ -1971,7 +1971,7 @@ void helper_msa_ilvl_df(CPUMIPSState *env, uint32_t df, uint32_t wd, > #endif > break; > case DF_WORD: > -#if defined(TARGET_WORDS_BIGENDIAN) > +#if defined(HOST_WORDS_BIGENDIAN) > pwd->w[1] = pwt->w[3]; > pwd->w[0] = pws->w[3]; > pwd->w[3] = pwt->w[2]; > @@ -2001,7 +2001,7 @@ void helper_msa_ilvr_df(CPUMIPSState *env, uint32_t df, uint32_t wd, > > switch (df) { > case DF_BYTE: > -#if defined(TARGET_WORDS_BIGENDIAN) > +#if defined(HOST_WORDS_BIGENDIAN) > pwd->b[8] = pws->b[0]; > pwd->b[9] = pwt->b[0]; > pwd->b[10] = pws->b[1]; > @@ -2038,7 +2038,7 @@ void helper_msa_ilvr_df(CPUMIPSState *env, uint32_t df, uint32_t wd, > #endif > break; > case DF_HALF: > -#if defined(TARGET_WORDS_BIGENDIAN) > +#if defined(HOST_WORDS_BIGENDIAN) > pwd->h[4] = pws->h[0]; > pwd->h[5] = pwt->h[0]; > pwd->h[6] = pws->h[1]; > @@ -2059,7 +2059,7 @@ void helper_msa_ilvr_df(CPUMIPSState *env, uint32_t df, uint32_t wd, > #endif > break; > case DF_WORD: > -#if defined(TARGET_WORDS_BIGENDIAN) > +#if defined(HOST_WORDS_BIGENDIAN) > pwd->w[2] = pws->w[0]; > pwd->w[3] = pwt->w[0]; > pwd->w[0] = pws->w[1]; > -- > 2.7.4 Reviewed-by: Aleksandar Rikalo <arikalo@wavecomp.com>
diff --git a/target/mips/msa_helper.c b/target/mips/msa_helper.c index 7a9bfb3..8bad636 100644 --- a/target/mips/msa_helper.c +++ b/target/mips/msa_helper.c @@ -1737,7 +1737,7 @@ void helper_msa_ilvev_df(CPUMIPSState *env, uint32_t df, uint32_t wd, switch (df) { case DF_BYTE: -#if defined(TARGET_WORDS_BIGENDIAN) +#if defined(HOST_WORDS_BIGENDIAN) pwd->b[8] = pws->b[9]; pwd->b[9] = pwt->b[9]; pwd->b[10] = pws->b[11]; @@ -1774,7 +1774,7 @@ void helper_msa_ilvev_df(CPUMIPSState *env, uint32_t df, uint32_t wd, #endif break; case DF_HALF: -#if defined(TARGET_WORDS_BIGENDIAN) +#if defined(HOST_WORDS_BIGENDIAN) pwd->h[4] = pws->h[5]; pwd->h[5] = pwt->h[5]; pwd->h[6] = pws->h[7]; @@ -1795,7 +1795,7 @@ void helper_msa_ilvev_df(CPUMIPSState *env, uint32_t df, uint32_t wd, #endif break; case DF_WORD: -#if defined(TARGET_WORDS_BIGENDIAN) +#if defined(HOST_WORDS_BIGENDIAN) pwd->w[2] = pws->w[3]; pwd->w[3] = pwt->w[3]; pwd->w[0] = pws->w[1]; @@ -1825,7 +1825,7 @@ void helper_msa_ilvod_df(CPUMIPSState *env, uint32_t df, uint32_t wd, switch (df) { case DF_BYTE: -#if defined(TARGET_WORDS_BIGENDIAN) +#if defined(HOST_WORDS_BIGENDIAN) pwd->b[7] = pwt->b[6]; pwd->b[6] = pws->b[6]; pwd->b[5] = pwt->b[4]; @@ -1862,7 +1862,7 @@ void helper_msa_ilvod_df(CPUMIPSState *env, uint32_t df, uint32_t wd, #endif break; case DF_HALF: -#if defined(TARGET_WORDS_BIGENDIAN) +#if defined(HOST_WORDS_BIGENDIAN) pwd->h[3] = pwt->h[2]; pwd->h[2] = pws->h[2]; pwd->h[1] = pwt->h[0]; @@ -1883,7 +1883,7 @@ void helper_msa_ilvod_df(CPUMIPSState *env, uint32_t df, uint32_t wd, #endif break; case DF_WORD: -#if defined(TARGET_WORDS_BIGENDIAN) +#if defined(HOST_WORDS_BIGENDIAN) pwd->w[1] = pwt->w[0]; pwd->w[0] = pws->w[0]; pwd->w[3] = pwt->w[2]; @@ -1913,7 +1913,7 @@ void helper_msa_ilvl_df(CPUMIPSState *env, uint32_t df, uint32_t wd, switch (df) { case DF_BYTE: -#if defined(TARGET_WORDS_BIGENDIAN) +#if defined(HOST_WORDS_BIGENDIAN) pwd->b[7] = pwt->b[15]; pwd->b[6] = pws->b[15]; pwd->b[5] = pwt->b[14]; @@ -1950,7 +1950,7 @@ void helper_msa_ilvl_df(CPUMIPSState *env, uint32_t df, uint32_t wd, #endif break; case DF_HALF: -#if defined(TARGET_WORDS_BIGENDIAN) +#if defined(HOST_WORDS_BIGENDIAN) pwd->h[3] = pwt->h[7]; pwd->h[2] = pws->h[7]; pwd->h[1] = pwt->h[6]; @@ -1971,7 +1971,7 @@ void helper_msa_ilvl_df(CPUMIPSState *env, uint32_t df, uint32_t wd, #endif break; case DF_WORD: -#if defined(TARGET_WORDS_BIGENDIAN) +#if defined(HOST_WORDS_BIGENDIAN) pwd->w[1] = pwt->w[3]; pwd->w[0] = pws->w[3]; pwd->w[3] = pwt->w[2]; @@ -2001,7 +2001,7 @@ void helper_msa_ilvr_df(CPUMIPSState *env, uint32_t df, uint32_t wd, switch (df) { case DF_BYTE: -#if defined(TARGET_WORDS_BIGENDIAN) +#if defined(HOST_WORDS_BIGENDIAN) pwd->b[8] = pws->b[0]; pwd->b[9] = pwt->b[0]; pwd->b[10] = pws->b[1]; @@ -2038,7 +2038,7 @@ void helper_msa_ilvr_df(CPUMIPSState *env, uint32_t df, uint32_t wd, #endif break; case DF_HALF: -#if defined(TARGET_WORDS_BIGENDIAN) +#if defined(HOST_WORDS_BIGENDIAN) pwd->h[4] = pws->h[0]; pwd->h[5] = pwt->h[0]; pwd->h[6] = pws->h[1]; @@ -2059,7 +2059,7 @@ void helper_msa_ilvr_df(CPUMIPSState *env, uint32_t df, uint32_t wd, #endif break; case DF_WORD: -#if defined(TARGET_WORDS_BIGENDIAN) +#if defined(HOST_WORDS_BIGENDIAN) pwd->w[2] = pws->w[0]; pwd->w[3] = pwt->w[0]; pwd->w[0] = pws->w[1];