[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 3/5] target/s390x: Improve s390_cpu_dump_state vs cc_op
From: |
Richard Henderson |
Subject: |
[PATCH 3/5] target/s390x: Improve s390_cpu_dump_state vs cc_op |
Date: |
Mon, 14 Jun 2021 20:07:42 -0700 |
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>
---
target/s390x/helper.c | 12 +++++++-----
1 file 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++) {
--
2.25.1
- [PATCH 0/5] linux-user/s390x: Fix psw.mask handling in signals, Richard Henderson, 2021/06/14
- [PATCH 2/5] target/s390x: Do not modify cpu state in s390_cpu_get_psw_mask, Richard Henderson, 2021/06/14
- [PATCH 1/5] target/s390x: Expose load_psw and get_psw_mask to cpu.h, Richard Henderson, 2021/06/14
- [PATCH 4/5] target/s390x: Use s390_cpu_{set_psw, get_psw_mask} in gdbstub, Richard Henderson, 2021/06/14
- [PATCH 5/5] linux-user/s390x: Save and restore psw.mask properly, Richard Henderson, 2021/06/14
- [PATCH 3/5] target/s390x: Improve s390_cpu_dump_state vs cc_op,
Richard Henderson <=
- Re: [PATCH 0/5] linux-user/s390x: Fix psw.mask handling in signals, Christian Borntraeger, 2021/06/15
- Re: [PATCH 0/5] linux-user/s390x: Fix psw.mask handling in signals, Alex Bennée, 2021/06/15
- Re: [PATCH 0/5] linux-user/s390x: Fix psw.mask handling in signals, jonathan.albrecht, 2021/06/15