| Message ID | 20190427005124.12756-2-richard.henderson@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | target/alpha: Fix bug 1701835 | expand |
On 4/27/19 2:51 AM, Richard Henderson wrote: > Drop the "RI" and "FIR" prefixes; use only the normal linux names. > Add the FPCR to the dump. > > Signed-off-by: Richard Henderson <richard.henderson@linaro.org> > --- > target/alpha/helper.c | 19 ++++++++++--------- > 1 file changed, 10 insertions(+), 9 deletions(-) > > diff --git a/target/alpha/helper.c b/target/alpha/helper.c > index 7201576aae..31de9593b6 100644 > --- a/target/alpha/helper.c > +++ b/target/alpha/helper.c > @@ -429,32 +429,33 @@ 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[] = { > - "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", > + 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" > }; > AlphaCPU *cpu = ALPHA_CPU(cs); > CPUAlphaState *env = &cpu->env; > int i; > > - qemu_fprintf(f, " PC " TARGET_FMT_lx " PS %02x\n", > + 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", I often wondered was this useful for (I mean, one would focus on one or another, but having both displayed was not helpful IMO). Now the output looks clearer, thanks! Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com> > linux_reg_names[i], cpu_alpha_load_gr(env, i), > (i % 3) == 2 ? '\n' : ' '); > } > > - qemu_fprintf(f, "lock_a " TARGET_FMT_lx " lock_v " TARGET_FMT_lx "\n", > + qemu_fprintf(f, "lock_a " TARGET_FMT_lx " lock_v " TARGET_FMT_lx "\n", > env->lock_addr, env->lock_value); > > 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"); > } >
diff --git a/target/alpha/helper.c b/target/alpha/helper.c index 7201576aae..31de9593b6 100644 --- a/target/alpha/helper.c +++ b/target/alpha/helper.c @@ -429,32 +429,33 @@ 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[] = { - "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", + 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" }; AlphaCPU *cpu = ALPHA_CPU(cs); CPUAlphaState *env = &cpu->env; int i; - qemu_fprintf(f, " PC " TARGET_FMT_lx " PS %02x\n", + 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' : ' '); } - qemu_fprintf(f, "lock_a " TARGET_FMT_lx " lock_v " TARGET_FMT_lx "\n", + qemu_fprintf(f, "lock_a " TARGET_FMT_lx " lock_v " TARGET_FMT_lx "\n", env->lock_addr, env->lock_value); 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"); }
Drop the "RI" and "FIR" prefixes; use only the normal linux names. Add the FPCR to the dump. Signed-off-by: Richard Henderson <richard.henderson@linaro.org> --- target/alpha/helper.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) -- 2.17.1