[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 7/7] target-s390x: Tidy cpu_dump_state
From: |
Richard Henderson |
Subject: |
[Qemu-devel] [PATCH 7/7] target-s390x: Tidy cpu_dump_state |
Date: |
Mon, 24 Sep 2012 14:55:53 -0700 |
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 <address@hidden>
Signed-off-by: Richard Henderson <address@hidden>
---
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
- [Qemu-devel] [PATCH 2/7] target-m68k: Call tcg_gen_debug_insn_start, (continued)
- [Qemu-devel] [PATCH 2/7] target-m68k: Call tcg_gen_debug_insn_start, Richard Henderson, 2012/09/24
- [Qemu-devel] [PATCH 3/7] target-s390x: Call tcg_gen_debug_insn_start, Richard Henderson, 2012/09/24
- [Qemu-devel] [PATCH 4/7] target-unicore32: Call tcg_gen_debug_insn_start, Richard Henderson, 2012/09/24
- [Qemu-devel] [PATCH 5/7] target-s390x: Use CPU_LOG_INT, Richard Henderson, 2012/09/24
- [Qemu-devel] [PATCH 6/7] target-s390x: Avoid double CPU_LOG_TB_CPU, Richard Henderson, 2012/09/24
- [Qemu-devel] [PATCH 7/7] target-s390x: Tidy cpu_dump_state,
Richard Henderson <=
- Re: [Qemu-devel] [PATCH 0/7] Tidy -d op_opt,int,cpu, Alexander Graf, 2012/09/25
- Re: [Qemu-devel] [PATCH 0/7] Tidy -d op_opt,int,cpu, Aurelien Jarno, 2012/09/27