Commit 14d92efd authored by Aleksandar Markovic's avatar Aleksandar Markovic
Browse files

target/mips: Clean up handling of CP0 register 31 



Clean up handling of CP0 register 31.

Reviewed-by: default avatarAleksandar Rikalo <arikalo@wavecomp.com>
Signed-off-by: default avatarAleksandar Markovic <amarkovic@wavecomp.com>
Message-Id: <1567009614-12438-31-git-send-email-aleksandar.markovic@rt-rk.com>
parent 4bcf121e

target/mips/cpu.h

+1 −1
Original line number Diff line number Diff line
@@ -613,7 +613,6 @@ struct CPUMIPSState { 
 * CP0 Register 4

 */

    target_ulong CP0_Context;

    target_ulong CP0_KScratch[MIPS_KSCRATCH_NUM];

    int32_t CP0_MemoryMapID;

/*

 * CP0 Register 5
@@ -1024,6 +1023,7 @@ struct CPUMIPSState { 
 * CP0 Register 31

 */

    int32_t CP0_DESAVE;

    target_ulong CP0_KScratch[MIPS_KSCRATCH_NUM];



    /* We waste some space so we can handle shadow registers like TCs. */

    TCState tcs[MIPS_SHADOW_SET_MAX];

target/mips/translate.c

+28 −28
Original line number Diff line number Diff line
@@ -7532,17 +7532,17 @@ static void gen_mfc0(DisasContext *ctx, TCGv arg, int reg, int sel) 
        break;

    case CP0_REGISTER_31:

        switch (sel) {

        case 0:

        case CP0_REG31__DESAVE:

            /* EJTAG support */

            gen_mfc0_load32(arg, offsetof(CPUMIPSState, CP0_DESAVE));

            register_name = "DESAVE";

            break;

        case 2:

        case 3:

        case 4:

        case 5:

        case 6:

        case 7:

        case CP0_REG31__KSCRATCH1:

        case CP0_REG31__KSCRATCH2:

        case CP0_REG31__KSCRATCH3:

        case CP0_REG31__KSCRATCH4:

        case CP0_REG31__KSCRATCH5:

        case CP0_REG31__KSCRATCH6:

            CP0_CHECK(ctx->kscrexist & (1 << sel));

            tcg_gen_ld_tl(arg, cpu_env,

                          offsetof(CPUMIPSState, CP0_KScratch[sel-2]));
@@ -8282,17 +8282,17 @@ static void gen_mtc0(DisasContext *ctx, TCGv arg, int reg, int sel) 
        break;

    case CP0_REGISTER_31:

        switch (sel) {

        case 0:

        case CP0_REG31__DESAVE:

            /* EJTAG support */

            gen_mtc0_store32(arg, offsetof(CPUMIPSState, CP0_DESAVE));

            register_name = "DESAVE";

            break;

        case 2:

        case 3:

        case 4:

        case 5:

        case 6:

        case 7:

        case CP0_REG31__KSCRATCH1:

        case CP0_REG31__KSCRATCH2:

        case CP0_REG31__KSCRATCH3:

        case CP0_REG31__KSCRATCH4:

        case CP0_REG31__KSCRATCH5:

        case CP0_REG31__KSCRATCH6:

            CP0_CHECK(ctx->kscrexist & (1 << sel));

            tcg_gen_st_tl(arg, cpu_env,

                          offsetof(CPUMIPSState, CP0_KScratch[sel-2]));
@@ -9009,17 +9009,17 @@ static void gen_dmfc0(DisasContext *ctx, TCGv arg, int reg, int sel) 
        break;

    case CP0_REGISTER_31:

        switch (sel) {

        case 0:

        case CP0_REG31__DESAVE:

            /* EJTAG support */

            gen_mfc0_load32(arg, offsetof(CPUMIPSState, CP0_DESAVE));

            register_name = "DESAVE";

            break;

        case 2:

        case 3:

        case 4:

        case 5:

        case 6:

        case 7:

        case CP0_REG31__KSCRATCH1:

        case CP0_REG31__KSCRATCH2:

        case CP0_REG31__KSCRATCH3:

        case CP0_REG31__KSCRATCH4:

        case CP0_REG31__KSCRATCH5:

        case CP0_REG31__KSCRATCH6:

            CP0_CHECK(ctx->kscrexist & (1 << sel));

            tcg_gen_ld_tl(arg, cpu_env,

                          offsetof(CPUMIPSState, CP0_KScratch[sel-2]));
@@ -9746,17 +9746,17 @@ static void gen_dmtc0(DisasContext *ctx, TCGv arg, int reg, int sel) 
        break;

    case CP0_REGISTER_31:

        switch (sel) {

        case 0:

        case CP0_REG31__DESAVE:

            /* EJTAG support */

            gen_mtc0_store32(arg, offsetof(CPUMIPSState, CP0_DESAVE));

            register_name = "DESAVE";

            break;

        case 2:

        case 3:

        case 4:

        case 5:

        case 6:

        case 7:

        case CP0_REG31__KSCRATCH1:

        case CP0_REG31__KSCRATCH2:

        case CP0_REG31__KSCRATCH3:

        case CP0_REG31__KSCRATCH4:

        case CP0_REG31__KSCRATCH5:

        case CP0_REG31__KSCRATCH6:

            CP0_CHECK(ctx->kscrexist & (1 << sel));

            tcg_gen_st_tl(arg, cpu_env,

                          offsetof(CPUMIPSState, CP0_KScratch[sel - 2]));