Re: [Qemu-devel] [PATCH 6/9] target-cris: reduce v32isms from v10 log dumps

[Hans-Peter Nilsson <hans-peter.nilsson@axis.com>]

> Date: Tue, 13 Sep 2016 00:59:51 +0200
> From: "Edgar E. Iglesias" <edgar.iglesias@gmail.com>
> > @@ -3336,12 +3336,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",
> > @@ -3363,14 +3371,16 @@ void cris_cpu_dump_state(CPUState *cs, FILE *f, fprintf_function cpu_fprintf,
> >              cpu_fprintf(f, "\n");
> >          }
> >      }
> > -    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++) {
> > -            cpu_fprintf(f, "s%2.2d=%8.8x ",
> > -                    i, env->sregs[srs][i]);
> > -            if ((i + 1) % 4 == 0) {
> > -                cpu_fprintf(f, "\n");
> > +    if (env->pregs[PR_SRS] >= 32) {
> 
> 
> did you mean env->pregs[PR_VR] >= 32 here?

Oops!  Most definitely yes.

brgds, H-P