Re: [Qemu-devel] [PATCH 6/9] target/s390x: Honor CPU_DUMP_FPU

[David Hildenbrand]

On 11.05.2018 05:52, Richard Henderson wrote:
> Also do not dump both "fpu" and "vector" registers
> as the former overlaps the latter.
> 
> Cc: Alexander Graf <address@hidden>
> Cc: David Hildenbrand <address@hidden>
> Signed-off-by: Richard Henderson <address@hidden>
> ---
>  target/s390x/helper.c | 23 ++++++++++++-----------
>  1 file changed, 12 insertions(+), 11 deletions(-)
> 
> diff --git a/target/s390x/helper.c b/target/s390x/helper.c
> index e8548f340a..fd5791f134 100644
> --- a/target/s390x/helper.c
> +++ b/target/s390x/helper.c
> @@ -327,21 +327,22 @@ void s390_cpu_dump_state(CPUState *cs, FILE *f, 
> fprintf_function cpu_fprintf,
>          }
>      }
>  
> -    for (i = 0; i < 16; i++) {
> -        cpu_fprintf(f, "F%02d=%016" PRIx64, i, get_freg(env, i)->ll);
> -        if ((i % 4) == 3) {
> -            cpu_fprintf(f, "\n");
> +    if (flags & CPU_DUMP_FPU) {
> +        if (s390_has_feat(S390_FEAT_VECTOR)) {

CPU model should always be initialized at this point, so this check
actually returns the right thing.

Reviewed-by: David Hildenbrand <address@hidden>

> +            for (i = 0; i < 32; i++) {
> +                cpu_fprintf(f, "V%02d=%016" PRIx64 "%016" PRIx64 "%c",
> +                            i, env->vregs[i][0].ll, env->vregs[i][1].ll,
> +                            i % 2 ? '\n' : ' ');
> +            }
>          } else {
> -            cpu_fprintf(f, " ");
> +            for (i = 0; i < 16; i++) {
> +                cpu_fprintf(f, "F%02d=%016" PRIx64 "%c",
> +                            i, get_freg(env, i)->ll,
> +                            (i % 4) == 3 ? '\n' : ' ');
> +            }
>          }
>      }
>  
> -    for (i = 0; i < 32; i++) {
> -        cpu_fprintf(f, "V%02d=%016" PRIx64 "%016" PRIx64, i,
> -                    env->vregs[i][0].ll, env->vregs[i][1].ll);
> -        cpu_fprintf(f, (i % 2) ? "\n" : " ");
> -    }
> -
>  #ifndef CONFIG_USER_ONLY
>      for (i = 0; i < 16; i++) {
>          cpu_fprintf(f, "C%02d=%016" PRIx64, i, env->cregs[i]);
> 


-- 

Thanks,

David / dhildenb