Commit 17bc37b7 authored by Hans-Peter Nilsson's avatar Hans-Peter Nilsson Committed by Edgar E. Iglesias
Browse files

target-cris: reduce v32isms from v10 log dumps 



Use the correct register names for v10 and don't dump support function
registers for pre-v32.

Reviewed-by: default avatarEdgar E. Iglesias <edgar.iglesias@xilinx.com>
Signed-off-by: default avatarHans-Peter Nilsson <hp@axis.com>
Signed-off-by: default avatarRabin Vincent <rabinv@axis.com>
Signed-off-by: default avatarEdgar E. Iglesias <edgar.iglesias@xilinx.com>
parent 85b3ed1d

target-cris/translate.c

+23 −13
Original line number Diff line number Diff line
@@ -140,14 +140,14 @@ static void gen_BUG(DisasContext *dc, const char *file, int line) 
    cpu_abort(CPU(dc->cpu), "%s:%d\n", file, line);

}



static const char *regnames[] =

static const char *regnames_v32[] =

{

    "$r0", "$r1", "$r2", "$r3",

    "$r4", "$r5", "$r6", "$r7",

    "$r8", "$r9", "$r10", "$r11",

    "$r12", "$r13", "$sp", "$acr",

};

static const char *pregnames[] =

static const char *pregnames_v32[] =

{

    "$bz", "$vr", "$pid", "$srs",

    "$wz", "$exs", "$eda", "$mof",
@@ -3327,12 +3327,20 @@ void cris_cpu_dump_state(CPUState *cs, FILE *f, fprintf_function cpu_fprintf, 
{

    CRISCPU *cpu = CRIS_CPU(cs);

    CPUCRISState *env = &cpu->env;

    const char **regnames;

    const char **pregnames;

    int i;

    uint32_t srs;



    if (!env || !f) {

        return;

    }

    if (env->pregs[PR_VR] < 32) {

        pregnames = pregnames_v10;

        regnames = regnames_v10;

    } else {

        pregnames = pregnames_v32;

        regnames = regnames_v32;

    }



    cpu_fprintf(f, "PC=%x CCS=%x btaken=%d btarget=%x\n"

            "cc_op=%d cc_src=%d cc_dest=%d cc_result=%x cc_mask=%x\n",
@@ -3354,7 +3362,8 @@ void cris_cpu_dump_state(CPUState *cs, FILE *f, fprintf_function cpu_fprintf, 
            cpu_fprintf(f, "\n");

        }

    }

    srs = env->pregs[PR_SRS];

    if (env->pregs[PR_VR] >= 32) {

        uint32_t srs = env->pregs[PR_SRS];

        cpu_fprintf(f, "\nsupport function regs bank %x:\n", srs);

        if (srs < ARRAY_SIZE(env->sregs)) {

            for (i = 0; i < 16; i++) {
@@ -3365,6 +3374,7 @@ void cris_cpu_dump_state(CPUState *cs, FILE *f, fprintf_function cpu_fprintf, 
                }

            }

        }

    }

    cpu_fprintf(f, "\n\n");



}
@@ -3406,12 +3416,12 @@ void cris_initialize_tcg(void) 
    for (i = 0; i < 16; i++) {

        cpu_R[i] = tcg_global_mem_new(cpu_env,

                                      offsetof(CPUCRISState, regs[i]),

                                      regnames[i]);

                                      regnames_v32[i]);

    }

    for (i = 0; i < 16; i++) {

        cpu_PR[i] = tcg_global_mem_new(cpu_env,

                                       offsetof(CPUCRISState, pregs[i]),

                                       pregnames[i]);

                                       pregnames_v32[i]);

    }

}