[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 19/65] target/hppa: Adjust hppa_cpu_dump_state for hppa64
From: |
Richard Henderson |
Subject: |
[PATCH v2 19/65] target/hppa: Adjust hppa_cpu_dump_state for hppa64 |
Date: |
Fri, 20 Oct 2023 13:42:45 -0700 |
Dump all 64 bits for pa2.0 and low 32 bits for pa1.x.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
target/hppa/helper.c | 28 +++++++++++++++++++---------
1 file changed, 19 insertions(+), 9 deletions(-)
diff --git a/target/hppa/helper.c b/target/hppa/helper.c
index 6a00085dae..a2ae7aca30 100644
--- a/target/hppa/helper.c
+++ b/target/hppa/helper.c
@@ -119,18 +119,26 @@ void cpu_hppa_put_psw(CPUHPPAState *env, target_ureg psw)
void hppa_cpu_dump_state(CPUState *cs, FILE *f, int flags)
{
- HPPACPU *cpu = HPPA_CPU(cs);
- CPUHPPAState *env = &cpu->env;
+ CPUHPPAState *env = cpu_env(cs);
target_ureg psw = cpu_hppa_get_psw(env);
target_ureg psw_cb;
char psw_c[20];
- int i;
+ int i, w;
+ uint64_t m;
+
+ if (hppa_is_pa20(env)) {
+ w = 16;
+ m = UINT64_MAX;
+ } else {
+ w = 8;
+ m = UINT32_MAX;
+ }
qemu_fprintf(f, "IA_F " TARGET_FMT_lx " IA_B " TARGET_FMT_lx
- " IIR " TREG_FMT_lx "\n",
+ " IIR %0*" PRIx64 "\n",
hppa_form_gva_psw(psw, env->iasq_f, env->iaoq_f),
hppa_form_gva_psw(psw, env->iasq_b, env->iaoq_b),
- env->cr[CR_IIR]);
+ w, m & env->cr[CR_IIR]);
psw_c[0] = (psw & PSW_W ? 'W' : '-');
psw_c[1] = (psw & PSW_E ? 'E' : '-');
@@ -151,13 +159,15 @@ void hppa_cpu_dump_state(CPUState *cs, FILE *f, int flags)
psw_c[16] = (psw & PSW_D ? 'D' : '-');
psw_c[17] = (psw & PSW_I ? 'I' : '-');
psw_c[18] = '\0';
- psw_cb = ((env->psw_cb >> 4) & 0x01111111) | (env->psw_cb_msb << 28);
+ psw_cb = ((env->psw_cb >> 4) & ((target_ureg)-1 / 0xf))
+ | (env->psw_cb_msb << (TARGET_REGISTER_BITS - 4));
- qemu_fprintf(f, "PSW " TREG_FMT_lx " CB " TREG_FMT_lx " %s\n",
- psw, psw_cb, psw_c);
+ qemu_fprintf(f, "PSW %0*" PRIx64 " CB %0*" PRIx64 " %s\n",
+ w, m & psw, w, m & psw_cb, psw_c);
for (i = 0; i < 32; i++) {
- qemu_fprintf(f, "GR%02d " TREG_FMT_lx "%c", i, env->gr[i],
+ qemu_fprintf(f, "GR%02d %0*" PRIx64 "%c",
+ i, w, m & env->gr[i],
(i & 3) == 3 ? '\n' : ' ');
}
#ifndef CONFIG_USER_ONLY
--
2.34.1
- [PATCH v2 02/65] tcg: Improve expansion of deposit into a constant, (continued)
- [PATCH v2 02/65] tcg: Improve expansion of deposit into a constant, Richard Henderson, 2023/10/20
- [PATCH v2 04/65] target/hppa: Remove get_temp_tl, Richard Henderson, 2023/10/20
- [PATCH v2 10/65] target/hppa: Fix do_add, do_sub for hppa64, Richard Henderson, 2023/10/20
- [PATCH v2 17/65] target/hppa: Update cpu_hppa_get/put_psw for hppa64, Richard Henderson, 2023/10/20
- [PATCH v2 15/65] target/hppa: Implement cpu_list, Richard Henderson, 2023/10/20
- [PATCH v2 18/65] target/hppa: Handle absolute addresses for pa2.0, Richard Henderson, 2023/10/20
- [PATCH v2 07/65] target/hppa: Fix load in do_load_32, Richard Henderson, 2023/10/20
- [PATCH v2 08/65] target/hppa: Truncate rotate count in trans_shrpw_sar, Richard Henderson, 2023/10/20
- [PATCH v2 09/65] target/hppa: Fix trans_ds for hppa64, Richard Henderson, 2023/10/20
- [PATCH v2 12/65] target/hppa: Fix extrw and depw with sar for hppa64, Richard Henderson, 2023/10/20
- [PATCH v2 19/65] target/hppa: Adjust hppa_cpu_dump_state for hppa64,
Richard Henderson <=
- [PATCH v2 25/65] target/hppa: Pass d to do_sed_cond, Richard Henderson, 2023/10/20
- [PATCH v2 27/65] linux-user/hppa: Fixes for TARGET_ABI32, Richard Henderson, 2023/10/20
- [PATCH v2 30/65] target/hppa: Decode d for logical instructions, Richard Henderson, 2023/10/20
- [PATCH v2 28/65] target/hppa: Drop attempted gdbstub support for hppa64, Richard Henderson, 2023/10/20
- [PATCH v2 33/65] target/hppa: Decode d for add instructions, Richard Henderson, 2023/10/20
- [PATCH v2 29/65] target/hppa: Remove TARGET_HPPA64, Richard Henderson, 2023/10/20
- [PATCH v2 06/65] target/hppa: Fix hppa64 case in machine.c, Richard Henderson, 2023/10/20
- [PATCH v2 05/65] target/hppa: Remove load_const, Richard Henderson, 2023/10/20