Commit 6ed8682d authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/amarkovic/tags/mips-queue-jul-15-2019' into staging 



MIPS queue for July 15th, 2019

# gpg: Signature made Mon 15 Jul 2019 21:23:24 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/amarkovic/tags/mips-queue-jul-15-2019:
  target/mips: Add missing 'break' for certain cases of MTTR handling
  target/mips: Add missing 'break' for certain cases of MFTR handling
  target/mips: Add missing 'break' for a case of MTHC0 handling

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 5ea8ec2f 0d0304f2

target/mips/translate.c

+5 −0
Original line number Diff line number Diff line
@@ -6745,6 +6745,7 @@ static void gen_mthc0(DisasContext *ctx, TCGv arg, int reg, int sel) 
        default:

            goto cp0_unimplemented;

        }

        break;

    case CP0_REGISTER_17:

        switch (sel) {

        case 0:
@@ -9825,6 +9826,7 @@ static void gen_mftr(CPUMIPSState *env, DisasContext *ctx, int rt, int rd, 
                gen_mfc0(ctx, t0, rt, sel);

                break;

            }

            break;

        case 12:

            switch (sel) {

            case 0:
@@ -9834,6 +9836,7 @@ static void gen_mftr(CPUMIPSState *env, DisasContext *ctx, int rt, int rd, 
                gen_mfc0(ctx, t0, rt, sel);

                break;

            }

            break;

        case 13:

            switch (sel) {

            case 0:
@@ -10052,6 +10055,7 @@ static void gen_mttr(CPUMIPSState *env, DisasContext *ctx, int rd, int rt, 
                gen_mtc0(ctx, t0, rd, sel);

                break;

            }

            break;

        case 12:

            switch (sel) {

            case 0:
@@ -10061,6 +10065,7 @@ static void gen_mttr(CPUMIPSState *env, DisasContext *ctx, int rd, int rt, 
                gen_mtc0(ctx, t0, rd, sel);

                break;

            }

            break;

        case 13:

            switch (sel) {

            case 0: