Commit 4a247932 authored by Richard Henderson's avatar Richard Henderson
Browse files

target/alpha: Clean up alpha_cpu_dump_state 



Drop the "RI" and "FIR" prefixes; use only the normal linux names.
Add the FPCR to the dump.

Tested-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: default avatarRichard Henderson <richard.henderson@linaro.org>
parent 1b46b4da

target/alpha/helper.c

+10 −9
Original line number Diff line number Diff line
@@ -435,11 +435,11 @@ bool alpha_cpu_exec_interrupt(CPUState *cs, int interrupt_request) 


void alpha_cpu_dump_state(CPUState *cs, FILE *f, int flags)

{

    static const char *linux_reg_names[] = {

    static const char linux_reg_names[31][4] = {

        "v0",  "t0",  "t1", "t2",  "t3", "t4", "t5", "t6",

        "t7",  "s0",  "s1", "s2",  "s3", "s4", "s5", "fp",

        "a0",  "a1",  "a2", "a3",  "a4", "a5", "t8", "t9",

        "t10", "t11", "ra ", "t12", "at ", "gp ", "sp ", "zero",

        "t10", "t11", "ra", "t12", "at", "gp", "sp"

    };

    AlphaCPU *cpu = ALPHA_CPU(cs);

    CPUAlphaState *env = &cpu->env;
@@ -448,7 +448,7 @@ void alpha_cpu_dump_state(CPUState *cs, FILE *f, int flags) 
    qemu_fprintf(f, "PC      " TARGET_FMT_lx " PS      %02x\n",

                 env->pc, extract32(env->flags, ENV_FLAG_PS_SHIFT, 8));

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

        qemu_fprintf(f, "IR%02d %s " TARGET_FMT_lx "%c", i,

        qemu_fprintf(f, "%-8s" TARGET_FMT_lx "%c",

                     linux_reg_names[i], cpu_alpha_load_gr(env, i),

                     (i % 3) == 2 ? '\n' : ' ');

    }
@@ -458,9 +458,10 @@ void alpha_cpu_dump_state(CPUState *cs, FILE *f, int flags) 


    if (flags & CPU_DUMP_FPU) {

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

            qemu_fprintf(f, "FIR%02d    %016" PRIx64 "%c", i, env->fir[i],

            qemu_fprintf(f, "f%-7d%016" PRIx64 "%c", i, env->fir[i],

                         (i % 3) == 2 ? '\n' : ' ');

        }

        qemu_fprintf(f, "fpcr    %016" PRIx64 "\n", cpu_alpha_load_fpcr(env));

    }

    qemu_fprintf(f, "\n");

}