diff options
| author | Richard Henderson | 2021-06-15 05:07:42 +0200 |
|---|---|---|
| committer | Cornelia Huck | 2021-06-21 08:48:21 +0200 |
| commit | d09e6c921301d4377c73e0bc9010b52f201862dd (patch) | |
| tree | 86e629dfbd91ffd07264597a1151872f787e07aa /target/s390x | |
| parent | target/s390x: Do not modify cpu state in s390_cpu_get_psw_mask (diff) | |
| download | qemu-d09e6c921301d4377c73e0bc9010b52f201862dd.tar.gz qemu-d09e6c921301d4377c73e0bc9010b52f201862dd.tar.xz qemu-d09e6c921301d4377c73e0bc9010b52f201862dd.zip | |
target/s390x: Improve s390_cpu_dump_state vs cc_op
Use s390_cpu_get_psw_mask so that we print the correct
architectural value of psw.mask. Do not print cc_op
unless tcg_enabled.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: David Hildenbrand <david@redhat.com>
Tested-by: jonathan.albrecht <jonathan.albrecht@linux.vnet.ibm.com>
Tested-by: <ruixin.bao@ibm.com>
Message-Id: <20210615030744.1252385-4-richard.henderson@linaro.org>
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
Diffstat (limited to 'target/s390x')
| -rw-r--r-- | target/s390x/helper.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/target/s390x/helper.c b/target/s390x/helper.c index 559fc3573f..1445b74451 100644 --- a/target/s390x/helper.c +++ b/target/s390x/helper.c @@ -338,12 +338,14 @@ void s390_cpu_dump_state(CPUState *cs, FILE *f, int flags) CPUS390XState *env = &cpu->env; int i; - if (env->cc_op > 3) { - qemu_fprintf(f, "PSW=mask %016" PRIx64 " addr %016" PRIx64 " cc %15s\n", - env->psw.mask, env->psw.addr, cc_name(env->cc_op)); + qemu_fprintf(f, "PSW=mask %016" PRIx64 " addr %016" PRIx64, + s390_cpu_get_psw_mask(env), env->psw.addr); + if (!tcg_enabled()) { + qemu_fprintf(f, "\n"); + } else if (env->cc_op > 3) { + qemu_fprintf(f, " cc %15s\n", cc_name(env->cc_op)); } else { - qemu_fprintf(f, "PSW=mask %016" PRIx64 " addr %016" PRIx64 " cc %02x\n", - env->psw.mask, env->psw.addr, env->cc_op); + qemu_fprintf(f, " cc %02x\n", env->cc_op); } for (i = 0; i < 16; i++) { |