Commit 4da6c0f9 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/amarkovic2/tags/mips-queue-jul-23-2019' into staging 



MIPS queue for July 23rd, 2019

# gpg: Signature made Mon 22 Jul 2019 18:34:29 BST
# gpg:                using RSA key D4972A8967F75A65
# gpg: Good signature from "Aleksandar Markovic <amarkovic@wavecomp.com>" [unknown]
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 8526 FBF1 5DA3 811F 4A01  DD75 D497 2A89 67F7 5A65

* remotes/amarkovic2/tags/mips-queue-jul-23-2019:
  target/mips: Fix emulation of MSA pack instructions on big endian hosts
  target/mips: Add 'fall through' comments for handling nanoMips' SHXS, SWXS

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents cec9f94f 51229582

target/mips/msa_helper.c

+74 −0
Original line number Diff line number Diff line
@@ -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]  = pwt->b[6];

        pwd->b[5]  = pwt->b[2];

        pwd->b[3]  = pwt->b[14];

        pwd->b[1]  = pwt->b[10];

        pwd->b[15] = pws->b[6];

        pwd->b[13] = pws->b[2];

        pwd->b[11] = pws->b[14];

        pwd->b[9]  = pws->b[10];

        pwd->b[6]  = pwt->b[4];

        pwd->b[2]  = pwt->b[12];

        pwd->b[14] = pws->b[4];

        pwd->b[10] = pws->b[12];

        pwd->b[4]  = pwt->b[0];

        pwd->b[12] = pws->b[0];

        pwd->b[0]  = pwt->b[8];

        pwd->b[8]  = pws->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] = pwt->h[2];

        pwd->h[1] = pwt->h[6];

        pwd->h[7] = pws->h[2];

        pwd->h[5] = pws->h[6];

        pwd->h[2] = pwt->h[0];

        pwd->h[6] = pws->h[0];

        pwd->h[0] = pwt->h[4];

        pwd->h[4] = pws->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] = pwt->w[0];

        pwd->w[3] = pws->w[0];

        pwd->w[0] = pwt->w[2];

        pwd->w[2] = pws->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];

target/mips/translate.c

+2 −0
Original line number Diff line number Diff line
@@ -20141,12 +20141,14 @@ static void gen_p_lsx(DisasContext *ctx, int rd, int rs, int rt) 
        switch (extract32(ctx->opcode, 7, 4)) {

        case NM_SHXS:

            check_nms(ctx);

            /* fall through */

        case NM_LHXS:

        case NM_LHUXS:

            tcg_gen_shli_tl(t0, t0, 1);

            break;

        case NM_SWXS:

            check_nms(ctx);

            /* fall through */

        case NM_LWXS:

        case NM_LWC1XS:

        case NM_SWC1XS: