| Message ID | 1348523753-25083-8-git-send-email-rth@twiddle.net |
|---|---|
| State | New |
| Headers | show |
On Mon, Sep 24, 2012 at 02:55:53PM -0700, Richard Henderson wrote: > The blank lines inside the single dump make it difficult for the > eye to pick out the block. Worse, with interior newlines, but > no blank line following, the PSW line appears to belong to the > next dump block. > > Cc: Alexander Graf <agraf@suse.de> > Signed-off-by: Richard Henderson <rth@twiddle.net> > --- > target-s390x/translate.c | 22 ++++++++++------------ > 1 file changed, 10 insertions(+), 12 deletions(-) > > diff --git a/target-s390x/translate.c b/target-s390x/translate.c > index 4cc9225..db464cc 100644 > --- a/target-s390x/translate.c > +++ b/target-s390x/translate.c > @@ -79,6 +79,14 @@ void cpu_dump_state(CPUS390XState *env, FILE *f, fprintf_function cpu_fprintf, > { > int i; > > + if (env->cc_op > 3) { > + cpu_fprintf(f, "PSW=mask %016" PRIx64 " addr %016" PRIx64 " cc %15s\n", > + env->psw.mask, env->psw.addr, cc_name(env->cc_op)); > + } else { > + cpu_fprintf(f, "PSW=mask %016" PRIx64 " addr %016" PRIx64 " cc %02x\n", > + env->psw.mask, env->psw.addr, env->cc_op); > + } > + > for (i = 0; i < 16; i++) { > cpu_fprintf(f, "R%02d=%016" PRIx64, i, env->regs[i]); > if ((i % 4) == 3) { > @@ -97,8 +105,6 @@ void cpu_dump_state(CPUS390XState *env, FILE *f, fprintf_function cpu_fprintf, > } > } > > - cpu_fprintf(f, "\n"); > - > #ifndef CONFIG_USER_ONLY > for (i = 0; i < 16; i++) { > cpu_fprintf(f, "C%02d=%016" PRIx64, i, env->cregs[i]); > @@ -110,22 +116,14 @@ void cpu_dump_state(CPUS390XState *env, FILE *f, fprintf_function cpu_fprintf, > } > #endif > > - cpu_fprintf(f, "\n"); > - > - if (env->cc_op > 3) { > - cpu_fprintf(f, "PSW=mask %016" PRIx64 " addr %016" PRIx64 " cc %15s\n", > - env->psw.mask, env->psw.addr, cc_name(env->cc_op)); > - } else { > - cpu_fprintf(f, "PSW=mask %016" PRIx64 " addr %016" PRIx64 " cc %02x\n", > - env->psw.mask, env->psw.addr, env->cc_op); > - } > - > #ifdef DEBUG_INLINE_BRANCHES > for (i = 0; i < CC_OP_MAX; i++) { > cpu_fprintf(f, " %15s = %10ld\t%10ld\n", cc_name(i), > inline_branch_miss[i], inline_branch_hit[i]); > } > #endif > + > + cpu_fprintf(f, "\n"); > } > > static TCGv_i64 psw_addr; > -- > 1.7.11.4 Reviewed-by: Aurelien Jarno <aurelien@aurel32.net>
diff --git a/target-s390x/translate.c b/target-s390x/translate.c index 4cc9225..db464cc 100644 --- a/target-s390x/translate.c +++ b/target-s390x/translate.c @@ -79,6 +79,14 @@ void cpu_dump_state(CPUS390XState *env, FILE *f, fprintf_function cpu_fprintf, { int i; + if (env->cc_op > 3) { + cpu_fprintf(f, "PSW=mask %016" PRIx64 " addr %016" PRIx64 " cc %15s\n", + env->psw.mask, env->psw.addr, cc_name(env->cc_op)); + } else { + cpu_fprintf(f, "PSW=mask %016" PRIx64 " addr %016" PRIx64 " cc %02x\n", + env->psw.mask, env->psw.addr, env->cc_op); + } + for (i = 0; i < 16; i++) { cpu_fprintf(f, "R%02d=%016" PRIx64, i, env->regs[i]); if ((i % 4) == 3) { @@ -97,8 +105,6 @@ void cpu_dump_state(CPUS390XState *env, FILE *f, fprintf_function cpu_fprintf, } } - cpu_fprintf(f, "\n"); - #ifndef CONFIG_USER_ONLY for (i = 0; i < 16; i++) { cpu_fprintf(f, "C%02d=%016" PRIx64, i, env->cregs[i]); @@ -110,22 +116,14 @@ void cpu_dump_state(CPUS390XState *env, FILE *f, fprintf_function cpu_fprintf, } #endif - cpu_fprintf(f, "\n"); - - if (env->cc_op > 3) { - cpu_fprintf(f, "PSW=mask %016" PRIx64 " addr %016" PRIx64 " cc %15s\n", - env->psw.mask, env->psw.addr, cc_name(env->cc_op)); - } else { - cpu_fprintf(f, "PSW=mask %016" PRIx64 " addr %016" PRIx64 " cc %02x\n", - env->psw.mask, env->psw.addr, env->cc_op); - } - #ifdef DEBUG_INLINE_BRANCHES for (i = 0; i < CC_OP_MAX; i++) { cpu_fprintf(f, " %15s = %10ld\t%10ld\n", cc_name(i), inline_branch_miss[i], inline_branch_hit[i]); } #endif + + cpu_fprintf(f, "\n"); } static TCGv_i64 psw_addr;
The blank lines inside the single dump make it difficult for the eye to pick out the block. Worse, with interior newlines, but no blank line following, the PSW line appears to belong to the next dump block. Cc: Alexander Graf <agraf@suse.de> Signed-off-by: Richard Henderson <rth@twiddle.net> --- target-s390x/translate.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-)